From a374efce3a207b39514be3c52264091400ce297e Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 04:44:41 +0000 Subject: [PATCH] TQt4 port kdeedu This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- blinken/src/artsplayer.h | 3 +- blinken/src/blinken.cpp | 52 +- blinken/src/blinken.h | 5 +- blinken/src/blinkengame.h | 3 +- blinken/src/button.cpp | 12 +- blinken/src/counter.cpp | 2 +- blinken/src/fontutils.cpp | 4 +- blinken/src/highscoredialog.cpp | 40 +- blinken/src/highscoredialog.h | 4 +- blinken/src/number.cpp | 30 +- kalzium/ChangeLog | 2 +- kalzium/RELEASE-PLAN | 2 +- kalzium/src/detailedgraphicaloverview.cpp | 82 +- kalzium/src/detailedgraphicaloverview.h | 7 +- kalzium/src/detailinfodlg.cpp | 94 +- kalzium/src/detailinfodlg.h | 3 +- kalzium/src/element.cpp | 70 +- kalzium/src/elementdataviewer.cpp | 18 +- kalzium/src/elementdataviewer.h | 3 +- kalzium/src/eqchemview.cpp | 14 +- kalzium/src/eqchemview.h | 18 +- kalzium/src/eqresult.cpp | 8 +- kalzium/src/eqresult.h | 15 +- kalzium/src/isotope.cpp | 16 +- kalzium/src/kalzium.cpp | 56 +- kalzium/src/kalzium.h | 7 +- kalzium/src/kalziumdataobject.cpp | 12 +- kalzium/src/kalziumtip.cpp | 70 +- kalzium/src/kalziumtip.h | 15 +- kalzium/src/kalziumutils.cpp | 10 +- kalzium/src/molcalcwidget.cpp | 22 +- kalzium/src/molcalcwidget.h | 5 +- kalzium/src/molcalcwidgetbase.ui | 22 +- kalzium/src/moleculeparser.cpp | 2 +- kalzium/src/orbitswidget.cpp | 8 +- kalzium/src/orbitswidget.h | 5 +- kalzium/src/parser.cpp | 6 +- kalzium/src/periodictableview.cpp | 138 +-- kalzium/src/periodictableview.h | 7 +- kalzium/src/plotsetupwidget.ui | 42 +- kalzium/src/plotwidget.cpp | 6 +- kalzium/src/plotwidget.h | 3 +- kalzium/src/settings_colors.ui | 208 ++-- kalzium/src/settings_misc.ui | 14 +- kalzium/src/settings_units.ui | 24 +- kalzium/src/somwidget.ui | 30 +- kalzium/src/somwidget_impl.cpp | 16 +- kalzium/src/somwidget_impl.h | 5 +- kalzium/src/spectrum.cpp | 24 +- kalzium/src/spectrum.h | 4 +- kalzium/src/spectrumview.ui | 30 +- kalzium/src/spectrumviewimpl.cpp | 8 +- kalzium/src/spectrumviewimpl.h | 5 +- kalzium/src/spectrumwidget.cpp | 46 +- kalzium/src/spectrumwidget.h | 5 +- kalzium/src/tempunit.cpp | 16 +- kalzium/src/tempunit.h | 4 +- kalzium/src/timewidget.ui | 28 +- kalzium/src/timewidget_impl.cpp | 8 +- kalzium/src/timewidget_impl.h | 5 +- kanagram/Doxyfile | 4 +- kanagram/data/fruits.kvtml | 4 +- kanagram/data/objects.kvtml | 2 +- kanagram/data/space.kvtml | 2 +- kanagram/data/vegetables.kvtml | 2 +- kanagram/src/fontutils.cpp | 4 +- kanagram/src/kanagram.cpp | 70 +- kanagram/src/kanagram.h | 3 +- kanagram/src/kanagramgame.cpp | 8 +- kanagram/src/kanagramgame.h | 5 +- kanagram/src/keduvocdocument.cpp | 32 +- kanagram/src/keduvocdocument.h | 11 +- kanagram/src/keduvocexpression.cpp | 4 +- kanagram/src/keduvocexpression.h | 2 +- kanagram/src/keduvockvtmlreader.cpp | 82 +- kanagram/src/keduvockvtmlreader.h | 56 +- kanagram/src/keduvockvtmlwriter.cpp | 26 +- kanagram/src/keduvockvtmlwriter.h | 54 +- kanagram/src/leitnersystem.cpp | 10 +- kanagram/src/leitnersystemview.cpp | 6 +- kanagram/src/leitnersystemview.h | 5 +- kanagram/src/mainsettings.cpp | 8 +- kanagram/src/mainsettings.h | 3 +- kanagram/src/mainsettingswidget.ui | 34 +- kanagram/src/newstuff.cpp | 2 +- kanagram/src/newstuff.h | 3 +- kanagram/src/newstuffwidget.ui | 12 +- kanagram/src/vocabedit.cpp | 12 +- kanagram/src/vocabedit.h | 5 +- kanagram/src/vocabeditwidget.ui | 62 +- kanagram/src/vocabsettings.cpp | 4 +- kanagram/src/vocabsettings.h | 3 +- kanagram/src/vocabsettingswidget.ui | 26 +- kbruch/ChangeLog | 4 +- kbruch/src/exercisebase.cpp | 4 +- kbruch/src/exercisebase.h | 5 +- kbruch/src/exercisecompare.cpp | 18 +- kbruch/src/exercisecompare.h | 3 +- kbruch/src/exerciseconvert.cpp | 18 +- kbruch/src/exerciseconvert.h | 3 +- kbruch/src/exercisefactorize.cpp | 82 +- kbruch/src/exercisefactorize.h | 19 +- kbruch/src/factorizedwidget.cpp | 8 +- kbruch/src/factorizedwidget.h | 3 +- kbruch/src/fractionbasewidget.cpp | 16 +- kbruch/src/fractionbasewidget.h | 7 +- kbruch/src/kbruch.cpp | 6 +- kbruch/src/kbruch.h | 2 +- kbruch/src/mainqtwidget.cpp | 66 +- kbruch/src/mainqtwidget.h | 15 +- kbruch/src/ratio.cpp | 4 +- kbruch/src/rationalwidget.cpp | 8 +- kbruch/src/rationalwidget.h | 3 +- kbruch/src/ratiowidget.cpp | 8 +- kbruch/src/ratiowidget.h | 3 +- kbruch/src/resultwidget.cpp | 10 +- kbruch/src/resultwidget.h | 3 +- kbruch/src/statisticsview.cpp | 34 +- kbruch/src/statisticsview.h | 7 +- kbruch/src/taskview.cpp | 20 +- kbruch/src/taskview.h | 3 +- kbruch/src/taskvieweroptionsbase.ui | 30 +- kbruch/src/taskwidget.cpp | 8 +- kbruch/src/taskwidget.h | 3 +- kbruch/testcases/primenumber_test.cpp | 52 +- kbruch/testcases/ratio_test.cpp | 158 +-- keduca/keduca/Makefile.am | 4 +- keduca/keduca/configdialogbase.ui | 20 +- keduca/keduca/kcheckeduca.cpp | 12 +- keduca/keduca/kcheckeduca.h | 3 +- keduca/keduca/keduca.cpp | 20 +- keduca/keduca/keduca.h | 3 +- keduca/keduca/keduca_part.cpp | 8 +- keduca/keduca/keduca_part.h | 3 +- keduca/keduca/keducaprefs.cpp | 18 +- keduca/keduca/keducaprefs.h | 3 +- keduca/keduca/keducaview.cpp | 60 +- keduca/keduca/keducaview.h | 7 +- keduca/keduca/kgroupeduca.cpp | 10 +- keduca/keduca/kgroupeduca.h | 3 +- keduca/keduca/kquestion.cpp | 12 +- keduca/keduca/kquestion.h | 5 +- keduca/keduca/kradioeduca.cpp | 12 +- keduca/keduca/kradioeduca.h | 3 +- keduca/keducabuilder/kcontroladdedit.cpp | 40 +- keduca/keducabuilder/kcontroladdedit.h | 5 +- keduca/keducabuilder/kcontroladdeditbase.ui | 162 +-- keduca/keducabuilder/kcontrolheader.cpp | 70 +- keduca/keducabuilder/kcontrolheader.h | 3 +- keduca/keducabuilder/kcontrolheaderbase.ui | 82 +- keduca/keducabuilder/keducabuilder.cpp | 86 +- keduca/keducabuilder/keducabuilder.h | 3 +- .../keducabuilder/keducaeditorstartdialog.cpp | 8 +- .../keducabuilder/keducaeditorstartdialog.h | 3 +- .../keducaeditorstartdialogbase.ui | 36 +- keduca/keducabuilder/klangcombo.cpp | 12 +- keduca/keducabuilder/klangcombo.h | 7 +- keduca/keducabuilder/ktagcombobox.cpp | 26 +- keduca/keducabuilder/ktagcombobox.h | 15 +- keduca/libkeduca/fileread.cpp | 98 +- keduca/libkeduca/fileread.h | 9 +- keduca/libkeduca/kgallerydialog.cpp | 4 +- keduca/libkeduca/kgallerydialog.h | 3 +- keduca/libkeduca/kgallerydialogbase.ui | 72 +- kgeography/Changelog | 2 +- kgeography/data/africa.kgm | 2 +- kgeography/data/world.kgm | 4 +- kgeography/src/answer.cpp | 6 +- kgeography/src/answersdialog.cpp | 8 +- kgeography/src/answersdialog.h | 2 +- kgeography/src/askwidget.cpp | 8 +- kgeography/src/askwidget.h | 5 +- kgeography/src/boxasker.cpp | 8 +- kgeography/src/boxasker.h | 3 +- kgeography/src/capitaldivisionasker.cpp | 6 +- kgeography/src/capitaldivisionasker.h | 2 +- kgeography/src/division.cpp | 6 +- kgeography/src/division.h | 4 +- kgeography/src/divisioncapitalasker.cpp | 6 +- kgeography/src/divisioncapitalasker.h | 2 +- kgeography/src/divisionflagasker.cpp | 6 +- kgeography/src/divisionflagasker.h | 2 +- kgeography/src/flagdivisionasker.cpp | 4 +- kgeography/src/flagdivisionasker.h | 2 +- kgeography/src/kgeography.cpp | 44 +- kgeography/src/kgeography.h | 1 + kgeography/src/map.cpp | 14 +- kgeography/src/map.h | 4 +- kgeography/src/mapasker.cpp | 20 +- kgeography/src/mapasker.h | 5 +- kgeography/src/mapchooser.cpp | 8 +- kgeography/src/mapchooser.h | 3 +- kgeography/src/mapparser.cpp | 42 +- kgeography/src/mapparser.h | 4 +- kgeography/src/mapsdatatranslation.cpp | 24 +- kgeography/src/mapwidget.cpp | 22 +- kgeography/src/mapwidget.h | 9 +- kgeography/src/mypopup.cpp | 10 +- kgeography/src/mypopup.h | 5 +- kgeography/src/popupmanager.cpp | 4 +- kgeography/src/popupmanager.h | 5 +- khangman/ChangeLog | 2 +- khangman/README.languages | 2 +- khangman/khangman/advanced.ui | 18 +- khangman/khangman/data/en/easy.kvtml | 4 +- khangman/khangman/khangman.cpp | 86 +- khangman/khangman/khangman.h | 1 + khangman/khangman/khangmanview.cpp | 116 +- khangman/khangman/khangmanview.h | 7 +- khangman/khangman/khnewstuff.cpp | 8 +- khangman/khangman/khnewstuff.h | 4 +- khangman/khangman/normal.ui | 18 +- khangman/khangman/prefs.kcfgc | 2 +- khangman/khangman/timer.h | 1 + khangman/khangman/timerdlg.ui | 36 +- kig/ChangeLog | 18 +- kig/DESIGN | 32 +- kig/FEATURES | 4 +- kig/Makefile.am | 4 +- kig/README.boost-python1.30-gcc3.2 | 2 +- kig/TODO | 12 +- kig/configure.in.in | 18 + kig/examples/figure_angle.fgeo | 26 +- kig/examples/figure_manyobjects.fgeo | 62 +- kig/examples/session_alotofthings.fgeo | 136 +- kig/filters/cabri-filter.cc | 82 +- kig/filters/drgeo-filter-chooser.h | 1 + kig/filters/drgeo-filter-chooserbase.ui | 16 +- kig/filters/drgeo-filter.cc | 240 ++-- kig/filters/drgeo-filter.h | 2 +- kig/filters/exporter.cc | 38 +- kig/filters/filter.cc | 8 +- kig/filters/filter.h | 6 +- kig/filters/filters-common.cc | 2 +- kig/filters/imageexporteroptions.cc | 4 +- kig/filters/imageexporteroptions.h | 3 +- kig/filters/imageexporteroptionsbase.ui | 24 +- kig/filters/kgeo-filter.cc | 142 +-- kig/filters/kgeo-filter.h | 4 +- kig/filters/kgeo-resource.h | 2 +- kig/filters/kseg-defs.h | 8 +- kig/filters/kseg-filter.cc | 188 +-- kig/filters/kseg-filter.h | 2 +- kig/filters/latexexporter.cc | 16 +- kig/filters/latexexporteroptions.ui | 14 +- kig/filters/native-filter.cc | 98 +- kig/filters/svgexporter.cc | 14 +- kig/filters/svgexporteroptions.ui | 12 +- kig/filters/tests/locus.fgeo | 2 +- kig/kfile/Makefile.am | 4 +- kig/kfile/kfile_drgeo.cpp | 6 +- kig/kfile/kfile_drgeo.h | 3 +- kig/kfile/kfile_kig.cpp | 10 +- kig/kfile/kfile_kig.h | 3 +- kig/kig/kig.cpp | 24 +- kig/kig/kig.h | 3 +- kig/kig/kig_commands.cpp | 54 +- kig/kig/kig_commands.h | 7 +- kig/kig/kig_document.cc | 2 +- kig/kig/kig_part.cpp | 56 +- kig/kig/kig_part.h | 5 +- kig/kig/kig_view.cpp | 50 +- kig/kig/kig_view.h | 18 +- kig/misc/argsparser.cpp | 14 +- kig/misc/argsparser.h | 14 +- kig/misc/builtin_stuff.cc | 20 +- kig/misc/calcpaths.cc | 48 +- kig/misc/calcpaths.h | 6 +- kig/misc/common.cpp | 18 +- kig/misc/common.h | 2 +- kig/misc/coordinate.cpp | 6 +- kig/misc/coordinate.h | 4 +- kig/misc/coordinate_system.cpp | 50 +- kig/misc/coordinate_system.h | 2 +- kig/misc/cubic-common.cc | 2 +- kig/misc/guiaction.cc | 20 +- kig/misc/guiaction.h | 3 +- kig/misc/kigfiledialog.cc | 6 +- kig/misc/kigfiledialog.h | 7 +- kig/misc/kiginputdialog.cc | 28 +- kig/misc/kiginputdialog.h | 17 +- kig/misc/kigpainter.cpp | 44 +- kig/misc/kigpainter.h | 10 +- kig/misc/lists.cc | 8 +- kig/misc/object_constructor.cc | 38 +- kig/misc/object_constructor.h | 8 +- kig/misc/object_hierarchy.cc | 146 +-- kig/misc/object_hierarchy.h | 12 +- kig/misc/rect.cc | 10 +- kig/misc/rect.h | 8 +- kig/misc/special_constructors.cc | 188 +-- kig/misc/special_constructors.h | 18 +- kig/modes/base_mode.cc | 28 +- kig/modes/base_mode.h | 2 +- kig/modes/construct_mode.cc | 82 +- kig/modes/construct_mode.h | 2 +- kig/modes/dragrectmode.cc | 2 +- kig/modes/edittype.cc | 8 +- kig/modes/edittype.h | 3 +- kig/modes/edittypebase.ui | 40 +- kig/modes/label.cc | 68 +- kig/modes/label.h | 10 +- kig/modes/linkslabel.cpp | 34 +- kig/modes/linkslabel.h | 5 +- kig/modes/macro.cc | 6 +- kig/modes/macrowizard.cc | 8 +- kig/modes/macrowizard.h | 3 +- kig/modes/macrowizardbase.ui | 28 +- kig/modes/mode.h | 2 +- kig/modes/moving.cc | 54 +- kig/modes/moving.h | 2 +- kig/modes/normal.cc | 6 +- kig/modes/popup.cc | 52 +- kig/modes/popup.h | 2 + kig/modes/textlabelwizard.cc | 12 +- kig/modes/textlabelwizard.h | 5 +- kig/modes/textlabelwizardbase.ui | 22 +- kig/modes/typesdialog.cpp | 14 +- kig/modes/typesdialog.h | 3 +- kig/modes/typesdialogbase.ui | 38 +- kig/objects/angle_type.cc | 30 +- kig/objects/arc_type.h | 4 +- kig/objects/base_type.cc | 42 +- kig/objects/bogus_imp.cc | 10 +- kig/objects/bogus_imp.h | 2 +- kig/objects/circle_imp.cc | 26 +- kig/objects/circle_imp.h | 2 +- kig/objects/conic_imp.cc | 22 +- kig/objects/conic_imp.h | 2 +- kig/objects/conic_types.cc | 104 +- kig/objects/conic_types.h | 22 +- kig/objects/cubic_imp.cc | 28 +- kig/objects/cubic_imp.h | 2 +- kig/objects/cubic_type.cc | 12 +- kig/objects/cubic_type.h | 6 +- kig/objects/intersection_types.cc | 70 +- kig/objects/intersection_types.h | 12 +- kig/objects/line_imp.cc | 10 +- kig/objects/line_imp.h | 6 +- kig/objects/line_type.cc | 12 +- kig/objects/locus_imp.cc | 2 +- kig/objects/locus_imp.h | 8 +- kig/objects/object_calcer.cc | 78 +- kig/objects/object_calcer.h | 66 +- kig/objects/object_drawer.cc | 22 +- kig/objects/object_drawer.h | 6 +- kig/objects/object_factory.cc | 98 +- kig/objects/object_factory.h | 18 +- kig/objects/object_holder.cc | 8 +- kig/objects/object_holder.h | 4 +- kig/objects/object_imp.cc | 6 +- kig/objects/object_imp.h | 12 +- kig/objects/object_imp_factory.cc | 138 +-- kig/objects/object_imp_factory.h | 8 +- kig/objects/object_type.cc | 8 +- kig/objects/object_type.h | 18 +- kig/objects/object_type_factory.cc | 4 +- kig/objects/object_type_factory.h | 2 +- kig/objects/other_imp.cc | 8 +- kig/objects/other_imp.h | 6 +- kig/objects/other_type.cc | 20 +- kig/objects/other_type.h | 8 +- kig/objects/point_imp.cc | 6 +- kig/objects/point_imp.h | 2 +- kig/objects/point_type.cc | 106 +- kig/objects/point_type.h | 20 +- kig/objects/polygon_imp.cc | 4 +- kig/objects/polygon_imp.h | 2 +- kig/objects/polygon_type.cc | 184 +-- kig/objects/polygon_type.h | 22 +- kig/objects/special_calcers.cc | 4 +- kig/objects/special_calcers.h | 2 +- kig/objects/tests_type.cc | 66 +- kig/objects/tests_type.h | 16 +- kig/objects/text_imp.cc | 4 +- kig/objects/text_imp.h | 4 +- kig/objects/text_type.cc | 32 +- kig/objects/text_type.h | 6 +- kig/pykig/pykig.py | 6 +- kig/scripting/newscriptwizard.cc | 18 +- kig/scripting/newscriptwizard.h | 3 +- kig/scripting/newscriptwizardbase.ui | 18 +- kig/scripting/python_type.cc | 22 +- kig/scripting/python_type.h | 12 +- kig/scripting/script-common.cc | 4 +- kig/scripting/script_mode.cc | 16 +- kiten/configdictionaries.cpp | 6 +- kiten/configdictionaries.h | 3 +- kiten/configdictionariesbase.ui | 64 +- kiten/configfont.ui | 6 +- kiten/configlearn.ui | 30 +- kiten/configsearching.ui | 16 +- kiten/deinf.cpp | 6 +- kiten/deinf.h | 2 +- kiten/dict.cpp | 24 +- kiten/dict.h | 5 +- kiten/edict | 1094 ++++++++--------- kiten/edict_doc.html | 8 +- kiten/edict_kanjidic_licence.html | 2 +- kiten/kanjidic | 52 +- kiten/kiten.cpp | 118 +- kiten/kiten.h | 3 +- kiten/kloader.cpp | 6 +- kiten/kromajiedit.cpp | 16 +- kiten/kromajiedit.h | 3 +- kiten/ksaver.cpp | 2 +- kiten/learn.cpp | 86 +- kiten/learn.h | 7 +- kiten/main.cpp | 4 +- kiten/optiondialog.cpp | 4 +- kiten/optiondialog.h | 3 +- kiten/rad.cpp | 42 +- kiten/rad.h | 10 +- kiten/widgets.cpp | 76 +- kiten/widgets.h | 11 +- kiten/xjdic.h | 6 +- klatin/klatin/data/vocab/en/I2L.kvtml | 4 +- klatin/klatin/data/vocab/pl/A.kvtml | 2 +- klatin/klatin/data/vocab/pl/V.kvtml | 2 +- klatin/klatin/data/vocab/sk/A.kvtml | 2 +- klatin/klatin/data/vocab/sk/BC.kvtml | 2 +- klatin/klatin/data/vocab/sk/GHI1.kvtml | 2 +- klatin/klatin/data/vocab/sk/M.kvtml | 2 +- klatin/klatin/data/vocab/sk/P2.kvtml | 2 +- klatin/klatin/data/vocab/sk/QR.kvtml | 4 +- klatin/klatin/data/vocab/sk/TU.kvtml | 4 +- klatin/klatin/klatin.cpp | 30 +- klatin/klatin/klatin.h | 3 +- klatin/klatin/klatin.kcfg | 12 +- klatin/klatin/klatinchoose.ui | 40 +- klatin/klatin/klatingrammar.cpp | 30 +- klatin/klatin/klatingrammar.h | 3 +- klatin/klatin/klatingrammarwidget.ui | 70 +- klatin/klatin/klatinresultsdialog.ui | 34 +- klatin/klatin/klatinsettings_vocabpage.ui | 34 +- klatin/klatin/klatinverbs.cpp | 18 +- klatin/klatin/klatinverbs.h | 3 +- klatin/klatin/klatinverbswidget.ui | 68 +- klatin/klatin/klatinvocab.cpp | 12 +- klatin/klatin/klatinvocab.h | 9 +- klatin/klatin/klatinvocabwidget.ui | 70 +- klatin/klatin/settings.kcfgc | 2 +- klettres/klettres/fontsdlg.ui | 6 +- klettres/klettres/klettres.cpp | 88 +- klettres/klettres/klettres.h | 5 +- klettres/klettres/klettresview.cpp | 12 +- klettres/klettres/klettresview.h | 5 +- klettres/klettres/klnewstuff.cpp | 4 +- klettres/klettres/prefs_addons.h | 6 +- klettres/klettres/soundfactory.cpp | 10 +- klettres/klettres/soundfactory.h | 7 +- klettres/klettres/timer.h | 1 + klettres/klettres/timerdlg.ui | 32 +- kmplot/KmPlot.kdevelop | 2 +- kmplot/TODO | 2 +- kmplot/kmplot/FktDlg.cpp | 6 +- kmplot/kmplot/FktDlg.h | 5 +- kmplot/kmplot/FktDlgData.ui | 44 +- kmplot/kmplot/MainDlg.cpp | 72 +- kmplot/kmplot/MainDlg.h | 17 +- kmplot/kmplot/Makefile.am | 4 +- kmplot/kmplot/View.cpp | 80 +- kmplot/kmplot/View.h | 5 +- kmplot/kmplot/coordsconfigdialog.cpp | 4 +- kmplot/kmplot/coordsconfigdialog.h | 3 +- kmplot/kmplot/diagr.cpp | 42 +- kmplot/kmplot/diagr.h | 8 +- kmplot/kmplot/editderivativespage.ui | 28 +- kmplot/kmplot/editfunction.cpp | 24 +- kmplot/kmplot/editfunction.h | 5 +- kmplot/kmplot/editfunctionpage.ui | 140 +-- kmplot/kmplot/editintegralpage.ui | 30 +- kmplot/kmplot/kconstanteditor.cpp | 20 +- kmplot/kmplot/kconstanteditor.h | 3 +- kmplot/kmplot/keditconstant.cpp | 6 +- kmplot/kmplot/keditconstant.h | 5 +- kmplot/kmplot/keditparametric.cpp | 12 +- kmplot/kmplot/keditparametric.h | 6 +- kmplot/kmplot/keditpolar.cpp | 6 +- kmplot/kmplot/keditpolar.h | 8 +- kmplot/kmplot/kminmax.cpp | 56 +- kmplot/kmplot/kminmax.h | 5 +- kmplot/kmplot/kmplot.cpp | 14 +- kmplot/kmplot/kmplot.h | 1 + kmplot/kmplot/kmplotio.cpp | 16 +- kmplot/kmplot/kmplotio.h | 4 +- kmplot/kmplot/kmplotprogress.cpp | 4 +- kmplot/kmplot/kmplotprogress.h | 5 +- kmplot/kmplot/kparametereditor.cpp | 20 +- kmplot/kmplot/kparametereditor.h | 3 +- kmplot/kmplot/kprinterdlg.cpp | 18 +- kmplot/kmplot/kprinterdlg.h | 5 +- kmplot/kmplot/ksliderwindow.cpp | 14 +- kmplot/kmplot/ksliderwindow.h | 5 +- kmplot/kmplot/parser.cpp | 38 +- kmplot/kmplot/parser.h | 4 +- kmplot/kmplot/parseriface.h | 2 +- kmplot/kmplot/qconstanteditor.ui | 32 +- kmplot/kmplot/qconstanteditor.ui.h | 2 +- kmplot/kmplot/qeditconstant.ui | 24 +- kmplot/kmplot/qeditconstant.ui.h | 2 +- kmplot/kmplot/qeditparametric.ui | 68 +- kmplot/kmplot/qeditpolar.ui | 48 +- kmplot/kmplot/qminmax.ui | 20 +- kmplot/kmplot/qparametereditor.ui | 12 +- kmplot/kmplot/settingspagecolor.ui | 58 +- kmplot/kmplot/settingspagecoords.ui | 114 +- kmplot/kmplot/settingspagefonts.ui | 14 +- kmplot/kmplot/settingspageprecision.ui | 34 +- kmplot/kmplot/settingspagescaling.ui | 36 +- kmplot/kmplot/sliderwindow.ui | 16 +- kmplot/kmplot/xparser.cpp | 40 +- kmplot/kmplot/xparser.h | 6 +- kpercentage/kpercentage/kanimation.cpp | 10 +- kpercentage/kpercentage/kanimation.h | 2 +- kpercentage/kpercentage/kanswer.cpp | 16 +- kpercentage/kpercentage/kanswer.h | 9 +- kpercentage/kpercentage/kpercentage.cpp | 8 +- kpercentage/kpercentage/kpercentage.docbook | 44 +- kpercentage/kpercentage/kpercentage.h | 3 +- kpercentage/kpercentage/kpercentmain.cpp | 36 +- kpercentage/kpercentage/kpercentmain.h | 5 +- kpercentage/kpercentage/ksplashscreen.cpp | 6 +- kpercentage/kpercentage/ksplashscreen.h | 1 + kstars/ChangeLog | 2 +- kstars/README.i18n | 2 +- kstars/README.timekeeping | 2 +- kstars/TODO | 2 +- kstars/configure.in.in | 15 + kstars/kstars/Options.kcfgc | 2 +- kstars/kstars/addcatdialog.cpp | 20 +- kstars/kstars/addcatdialog.h | 3 +- kstars/kstars/addcatdialogui.ui | 52 +- kstars/kstars/addlinkdialog.cpp | 4 +- kstars/kstars/addlinkdialog.h | 3 +- kstars/kstars/addlinkdialogui.ui | 30 +- kstars/kstars/ccdpreviewui.ui | 74 +- kstars/kstars/ccdpreviewwg.cpp | 26 +- kstars/kstars/ccdpreviewwg.h | 14 +- kstars/kstars/colorscheme.cpp | 22 +- kstars/kstars/colorscheme.h | 2 +- kstars/kstars/conbridlg.cpp | 8 +- kstars/kstars/conbridlg.h | 5 +- kstars/kstars/contrastbrightnessgui.ui | 14 +- kstars/kstars/data/Cities.dat | 2 +- kstars/kstars/data/info_url.dat | 2 +- kstars/kstars/data/tips | 6 +- kstars/kstars/deepskyobject.cpp | 2 +- kstars/kstars/deepskyobject.h | 4 +- kstars/kstars/detaildialog.cpp | 112 +- kstars/kstars/detaildialog.h | 15 +- kstars/kstars/details_data.ui | 78 +- kstars/kstars/details_database.ui | 6 +- kstars/kstars/details_links.ui | 26 +- kstars/kstars/details_log.ui | 8 +- kstars/kstars/details_position.ui | 118 +- kstars/kstars/devicemanager.cpp | 26 +- kstars/kstars/devicemanager.h | 11 +- kstars/kstars/devmanager.ui | 54 +- kstars/kstars/dms.cpp | 22 +- kstars/kstars/dms.h | 2 +- kstars/kstars/dmsbox.cpp | 4 +- kstars/kstars/dmsbox.h | 7 +- kstars/kstars/draglistbox.cpp | 6 +- kstars/kstars/draglistbox.h | 7 +- kstars/kstars/filesource.cpp | 2 +- kstars/kstars/filesource.h | 2 +- kstars/kstars/finddialog.cpp | 24 +- kstars/kstars/finddialog.h | 9 +- kstars/kstars/fitsheaderdialog.ui | 10 +- kstars/kstars/fitshistogram.cpp | 24 +- kstars/kstars/fitshistogram.h | 5 +- kstars/kstars/fitsimage.cpp | 22 +- kstars/kstars/fitsimage.h | 12 +- kstars/kstars/fitsprocess.cpp | 8 +- kstars/kstars/fitsprocess.h | 4 +- kstars/kstars/fitsviewer.cpp | 92 +- kstars/kstars/fitsviewer.h | 5 +- kstars/kstars/focusdialog.cpp | 12 +- kstars/kstars/focusdialog.h | 5 +- kstars/kstars/focusdialogdlg.ui | 32 +- kstars/kstars/fov.cpp | 8 +- kstars/kstars/fov.h | 6 +- kstars/kstars/fovdialog.cpp | 30 +- kstars/kstars/fovdialog.h | 6 +- kstars/kstars/fovdialogui.ui | 26 +- kstars/kstars/geolocation.h | 2 +- kstars/kstars/histdialog.ui | 58 +- kstars/kstars/imagereductiondlg.cpp | 8 +- kstars/kstars/imagereductiondlg.h | 3 +- kstars/kstars/imagereductionui.ui | 104 +- kstars/kstars/imagesequence.cpp | 40 +- kstars/kstars/imagesequence.h | 5 +- kstars/kstars/imageviewer.cpp | 18 +- kstars/kstars/imageviewer.h | 5 +- kstars/kstars/imgsequencedlgui.ui | 92 +- kstars/kstars/indi/LICENSE | 4 +- kstars/kstars/indi/Makefile.am | 17 + kstars/kstars/indi/apmount.cpp | 9 +- kstars/kstars/indi/apogee/ApnCamera.cpp | 82 +- kstars/kstars/indi/apogee/ApnCamera.h | 10 +- kstars/kstars/indi/apogee/ApnCamera_Linux.cpp | 4 +- kstars/kstars/indi/apogee/ApnCamera_NET.cpp | 2 +- kstars/kstars/indi/apogee/ApnCamera_USB.cpp | 4 +- kstars/kstars/indi/apogee/Apogee.h | 8 +- kstars/kstars/indi/apogee/CameraIO_Linux.cpp | 86 +- kstars/kstars/indi/apogee/CameraIO_Linux.h | 32 +- .../kstars/indi/apogee/CameraIO_LinuxISA.cpp | 8 +- .../kstars/indi/apogee/CameraIO_LinuxPCI.cpp | 8 +- .../kstars/indi/apogee/CameraIO_LinuxPPI.cpp | 8 +- kstars/kstars/indi/apogee/CameraIO_PCI.cpp | 6 +- kstars/kstars/indi/apogee/Camera_Example.cpp | 22 +- kstars/kstars/indi/apogee/Makefile.am | 4 +- kstars/kstars/indi/apogee_ppi.cpp | 38 +- kstars/kstars/indi/base64.c | 2 +- kstars/kstars/indi/celestrongps.cpp | 10 +- kstars/kstars/indi/fitsrw.c | 14 +- kstars/kstars/indi/fli/libfli.c | 12 +- kstars/kstars/indi/fli/libfli.h | 2 +- kstars/kstars/indi/fli_ccd.c | 10 +- kstars/kstars/indi/indiapi.h | 10 +- kstars/kstars/indi/indicom.c | 4 +- kstars/kstars/indi/indicom.h | 4 +- kstars/kstars/indi/indiserver.c | 4 +- kstars/kstars/indi/lilxml.c | 14 +- kstars/kstars/indi/lilxml.h | 16 +- kstars/kstars/indi/lx200_16.cpp | 4 +- kstars/kstars/indi/lx200autostar.cpp | 2 +- kstars/kstars/indi/lx200basic.cpp | 2 +- kstars/kstars/indi/lx200classic.cpp | 2 +- kstars/kstars/indi/lx200driver.c | 16 +- kstars/kstars/indi/lx200driver.h | 6 +- kstars/kstars/indi/lx200generic.cpp | 17 +- kstars/kstars/indi/lx200gps.cpp | 8 +- kstars/kstars/indi/sbigccd.cpp | 8 +- kstars/kstars/indi/skycommander.c | 2 +- kstars/kstars/indi/temmadriver.h | 4 +- kstars/kstars/indi/v4lphilips.cpp | 6 +- kstars/kstars/indi/webcam/Makefile.am | 3 + kstars/kstars/indi/webcam/ccvt_c2.c | 2 +- kstars/kstars/indi/webcam/port.cpp | 6 +- kstars/kstars/indi/webcam/port.h | 8 +- kstars/kstars/indi/webcam/pwc-ioctl.h | 6 +- kstars/kstars/indi/webcam/v4l1_pwc.cpp | 4 +- kstars/kstars/indi/webcam/v4l1_pwc.h | 2 +- kstars/kstars/indi/webcam/v4l2_base.cpp | 62 +- kstars/kstars/indi/webcam/videodev.h | 4 +- kstars/kstars/indi/webcam/videodev2.h | 24 +- kstars/kstars/indiconf.ui | 66 +- kstars/kstars/indidevice.cpp | 34 +- kstars/kstars/indidevice.h | 13 +- kstars/kstars/indidriver.cpp | 56 +- kstars/kstars/indidriver.h | 10 +- kstars/kstars/indielement.cpp | 30 +- kstars/kstars/indielement.h | 17 +- kstars/kstars/indifitsconf.cpp | 4 +- kstars/kstars/indifitsconf.h | 3 +- kstars/kstars/indigroup.cpp | 10 +- kstars/kstars/indigroup.h | 6 +- kstars/kstars/indihostconf.ui | 40 +- kstars/kstars/indimenu.cpp | 14 +- kstars/kstars/indimenu.h | 13 +- kstars/kstars/indiproperty.cpp | 50 +- kstars/kstars/indiproperty.h | 19 +- kstars/kstars/indistd.cpp | 88 +- kstars/kstars/indistd.h | 12 +- kstars/kstars/infobox.cpp | 6 +- kstars/kstars/infobox.h | 9 +- kstars/kstars/infoboxes.cpp | 26 +- kstars/kstars/infoboxes.h | 3 +- kstars/kstars/kscomet.cpp | 4 +- kstars/kstars/ksfilereader.h | 1 + kstars/kstars/ksnewstuff.cpp | 18 +- kstars/kstars/ksnewstuff.h | 8 +- kstars/kstars/ksplanet.h | 4 +- kstars/kstars/ksplanetbase.cpp | 2 +- kstars/kstars/ksplanetbase.h | 8 +- kstars/kstars/kspopupmenu.cpp | 32 +- kstars/kstars/kspopupmenu.h | 3 +- kstars/kstars/kssun.cpp | 2 +- kstars/kstars/kstars.cpp | 6 +- kstars/kstars/kstars.h | 7 +- kstars/kstars/kstarsactions.cpp | 94 +- kstars/kstars/kstarsdata.cpp | 156 +-- kstars/kstars/kstarsdata.h | 13 +- kstars/kstars/kstarsdatetime.cpp | 8 +- kstars/kstars/kstarsdatetime.h | 2 +- kstars/kstars/kstarsdcop.cpp | 66 +- kstars/kstars/kstarsinit.cpp | 118 +- kstars/kstars/kstarssplash.cpp | 26 +- kstars/kstars/kstarssplash.h | 7 +- kstars/kstars/kswizard.cpp | 6 +- kstars/kstars/kswizard.h | 5 +- kstars/kstars/kswizardui.ui | 168 +-- kstars/kstars/locationdialog.cpp | 42 +- kstars/kstars/locationdialog.h | 11 +- kstars/kstars/magnitudespinbox.cpp | 8 +- kstars/kstars/magnitudespinbox.h | 6 +- kstars/kstars/main.cpp | 28 +- kstars/kstars/mapcanvas.cpp | 12 +- kstars/kstars/mapcanvas.h | 11 +- kstars/kstars/newfovui.ui | 174 +-- kstars/kstars/objectnamelist.cpp | 4 +- kstars/kstars/objectnamelist.h | 10 +- kstars/kstars/opsadvanced.h | 3 +- kstars/kstars/opsadvancedui.ui | 72 +- kstars/kstars/opscatalog.cpp | 8 +- kstars/kstars/opscatalog.h | 3 +- kstars/kstars/opscatalogui.ui | 86 +- kstars/kstars/opscolors.cpp | 20 +- kstars/kstars/opscolors.h | 3 +- kstars/kstars/opscolorsui.ui | 40 +- kstars/kstars/opsguides.cpp | 4 +- kstars/kstars/opsguides.h | 3 +- kstars/kstars/opsguidesui.ui | 40 +- kstars/kstars/opssolarsystem.cpp | 8 +- kstars/kstars/opssolarsystem.h | 3 +- kstars/kstars/opssolarsystemui.ui | 72 +- kstars/kstars/planetcatalog.cpp | 2 +- kstars/kstars/planetcatalog.h | 3 +- kstars/kstars/simclock.cpp | 10 +- kstars/kstars/simclock.h | 5 +- kstars/kstars/skymap.cpp | 46 +- kstars/kstars/skymap.h | 35 +- kstars/kstars/skymapdraw.cpp | 18 +- kstars/kstars/skymapevents.cpp | 26 +- kstars/kstars/skyobject.cpp | 30 +- kstars/kstars/skyobject.h | 2 +- kstars/kstars/skyobjectname.cpp | 4 +- kstars/kstars/skyobjectname.h | 4 +- kstars/kstars/skypoint.cpp | 22 +- kstars/kstars/skypoint.h | 6 +- kstars/kstars/stardatasink.cpp | 4 +- kstars/kstars/stardatasink.h | 5 +- kstars/kstars/starobject.cpp | 2 +- kstars/kstars/starobject.h | 2 +- kstars/kstars/starpixmap.cpp | 18 +- kstars/kstars/statform.ui | 24 +- kstars/kstars/streamformui.ui | 22 +- kstars/kstars/streamwg.cpp | 18 +- kstars/kstars/streamwg.h | 14 +- kstars/kstars/telescopeprop.cpp | 12 +- kstars/kstars/telescopeprop.h | 3 +- kstars/kstars/telescopepropui.ui | 48 +- kstars/kstars/telescopewizard.ui | 134 +- kstars/kstars/telescopewizardprocess.cpp | 32 +- kstars/kstars/telescopewizardprocess.h | 3 +- kstars/kstars/thumbnaileditor.cpp | 12 +- kstars/kstars/thumbnaileditor.h | 8 +- kstars/kstars/thumbnaileditorui.ui | 14 +- kstars/kstars/thumbnailpicker.cpp | 22 +- kstars/kstars/thumbnailpicker.h | 3 +- kstars/kstars/thumbnailpickerui.ui | 60 +- kstars/kstars/timebox.cpp | 22 +- kstars/kstars/timebox.h | 6 +- kstars/kstars/timedialog.cpp | 10 +- kstars/kstars/timedialog.h | 9 +- kstars/kstars/timespinbox.cpp | 4 +- kstars/kstars/timespinbox.h | 7 +- kstars/kstars/timestepbox.cpp | 4 +- kstars/kstars/timestepbox.h | 3 +- kstars/kstars/timeunitbox.cpp | 4 +- kstars/kstars/timeunitbox.h | 3 +- kstars/kstars/timezonerule.cpp | 8 +- kstars/kstars/timezonerule.h | 4 +- kstars/kstars/toggleaction.cpp | 8 +- kstars/kstars/toggleaction.h | 5 +- kstars/kstars/tools/altvstime.cpp | 38 +- kstars/kstars/tools/altvstime.h | 6 +- kstars/kstars/tools/altvstimeui.ui | 64 +- kstars/kstars/tools/argchangeviewoption.ui | 20 +- kstars/kstars/tools/argexportimage.ui | 52 +- kstars/kstars/tools/argloadcolorscheme.ui | 6 +- kstars/kstars/tools/arglooktoward.ui | 18 +- kstars/kstars/tools/argprintimage.ui | 12 +- kstars/kstars/tools/argsetactionindi.ui | 26 +- kstars/kstars/tools/argsetaltaz.ui | 18 +- kstars/kstars/tools/argsetccdtempindi.ui | 26 +- kstars/kstars/tools/argsetcolor.ui | 44 +- kstars/kstars/tools/argsetfilternumindi.ui | 26 +- kstars/kstars/tools/argsetfocusspeedindi.ui | 14 +- kstars/kstars/tools/argsetfocustimeoutindi.ui | 26 +- kstars/kstars/tools/argsetframetypeindi.ui | 28 +- kstars/kstars/tools/argsetgeolocation.ui | 38 +- kstars/kstars/tools/argsetgeolocationindi.ui | 26 +- kstars/kstars/tools/argsetlocaltime.ui | 16 +- kstars/kstars/tools/argsetportindi.ui | 16 +- kstars/kstars/tools/argsetradec.ui | 16 +- kstars/kstars/tools/argsetscopeactionindi.ui | 28 +- kstars/kstars/tools/argsettargetcoordindi.ui | 26 +- kstars/kstars/tools/argsettargetnameindi.ui | 30 +- kstars/kstars/tools/argsettrack.ui | 16 +- kstars/kstars/tools/argsetutcindi.ui | 26 +- kstars/kstars/tools/argshutdownindi.ui | 18 +- kstars/kstars/tools/argstartexposureindi.ui | 26 +- kstars/kstars/tools/argstartfocusindi.ui | 28 +- kstars/kstars/tools/argstartindi.ui | 26 +- kstars/kstars/tools/argswitchindi.ui | 26 +- kstars/kstars/tools/argtimescale.ui | 14 +- kstars/kstars/tools/argwaitfor.ui | 18 +- kstars/kstars/tools/argwaitforkey.ui | 16 +- kstars/kstars/tools/argzoom.ui | 16 +- kstars/kstars/tools/astrocalc.cpp | 28 +- kstars/kstars/tools/astrocalc.h | 12 +- kstars/kstars/tools/jmoontool.cpp | 22 +- kstars/kstars/tools/jmoontool.h | 3 +- kstars/kstars/tools/kstarsplotwidget.cpp | 64 +- kstars/kstars/tools/kstarsplotwidget.h | 3 +- kstars/kstars/tools/lcgenerator.cpp | 26 +- kstars/kstars/tools/lcgenerator.h | 5 +- kstars/kstars/tools/modcalcangdist.cpp | 6 +- kstars/kstars/tools/modcalcangdist.h | 1 + kstars/kstars/tools/modcalcangdistdlg.ui | 98 +- kstars/kstars/tools/modcalcapcoord.cpp | 18 +- kstars/kstars/tools/modcalcapcoord.h | 3 +- kstars/kstars/tools/modcalcapcoorddlg.ui | 124 +- kstars/kstars/tools/modcalcazel.cpp | 22 +- kstars/kstars/tools/modcalcazel.h | 1 + kstars/kstars/tools/modcalcazeldlg.ui | 160 +-- kstars/kstars/tools/modcalcdaylength.cpp | 38 +- kstars/kstars/tools/modcalcdaylength.h | 3 +- kstars/kstars/tools/modcalcdaylengthdlg.ui | 88 +- kstars/kstars/tools/modcalceclipticcoords.cpp | 6 +- kstars/kstars/tools/modcalceclipticcoords.h | 3 +- .../kstars/tools/modcalceclipticcoordsdlg.ui | 120 +- kstars/kstars/tools/modcalcequinox.cpp | 18 +- kstars/kstars/tools/modcalcequinox.h | 5 +- kstars/kstars/tools/modcalcequinoxdlg.ui | 78 +- kstars/kstars/tools/modcalcgalcoord.cpp | 6 +- kstars/kstars/tools/modcalcgalcoord.h | 3 +- kstars/kstars/tools/modcalcgalcoorddlg.ui | 118 +- kstars/kstars/tools/modcalcgeodcoord.cpp | 8 +- kstars/kstars/tools/modcalcgeodcoord.h | 3 +- kstars/kstars/tools/modcalcgeoddlg.ui | 108 +- kstars/kstars/tools/modcalcjd.cpp | 10 +- kstars/kstars/tools/modcalcjd.h | 3 +- kstars/kstars/tools/modcalcjddlg.ui | 78 +- kstars/kstars/tools/modcalcplanets.cpp | 28 +- kstars/kstars/tools/modcalcplanets.h | 1 + kstars/kstars/tools/modcalcplanetsdlg.ui | 212 ++-- kstars/kstars/tools/modcalcprec.cpp | 10 +- kstars/kstars/tools/modcalcprec.h | 1 + kstars/kstars/tools/modcalcprecdlg.ui | 98 +- kstars/kstars/tools/modcalcsidtime.cpp | 14 +- kstars/kstars/tools/modcalcsidtime.h | 1 + kstars/kstars/tools/modcalcsidtimedlg.ui | 130 +- kstars/kstars/tools/modcalcvlsr.cpp | 18 +- kstars/kstars/tools/modcalcvlsr.h | 1 + kstars/kstars/tools/modcalcvlsrdlg.ui | 188 +-- kstars/kstars/tools/observinglist.cpp | 48 +- kstars/kstars/tools/observinglist.h | 5 +- kstars/kstars/tools/observinglistui.ui | 54 +- kstars/kstars/tools/obslistwizard.cpp | 78 +- kstars/kstars/tools/obslistwizard.h | 3 +- kstars/kstars/tools/obslistwizardui.ui | 142 +-- kstars/kstars/tools/optionstreeview.ui | 16 +- kstars/kstars/tools/planetviewer.cpp | 24 +- kstars/kstars/tools/planetviewer.h | 8 +- kstars/kstars/tools/planetviewerui.ui | 14 +- kstars/kstars/tools/scriptbuilder.cpp | 286 ++--- kstars/kstars/tools/scriptbuilder.h | 5 +- kstars/kstars/tools/scriptbuilderui.ui | 96 +- kstars/kstars/tools/scriptfunction.cpp | 74 +- kstars/kstars/tools/scriptnamedialog.ui | 24 +- kstars/kstars/tools/wutdialog.cpp | 30 +- kstars/kstars/tools/wutdialog.h | 1 + kstars/kstars/tools/wutdialogui.ui | 98 +- ktouch/ChangeLog | 12 +- ktouch/extras/training-gen/perl/dk.config | 2 +- ktouch/extras/training-gen/perl/en.config | 2 +- ktouch/extras/training-gen/perl/es.config | 2 +- .../extras/training-gen/python/ktouchgen.py | 4 +- ktouch/keyboards/be.keyboard | 8 +- ktouch/keyboards/bg.keyboard | 2 +- ktouch/keyboards/de.keyboard | 2 +- ktouch/keyboards/de.neo.keyboard | 2 +- ktouch/keyboards/de.swiss.keyboard | 2 +- ktouch/keyboards/dk.keyboard | 2 +- ktouch/keyboards/dvorak_fr.keyboard | 2 +- ktouch/keyboards/ee.keyboard | 2 +- ktouch/keyboards/en.dvorak.keyboard | 2 +- ktouch/keyboards/en.keyboard | 8 +- ktouch/keyboards/es.dvorak.keyboard | 2 +- ktouch/keyboards/es.keyboard | 2 +- ktouch/keyboards/fi.keyboard | 2 +- ktouch/keyboards/fr.a.keyboard | 2 +- ktouch/keyboards/fr.keyboard | 2 +- ktouch/keyboards/fr.swiss.keyboard | 2 +- ktouch/keyboards/he.keyboard | 2 +- ktouch/keyboards/hu.keyboard | 2 +- ktouch/keyboards/it.keyboard | 2 +- ktouch/keyboards/la.keyboard | 2 +- ktouch/keyboards/nb.keyboard | 4 +- ktouch/keyboards/nn.keyboard | 2 +- ktouch/keyboards/pl.keyboard | 2 +- ktouch/keyboards/pt.br.keyboard | 2 +- ktouch/keyboards/pt.keyboard | 2 +- ktouch/keyboards/ru.2.keyboard | 2 +- ktouch/keyboards/ru.3.keyboard | 2 +- ktouch/keyboards/ru.basic.keyboard | 2 +- ktouch/keyboards/ru.keyboard | 2 +- ktouch/keyboards/ru.typewriter.keyboard | 2 +- ktouch/keyboards/ru.winkeys.keyboard | 2 +- ktouch/keyboards/sl.keyboard | 2 +- ktouch/keyboards/sv.dvorak.keyboard | 2 +- ktouch/keyboards/sv.keyboard | 2 +- ktouch/keyboards/tr.f.keyboard | 2 +- ktouch/keyboards/tr.q.keyboard | 2 +- ktouch/keyboards/uk.basic.keyboard | 2 +- ktouch/keyboards/uk.typewriter.keyboard | 2 +- ktouch/keyboards/uk.winkeys.keyboard | 2 +- ktouch/ktouch.lsm | 2 +- ktouch/src/ktouch.cpp | 102 +- ktouch/src/ktouch.h | 17 +- ktouch/src/ktouchchartwidget.cpp | 4 +- ktouch/src/ktouchchartwidget.h | 3 +- ktouch/src/ktouchcoloreditor.cpp | 10 +- ktouch/src/ktouchcoloreditor.h | 3 +- ktouch/src/ktouchcoloreditor_dlg.ui | 108 +- ktouch/src/ktouchcolorscheme.cpp | 106 +- ktouch/src/ktouchdefaults.h | 2 +- ktouch/src/ktouchkey.h | 2 +- ktouch/src/ktouchkeyboard.cpp | 46 +- ktouch/src/ktouchkeyboard.h | 12 +- ktouch/src/ktouchkeyboardeditor.cpp | 18 +- ktouch/src/ktouchkeyboardeditor.h | 3 +- ktouch/src/ktouchkeyboardeditor_dlg.ui | 46 +- ktouch/src/ktouchkeyboardwidget.cpp | 42 +- ktouch/src/ktouchkeyboardwidget.h | 17 +- ktouch/src/ktouchkeys.cpp | 2 +- ktouch/src/ktouchkeys.h | 8 +- ktouch/src/ktouchlecture.cpp | 8 +- ktouch/src/ktouchlecture.h | 2 +- ktouch/src/ktouchlectureeditor.cpp | 12 +- ktouch/src/ktouchlectureeditor.h | 3 +- ktouch/src/ktouchlectureeditor_dlg.ui | 90 +- ktouch/src/ktouchleveldata.cpp | 4 +- ktouch/src/ktouchopenrequest.cpp | 8 +- ktouch/src/ktouchopenrequest.h | 5 +- ktouch/src/ktouchopenrequest_dlg.ui | 42 +- ktouch/src/ktouchprefcolorslayout.ui | 76 +- ktouch/src/ktouchprefgenerallayout.ui | 58 +- ktouch/src/ktouchprefkeyboardlayout.ui | 32 +- ktouch/src/ktouchpreftraininglayout.ui | 58 +- ktouch/src/ktouchslideline.cpp | 16 +- ktouch/src/ktouchslideline.h | 11 +- ktouch/src/ktouchstatistics.cpp | 22 +- ktouch/src/ktouchstatistics.h | 3 +- ktouch/src/ktouchstatistics_dlg.ui | 266 ++-- ktouch/src/ktouchstatisticsdata.cpp | 36 +- ktouch/src/ktouchstatisticsdata.h | 6 +- ktouch/src/ktouchstatus.cpp | 10 +- ktouch/src/ktouchstatus.h | 9 +- ktouch/src/ktouchstatuslayout.ui | 60 +- ktouch/src/ktouchtrainer.cpp | 18 +- ktouch/src/ktouchtrainer.h | 7 +- ktouch/src/ktouchutils.cpp | 2 +- kturtle/TODO | 2 +- kturtle/src/canvas.cpp | 16 +- kturtle/src/canvas.h | 5 +- kturtle/src/dialogs.cpp | 58 +- kturtle/src/dialogs.h | 15 +- kturtle/src/executer.cpp | 30 +- kturtle/src/executer.h | 3 +- kturtle/src/kturtle.cpp | 174 +-- kturtle/src/kturtle.h | 1 + kturtle/src/kturtle.kcfg | 18 +- kturtle/src/parser.cpp | 24 +- kturtle/src/parser.h | 3 +- kturtle/src/translate.cpp | 2 +- kturtle/src/treenode.cpp | 26 +- kturtle/src/treenode.h | 12 +- kverbos/kverbos/data/en/verbos.verbos | 2 +- kverbos/kverbos/kerfassen.cpp | 16 +- kverbos/kverbos/kerfassen.h | 52 +- kverbos/kverbos/kfeedercontrol.cpp | 8 +- kverbos/kverbos/kresult.cpp | 4 +- kverbos/kverbos/kresult.h | 2 +- kverbos/kverbos/kstartuplogo.cpp | 4 +- kverbos/kverbos/kstartuplogo.h | 3 +- kverbos/kverbos/kverbedit.cpp | 4 +- kverbos/kverbos/kverbedit.h | 24 +- kverbos/kverbos/kverbos.cpp | 90 +- kverbos/kverbos/kverbos.h | 7 +- kverbos/kverbos/kverbos.kcfg | 2 +- kverbos/kverbos/kverbosdoc.cpp | 30 +- kverbos/kverbos/kverbosdoc.h | 13 +- kverbos/kverbos/kverbosoptions.cpp | 4 +- kverbos/kverbos/kverbosoptions.h | 10 +- kverbos/kverbos/kverbosuser.cpp | 14 +- kverbos/kverbos/kverbosview.cpp | 38 +- kverbos/kverbos/kverbosview.h | 35 +- kverbos/kverbos/qerfassen.ui | 590 ++++----- kverbos/kverbos/qlernen.ui | 194 +-- kverbos/kverbos/qresult.ui | 36 +- kverbos/kverbos/qverbedit.ui | 26 +- kverbos/kverbos/qverbosoptions.ui | 216 ++-- kverbos/kverbos/verbspanish.cpp | 96 +- .../kvoctrain/common-dialogs/ProgressDlg.cpp | 4 +- .../kvoctrain/common-dialogs/ProgressDlg.h | 3 +- .../common-dialogs/ProgressDlgForm.ui | 24 +- .../kvoctrain/common-dialogs/blockoptions.cpp | 10 +- .../kvoctrain/common-dialogs/blockoptions.h | 3 +- .../common-dialogs/blockoptionsbase.ui | 56 +- .../common-dialogs/generaloptions.cpp | 4 +- .../kvoctrain/common-dialogs/generaloptions.h | 3 +- .../common-dialogs/generaloptionsbase.ui | 26 +- .../kvoctrain/common-dialogs/groupoptions.cpp | 4 +- .../kvoctrain/common-dialogs/groupoptions.h | 3 +- .../common-dialogs/groupoptionsbase.ui | 24 +- .../kvoctrain/common-dialogs/kvoctrain.kcfg | 2 +- .../common-dialogs/kvoctrainprefs.cpp | 4 +- .../kvoctrain/common-dialogs/kvoctrainprefs.h | 3 +- .../common-dialogs/languageoptions.cpp | 84 +- .../common-dialogs/languageoptions.h | 3 +- .../common-dialogs/languageoptionsbase.ui | 48 +- .../kvoctrain/common-dialogs/pasteoptions.cpp | 4 +- .../kvoctrain/common-dialogs/pasteoptions.h | 3 +- .../common-dialogs/pasteoptionsbase.ui | 28 +- .../common-dialogs/profilesdialog.cpp | 26 +- .../kvoctrain/common-dialogs/profilesdialog.h | 3 +- .../kvoctrain/common-dialogs/queryoptions.cpp | 4 +- .../kvoctrain/common-dialogs/queryoptions.h | 7 +- .../common-dialogs/queryoptionsbase.ui | 62 +- .../common-dialogs/thresholdoptions.cpp | 4 +- .../common-dialogs/thresholdoptions.h | 3 +- .../common-dialogs/thresholdoptionsbase.ui | 60 +- .../kvoctrain/common-dialogs/viewoptions.cpp | 4 +- .../kvoctrain/common-dialogs/viewoptions.h | 3 +- .../common-dialogs/viewoptionsbase.ui | 32 +- .../docprop-dialogs/DocOptionsPage.cpp | 2 +- .../docprop-dialogs/DocOptionsPage.h | 3 +- .../docprop-dialogs/DocOptionsPageForm.ui | 10 +- .../kvoctrain/docprop-dialogs/DocPropDlg.cpp | 4 +- .../kvoctrain/docprop-dialogs/DocPropDlg.h | 3 +- .../docprop-dialogs/DocPropLangDlg.cpp | 4 +- .../docprop-dialogs/DocPropLangDlg.h | 3 +- .../docprop-dialogs/LangPropPage.cpp | 4 +- .../kvoctrain/docprop-dialogs/LangPropPage.h | 3 +- .../docprop-dialogs/LangPropPageForm.ui | 86 +- .../kvoctrain/docprop-dialogs/LessOptPage.cpp | 14 +- .../kvoctrain/docprop-dialogs/LessOptPage.h | 3 +- .../docprop-dialogs/LessOptPageForm.ui | 20 +- .../docprop-dialogs/TenseOptPage.cpp | 20 +- .../kvoctrain/docprop-dialogs/TenseOptPage.h | 3 +- .../docprop-dialogs/TenseOptPageForm.ui | 20 +- .../kvoctrain/docprop-dialogs/TitlePage.cpp | 4 +- .../kvoctrain/docprop-dialogs/TitlePage.h | 3 +- .../docprop-dialogs/TitlePageForm.ui | 28 +- .../kvoctrain/docprop-dialogs/TypeOptPage.cpp | 22 +- .../kvoctrain/docprop-dialogs/TypeOptPage.h | 3 +- .../docprop-dialogs/TypeOptPageForm.ui | 20 +- .../docprop-dialogs/UsageOptPage.cpp | 20 +- .../kvoctrain/docprop-dialogs/UsageOptPage.h | 3 +- .../docprop-dialogs/UsageOptPageForm.ui | 20 +- .../kvoctrain/entry-dialogs/AdjEntryPage.cpp | 4 +- .../kvoctrain/entry-dialogs/AdjEntryPage.h | 3 +- .../entry-dialogs/AdjEntryPageForm.ui | 20 +- .../entry-dialogs/AuxInfoEntryPage.cpp | 4 +- .../entry-dialogs/AuxInfoEntryPage.h | 3 +- .../entry-dialogs/AuxInfoEntryPageForm.ui | 38 +- .../entry-dialogs/CommonEntryPage.cpp | 12 +- .../kvoctrain/entry-dialogs/CommonEntryPage.h | 3 +- .../entry-dialogs/CommonEntryPageForm.ui | 72 +- .../kvoctrain/entry-dialogs/EntryDlg.cpp | 32 +- kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h | 11 +- .../entry-dialogs/FromToEntryPage.cpp | 26 +- .../kvoctrain/entry-dialogs/FromToEntryPage.h | 9 +- .../entry-dialogs/FromToEntryPageForm.ui | 44 +- .../kvoctrain/entry-dialogs/MCEntryPage.cpp | 4 +- .../kvoctrain/entry-dialogs/MCEntryPage.h | 3 +- .../entry-dialogs/MCEntryPageForm.ui | 28 +- .../kvoctrain/entry-dialogs/MySpinBox.cpp | 4 +- kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h | 6 +- .../entry-dialogs/PhoneticEntryPage.cpp | 26 +- .../entry-dialogs/PhoneticEntryPage.h | 10 +- .../entry-dialogs/TenseEntryPage.cpp | 4 +- .../kvoctrain/entry-dialogs/TenseEntryPage.h | 3 +- .../entry-dialogs/TenseEntryPageForm.ui | 64 +- kvoctrain/kvoctrain/entry-dialogs/blockall.h | 2 +- kvoctrain/kvoctrain/kv_resource.h | 4 +- kvoctrain/kvoctrain/kva_clip.cpp | 18 +- kvoctrain/kvoctrain/kva_config.cpp | 10 +- kvoctrain/kvoctrain/kva_header.cpp | 86 +- kvoctrain/kvoctrain/kva_init.cpp | 84 +- kvoctrain/kvoctrain/kva_io.cpp | 66 +- kvoctrain/kvoctrain/kva_query.cpp | 32 +- kvoctrain/kvoctrain/kvoctrain.cpp | 92 +- kvoctrain/kvoctrain/kvoctrain.h | 5 +- kvoctrain/kvoctrain/kvoctraintable.cpp | 44 +- kvoctrain/kvoctrain/kvoctraintable.h | 9 +- kvoctrain/kvoctrain/kvoctraintableitem.cpp | 4 +- kvoctrain/kvoctrain/kvoctraintableitem.h | 2 +- kvoctrain/kvoctrain/kvoctrainview.cpp | 52 +- kvoctrain/kvoctrain/kvoctrainview.h | 9 +- kvoctrain/kvoctrain/kvt-core/LineList.cpp | 6 +- kvoctrain/kvoctrain/kvt-core/LineList.h | 2 +- kvoctrain/kvoctrain/kvt-core/QueryManager.cpp | 94 +- kvoctrain/kvoctrain/kvt-core/QueryManager.h | 60 +- kvoctrain/kvoctrain/kvt-core/UsageManager.cpp | 4 +- kvoctrain/kvoctrain/kvt-core/UsageManager.h | 2 +- kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp | 42 +- kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp | 18 +- .../kvoctrain/kvt-core/kvd_rb_kvtml1.cpp | 96 +- .../kvoctrain/kvt-core/kvd_rb_kvtml2.cpp | 18 +- kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp | 74 +- kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp | 18 +- kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp | 8 +- kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp | 28 +- kvoctrain/kvoctrain/kvt-core/kvoctraincore.h | 50 +- kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp | 36 +- kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h | 9 +- .../kvoctrain/kvt-core/kvoctrainexpr.cpp | 4 +- kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h | 2 +- .../kvoctrain/kvt-core/kvt-xml/XmlReader.cpp | 14 +- .../kvt-core/kvt-xml/XmlTokenizer.cpp | 4 +- .../kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h | 2 +- .../kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp | 10 +- .../kvoctrain/kvt-core/kvt-xml/XmlWriter.h | 8 +- .../kvoctrain/kvt-core/kvt-xml/koxml_config.h | 8 +- kvoctrain/kvoctrain/kvt-core/langset.cpp | 16 +- kvoctrain/kvoctrain/kvt-core/langset.h | 10 +- kvoctrain/kvoctrain/kvtnewstuff.cpp | 20 +- kvoctrain/kvoctrain/kvtnewstuff.h | 3 +- kvoctrain/kvoctrain/main.cpp | 2 +- .../kvoctrain/query-dialogs/AdjQueryDlg.h | 1 + .../query-dialogs/AdjQueryDlgForm.ui | 50 +- .../kvoctrain/query-dialogs/ArtQueryDlg.cpp | 24 +- .../kvoctrain/query-dialogs/ArtQueryDlg.h | 1 + .../query-dialogs/ArtQueryDlgForm.ui | 48 +- .../kvoctrain/query-dialogs/MCQueryDlg.cpp | 2 +- .../kvoctrain/query-dialogs/MCQueryDlg.h | 1 + .../kvoctrain/query-dialogs/MCQueryDlgForm.ui | 70 +- .../kvoctrain/query-dialogs/QueryDlgBase.cpp | 28 +- .../kvoctrain/query-dialogs/QueryDlgBase.h | 3 +- .../query-dialogs/RandomQueryDlg.cpp | 22 +- .../kvoctrain/query-dialogs/RandomQueryDlg.h | 1 + .../query-dialogs/RandomQueryDlgForm.ui | 58 +- .../query-dialogs/SimpleQueryDlg.cpp | 28 +- .../kvoctrain/query-dialogs/SimpleQueryDlg.h | 1 + .../query-dialogs/SimpleQueryDlgForm.ui | 52 +- .../kvoctrain/query-dialogs/VerbQueryDlg.cpp | 2 +- .../kvoctrain/query-dialogs/VerbQueryDlg.h | 1 + .../query-dialogs/VerbQueryDlgForm.ui | 104 +- kvoctrain/kvoctrain/spotlight2kvtml.cpp | 62 +- .../statistik-dialogs/GenStatPage.cpp | 2 +- .../kvoctrain/statistik-dialogs/GenStatPage.h | 3 +- .../statistik-dialogs/GenStatPageForm.ui | 28 +- .../statistik-dialogs/StatistikDlg.cpp | 4 +- .../statistik-dialogs/StatistikDlg.h | 3 +- .../statistik-dialogs/StatistikPage.cpp | 16 +- .../statistik-dialogs/StatistikPage.h | 3 +- .../statistik-dialogs/StatistikPageForm.ui | 10 +- kvoctrain/kvoctrain/tools/extractlang.cpp | 14 +- kwordquiz/src/dlglanguage.cpp | 2 +- kwordquiz/src/dlglanguage.h | 3 +- kwordquiz/src/dlglanguagebase.ui | 36 +- kwordquiz/src/dlgrc.cpp | 2 +- kwordquiz/src/dlgrc.h | 3 +- kwordquiz/src/dlgrcbase.ui | 28 +- kwordquiz/src/dlgsort.cpp | 2 +- kwordquiz/src/dlgsort.h | 3 +- kwordquiz/src/dlgsortbase.ui | 24 +- kwordquiz/src/dlgspecchar.cpp | 8 +- kwordquiz/src/dlgspecchar.h | 3 +- kwordquiz/src/flashview.cpp | 16 +- kwordquiz/src/flashview.h | 11 +- kwordquiz/src/flashviewbase.ui | 64 +- kwordquiz/src/keduvocdata.cpp | 8 +- kwordquiz/src/kvtmlwriter.cpp | 24 +- kwordquiz/src/kwordquiz.cpp | 248 ++-- kwordquiz/src/kwordquiz.h | 31 +- kwordquiz/src/kwordquizdoc.cpp | 26 +- kwordquiz/src/kwordquizdoc.h | 17 +- kwordquiz/src/kwordquizprefs.cpp | 6 +- kwordquiz/src/kwordquizprefs.h | 7 +- kwordquiz/src/kwordquizview.cpp | 58 +- kwordquiz/src/kwordquizview.h | 29 +- kwordquiz/src/kwqnewstuff.cpp | 28 +- kwordquiz/src/kwqnewstuff.h | 9 +- kwordquiz/src/main.cpp | 2 +- kwordquiz/src/multipleview.cpp | 20 +- kwordquiz/src/multipleview.h | 9 +- kwordquiz/src/multipleviewbase.ui | 150 +-- kwordquiz/src/paukerreader.cpp | 6 +- kwordquiz/src/prefcardappearance.cpp | 4 +- kwordquiz/src/prefcardappearance.h | 3 +- kwordquiz/src/prefcardappearancebase.ui | 46 +- kwordquiz/src/prefcharacter.cpp | 4 +- kwordquiz/src/prefcharacter.h | 3 +- kwordquiz/src/prefcharacterbase.ui | 28 +- kwordquiz/src/prefeditor.cpp | 4 +- kwordquiz/src/prefeditor.h | 3 +- kwordquiz/src/prefeditorbase.ui | 20 +- kwordquiz/src/prefquiz.cpp | 4 +- kwordquiz/src/prefquiz.h | 7 +- kwordquiz/src/prefquizbase.ui | 40 +- kwordquiz/src/qaview.cpp | 44 +- kwordquiz/src/qaview.h | 17 +- kwordquiz/src/qaviewbase.ui | 138 +-- kwordquiz/src/version.h | 2 +- kwordquiz/src/wqlistitem.cpp | 14 +- kwordquiz/src/wqlistitem.h | 10 +- kwordquiz/src/wqlreader.cpp | 28 +- kwordquiz/src/wqlreader.h | 4 +- kwordquiz/src/wqlwriter.cpp | 12 +- kwordquiz/src/wqlwriter.h | 4 +- kwordquiz/src/wqprintdialogpage.cpp | 20 +- kwordquiz/src/wqprintdialogpage.h | 11 +- kwordquiz/src/wqquiz.cpp | 94 +- kwordquiz/src/wqquiz.h | 11 +- kwordquiz/src/wqscore.cpp | 26 +- kwordquiz/src/wqscore.h | 10 +- kwordquiz/src/wqundo.h | 6 +- libkdeedu/extdate/extcalendarsystem.cpp | 2 +- libkdeedu/extdate/extcalendarsystem.h | 12 +- .../extdate/extcalendarsystemgregorian.cpp | 8 +- libkdeedu/extdate/extdatepicker.cpp | 66 +- libkdeedu/extdate/extdatepicker.h | 21 +- libkdeedu/extdate/extdatetbl.cpp | 108 +- libkdeedu/extdate/extdatetbl.h | 39 +- libkdeedu/extdate/extdatetime.cpp | 136 +- libkdeedu/extdate/extdatetime.h | 48 +- libkdeedu/extdate/extdatetimeedit.cpp | 447 ++++--- libkdeedu/extdate/extdatetimeedit.h | 140 ++- libkdeedu/extdate/extdatewidget.cpp | 32 +- libkdeedu/extdate/extdatewidget.h | 9 +- libkdeedu/extdate/test_extdate.cc | 32 +- libkdeedu/extdate/testwidget.cpp | 4 +- libkdeedu/extdate/testwidget.h | 3 +- libkdeedu/kdeeducore/keduvocdata.cpp | 6 +- libkdeedu/kdeeduplot/kplotaxis.h | 2 +- libkdeedu/kdeeduplot/kplotobject.h | 6 +- libkdeedu/kdeeduplot/kplotwidget.cpp | 26 +- libkdeedu/kdeeduplot/kplotwidget.h | 9 +- libkdeedu/kdeeduui/kdeeduglossary.cpp | 44 +- libkdeedu/kdeeduui/kdeeduglossary.h | 7 +- libkdeedu/kdeeduui/kedusimpleentrydlg.h | 1 + libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui | 30 +- 1239 files changed, 15382 insertions(+), 15016 deletions(-) diff --git a/blinken/src/artsplayer.h b/blinken/src/artsplayer.h index 64586074..97f9f62c 100644 --- a/blinken/src/artsplayer.h +++ b/blinken/src/artsplayer.h @@ -34,9 +34,10 @@ namespace KDE class TQTimer; -class artsPlayer : public QObject +class artsPlayer : public TQObject { Q_OBJECT + TQ_OBJECT public: artsPlayer(); ~artsPlayer(); diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp index 202a9a99..36a8f93c 100644 --- a/blinken/src/blinken.cpp +++ b/blinken/src/blinken.cpp @@ -144,7 +144,7 @@ void blinken::paintEvent(TQPaintEvent *) p.setBrush(m_fillColor); p.drawPie(169, 192, 4, 58, 1440, 2880); p.drawPie(465, 192, 4, 58, -1440, 2880); - p.setPen(TQPen(Qt::black, 3)); + p.setPen(TQPen(TQt::black, 3)); p.fillRect(171, 192, 296, 58, m_fillColor); p.drawLine(169, 192, 469, 192); p.drawLine(169, 250, 469, 250); @@ -184,16 +184,16 @@ void blinken::paintEvent(TQPaintEvent *) if (sizeAux > size) size = sizeAux; f1.setPointSize(size); #ifndef WITHOUT_ARTS - area = p.boundingRect(TQRect(), Qt::AlignAuto, sounds); + area = p.boundingRect(TQRect(), TQt::AlignAuto, sounds); area.moveBy(212, 221 - (area.height() / 2)); - p.drawText(area, Qt::AlignCenter, sounds); + p.drawText(area, TQt::AlignCenter, sounds); m_soundRect = m_soundRect.unite(area); #endif if (!m_alwaysUseNonCoolFont) { - area = p.boundingRect(TQRect(), Qt::AlignAuto, font); + area = p.boundingRect(TQRect(), TQt::AlignAuto, font); area.moveBy(426 - area.width(), 221 - (area.height() / 2)); - p.drawText(area, Qt::AlignCenter, font); + p.drawText(area, TQt::AlignCenter, font); m_fontRect = m_fontRect.unite(area); } @@ -227,7 +227,7 @@ void blinken::keyPressEvent(TQKeyEvent *e) if (i < 4) { - if (e -> key() == Qt::Key_Escape) + if (e -> key() == TQt::Key_Escape) { m_buttons[i] -> setSelected(false); update(); @@ -267,7 +267,7 @@ void blinken::keyReleaseEvent(TQKeyEvent *e) { if (e -> isAutoRepeat()) return; - if (e -> state() == Qt::ControlButton && e -> stateAfter() != Qt::ControlButton && (m_game.phase() == blinkenGame::starting || m_game.phase() == blinkenGame::choosingLevel)) + if (e -> state() == TQt::ControlButton && e -> stateAfter() != TQt::ControlButton && (m_game.phase() == blinkenGame::starting || m_game.phase() == blinkenGame::choosingLevel)) { m_showPreferences = !m_showPreferences; for (int i = 0; i < 4; i++) m_buttons[i] -> setSelected(false); @@ -289,13 +289,13 @@ void blinken::mousePressEvent(TQMouseEvent *e) hsd->showLevel(1); m_updateButtonHighlighting = true; } - else if (m_showPreferences && m_fontRect.contains(e -> pos()) && !m_alwaysUseNonCoolFont) + else if (m_showPreferences && m_fontRect.tqcontains(e -> pos()) && !m_alwaysUseNonCoolFont) { blinkenSettings::setCustomFont(!blinkenSettings::customFont()); blinkenSettings::writeConfig(); update(); } - else if (m_showPreferences && m_soundRect.contains(e -> pos())) + else if (m_showPreferences && m_soundRect.tqcontains(e -> pos())) { blinkenSettings::setPlaySounds(!blinkenSettings::playSounds()); blinkenSettings::writeConfig(); @@ -316,9 +316,9 @@ void blinken::mousePressEvent(TQMouseEvent *e) else if (m_game.phase() == blinkenGame::choosingLevel) { int level = 0; - if (m_levelsRect[1].contains(e -> pos())) level = 1; - else if (m_levelsRect[0].contains(e -> pos())) level = 2; - else if (m_levelsRect[2].contains(e -> pos())) level = 3; + if (m_levelsRect[1].tqcontains(e -> pos())) level = 1; + else if (m_levelsRect[0].tqcontains(e -> pos())) level = 2; + else if (m_levelsRect[2].tqcontains(e -> pos())) level = 3; if (level) { for(int i = 0; i < 3; i++) m_overLevels[i] = false; @@ -639,7 +639,7 @@ void blinken::drawText(TQPainter &p, const TQString &text, const TQPoint ¢er if (bold) f.setBold(true); p.setFont(f); - r = p.boundingRect(TQRect(), Qt::AlignAuto, text); + r = p.boundingRect(TQRect(), TQt::AlignAuto, text); r = TQRect(0, 0, r.width() + xMargin, r.height() + yMargin); r.moveBy(center.x() - r.width() / 2, center.y() - r.height() / 2); @@ -652,7 +652,7 @@ void blinken::drawText(TQPainter &p, const TQString &text, const TQPoint ¢er if (!highlight) p.setPen(m_fontColor); else p.setPen(m_fontHighlightColor); - p.drawText(r, Qt::AlignCenter, text); + p.drawText(r, TQt::AlignCenter, text); if (rect) *rect = r; p.setFont(oldFont); @@ -665,7 +665,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) m_updateButtonHighlighting = false; haveToUpdate = false; - if (m_highscoreRect.contains(p)) + if (m_highscoreRect.tqcontains(p)) { if (!m_overHighscore) { @@ -679,7 +679,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_menuRect.contains(p)) + if (m_menuRect.tqcontains(p)) { if (!m_overMenu) { @@ -699,7 +699,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) } else if (m_overMenu) { - if (m_aboutKDERect.contains(p)) + if (m_aboutKDERect.tqcontains(p)) { if (!m_overAboutKDE) { @@ -709,7 +709,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } } - else if (m_aboutBlinkenRect.contains(p)) + else if (m_aboutBlinkenRect.tqcontains(p)) { if (!m_overAboutBlinken) { @@ -719,7 +719,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } } - else if (m_manualRect.contains(p)) + else if (m_manualRect.tqcontains(p)) { if (!m_overManual) { @@ -739,7 +739,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) } } - if (!m_showPreferences && m_centralLettersRect.contains(p)) + if (!m_showPreferences && m_centralLettersRect.tqcontains(p)) { m_overCentralLetters = true; haveToUpdate = true; @@ -750,7 +750,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_showPreferences && m_soundRect.contains(p)) + if (m_showPreferences && m_soundRect.tqcontains(p)) { m_overSound = true; haveToUpdate = true; @@ -761,7 +761,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_showPreferences && m_fontRect.contains(p) && !m_alwaysUseNonCoolFont) + if (m_showPreferences && m_fontRect.tqcontains(p) && !m_alwaysUseNonCoolFont) { m_overFont = true; haveToUpdate = true; @@ -772,7 +772,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_counterRect.contains(p)) + if (m_counterRect.tqcontains(p)) { m_overCounter = true; haveToUpdate = true; @@ -783,7 +783,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_quitRect.contains(p)) + if (m_quitRect.tqcontains(p)) { if (!m_overQuit) { @@ -805,7 +805,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) case blinkenGame::waiting1: case blinkenGame::learningTheSequence: case blinkenGame::typingTheSequence: - if (m_centralTextRect.contains(p)) + if (m_centralTextRect.tqcontains(p)) { if (!m_overCentralText) { @@ -823,7 +823,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) case blinkenGame::choosingLevel: for (int i = 0; i < 3; i++) { - if (m_levelsRect[i].contains(p)) + if (m_levelsRect[i].tqcontains(p)) { if (!m_overLevels[i]) { diff --git a/blinken/src/blinken.h b/blinken/src/blinken.h index 0c45c8a7..6994de20 100644 --- a/blinken/src/blinken.h +++ b/blinken/src/blinken.h @@ -22,9 +22,10 @@ class KHelpMenu; class button; class highScoreDialog; -class blinken : public QWidget +class blinken : public TQWidget { Q_OBJECT + TQ_OBJECT public: blinken(); ~blinken(); @@ -73,7 +74,7 @@ Q_OBJECT // Preferences setting handling bool m_showPreferences; - // if should update the highlighting after the next repaint + // if should update the highlighting after the next tqrepaint bool m_updateButtonHighlighting; // use always the non-cool font? diff --git a/blinken/src/blinkengame.h b/blinken/src/blinkengame.h index 3cdbde6a..40a3c000 100644 --- a/blinken/src/blinkengame.h +++ b/blinken/src/blinkengame.h @@ -17,9 +17,10 @@ class TQTimer; class artsPlayer; -class blinkenGame : public QObject +class blinkenGame : public TQObject { Q_OBJECT + TQ_OBJECT public: blinkenGame(); ~blinkenGame(); diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp index 406112eb..052ef6ed 100644 --- a/blinken/src/button.cpp +++ b/blinken/src/button.cpp @@ -20,24 +20,24 @@ button::button(blinkenGame::color c) : m_selected(false), m_color(c) KConfig *kc = kapp->config(); kc->setGroup("General"); TQString cs = getColorString(); - TQString pixmap = TQString("images/%1h.png").arg(cs); + TQString pixmap = TQString("images/%1h.png").tqarg(cs); switch (c) { case blinkenGame::blue: - m_key = kc->readNumEntry(cs, Qt::Key_3); + m_key = kc->readNumEntry(cs, TQt::Key_3); break; case blinkenGame::yellow: - m_key = kc->readNumEntry(cs, Qt::Key_1); + m_key = kc->readNumEntry(cs, TQt::Key_1); break; case blinkenGame::red: - m_key = kc->readNumEntry(cs, Qt::Key_2); + m_key = kc->readNumEntry(cs, TQt::Key_2); break; case blinkenGame::green: - m_key = kc->readNumEntry(cs, Qt::Key_4); + m_key = kc->readNumEntry(cs, TQt::Key_4); break; default: @@ -115,5 +115,5 @@ TQString button::getColorString() const } // never happens - return TQString::null; + return TQString(); } diff --git a/blinken/src/counter.cpp b/blinken/src/counter.cpp index 93c55109..c3ac7d29 100644 --- a/blinken/src/counter.cpp +++ b/blinken/src/counter.cpp @@ -17,7 +17,7 @@ void counter::paint(TQPainter &p, bool drawScore, int score, bool drawTimer, con { p.save(); p.translate(45, 15); - p.setPen(TQPen(Qt::black, 3)); + p.setPen(TQPen(TQt::black, 3)); p.setBrush(TQColor(40, 40, 40)); if (drawTimer) { diff --git a/blinken/src/fontutils.cpp b/blinken/src/fontutils.cpp index 10d3bc0d..1b4b3b2c 100644 --- a/blinken/src/fontutils.cpp +++ b/blinken/src/fontutils.cpp @@ -24,8 +24,8 @@ int fontUtils::fontSize(TQPainter &p, const TQString &s1, int w, int h) TQFont f = p.font(); f.setPointSize(size); p.setFont(f); - aux1 = p.boundingRect(TQRect(), Qt::AlignAuto, s1); - if (aux1.width() > w || aux1.height() > h) size = QMIN(w * size / aux1.width(), h * size / aux1.height()); + aux1 = p.boundingRect(TQRect(), TQt::AlignAuto, s1); + if (aux1.width() > w || aux1.height() > h) size = TQMIN(w * size / aux1.width(), h * size / aux1.height()); else done = true; } diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp index 9c5a5287..b5dc749f 100644 --- a/blinken/src/highscoredialog.cpp +++ b/blinken/src/highscoredialog.cpp @@ -27,20 +27,20 @@ static const int namesFontSize = 25; /* scoresWidget */ -class scoresWidget : public QWidget +class scoresWidget : public TQWidget { public: - scoresWidget(TQWidget *parent, const TQValueList< QPair > &scores); + scoresWidget(TQWidget *tqparent, const TQValueList< TQPair > &scores); TQSize calcSize(); protected: void paintEvent(TQPaintEvent *); private: - const TQValueList< QPair > &m_scores; + const TQValueList< TQPair > &m_scores; }; -scoresWidget::scoresWidget(TQWidget *parent, const TQValueList< QPair > &scores) : TQWidget(parent, 0, WStaticContents | WNoAutoErase), m_scores(scores) +scoresWidget::scoresWidget(TQWidget *tqparent, const TQValueList< TQPair > &scores) : TQWidget(tqparent, 0, WStaticContents | WNoAutoErase), m_scores(scores) { } @@ -66,7 +66,7 @@ void scoresWidget::paintEvent(TQPaintEvent *) p.translate(margin, margin); - TQValueList< QPair >::const_iterator it; + TQValueList< TQPair >::const_iterator it; for (it = m_scores.begin(); it != m_scores.end(); ++it) { counter::paint(p, !(*it).second.isEmpty(), (*it).first, false, TQColor(), TQColor(), TQColor()); @@ -92,11 +92,11 @@ TQSize scoresWidget::calcSize() for (int i = 0; i < 3; i++) { lt = 0; - TQValueList< QPair >::const_iterator it; + TQValueList< TQPair >::const_iterator it; for (it = m_scores.begin(); it != m_scores.end(); ++it) { - r = p.boundingRect(TQRect(), Qt::AlignAuto, (*it).second); - lt = QMAX(lt, r.width()); + r = p.boundingRect(TQRect(), TQt::AlignAuto, (*it).second); + lt = TQMAX(lt, r.width()); } } @@ -112,20 +112,20 @@ TQSize scoresWidget::calcSize() /* myTabWidget */ -class myTabWidget : public QTabWidget +class myTabWidget : public TQTabWidget { public: - myTabWidget(TQWidget *parent) : TQTabWidget(parent) {} + myTabWidget(TQWidget *tqparent) : TQTabWidget(tqparent) {} TQSize tabBarSizeHint() const { - return tabBar() -> sizeHint(); + return tabBar() -> tqsizeHint(); } }; /* highScoreDialog */ -highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Highscores"), KDialogBase::Close) +highScoreDialog::highScoreDialog(TQWidget *tqparent) : KDialogBase(tqparent, 0, true, i18n("Highscores"), KDialogBase::Close) { m_tw = new myTabWidget(this); setMainWidget(m_tw); @@ -133,10 +133,10 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true KConfig *cfg = kapp -> config(); for (int i = 1; i <= 3; i++) { - cfg -> setGroup(TQString("Level%1").arg(i)); + cfg -> setGroup(TQString("Level%1").tqarg(i)); for (int j = 1; j <= 5; j++) { - m_scores[i-1].append(qMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j)))); + m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").tqarg(j)), cfg->readEntry(TQString("Name%1").tqarg(j)))); } } @@ -148,7 +148,7 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true bool highScoreDialog::scoreGoodEnough(int level, int score) { level--; - TQValueList< QPair >::iterator it, itEnd; + TQValueList< TQPair >::iterator it, itEnd; it = m_scores[level].begin(); itEnd = m_scores[level].end(); while (it != itEnd && (*it).first >= score) it++; @@ -159,23 +159,23 @@ bool highScoreDialog::scoreGoodEnough(int level, int score) void highScoreDialog::addScore(int level, int score, const TQString &name) { level--; - TQValueList< QPair >::iterator it, itEnd; + TQValueList< TQPair >::iterator it, itEnd; it = m_scores[level].begin(); itEnd = m_scores[level].end(); while (it != itEnd && (*it).first >= score) it++; if (it != itEnd) { - m_scores[level].insert(it, qMakePair(score, name)); + m_scores[level].insert(it, tqMakePair(score, name)); m_scores[level].remove(--m_scores[level].end()); KConfig *cfg = kapp -> config(); - cfg -> setGroup(TQString("Level%1").arg(level + 1)); + cfg -> setGroup(TQString("Level%1").tqarg(level + 1)); int j; for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++) { - cfg->writeEntry(TQString("Score%1").arg(j), (*it).first); - cfg->writeEntry(TQString("Name%1").arg(j), (*it).second); + cfg->writeEntry(TQString("Score%1").tqarg(j), (*it).first); + cfg->writeEntry(TQString("Name%1").tqarg(j), (*it).second); } cfg -> sync(); } diff --git a/blinken/src/highscoredialog.h b/blinken/src/highscoredialog.h index 484f392b..e4a9e38b 100644 --- a/blinken/src/highscoredialog.h +++ b/blinken/src/highscoredialog.h @@ -20,13 +20,13 @@ class myTabWidget; class highScoreDialog : private KDialogBase { public: - highScoreDialog(TQWidget *parent); + highScoreDialog(TQWidget *tqparent); bool scoreGoodEnough(int level, int score); void addScore(int level, int score, const TQString &name); void showLevel(int level); - TQValueList< QPair > m_scores[3]; + TQValueList< TQPair > m_scores[3]; myTabWidget *m_tw; }; diff --git a/blinken/src/number.cpp b/blinken/src/number.cpp index 2403f866..27621ee8 100644 --- a/blinken/src/number.cpp +++ b/blinken/src/number.cpp @@ -100,7 +100,7 @@ void number::paintDigit(TQPainter &p, int number) const { // make gcc happy const int *n = m_number0; - int shape; + int tqshape; switch (number) { @@ -141,31 +141,31 @@ void number::paintDigit(TQPainter &p, int number) const break; } - p.setBrush(Qt::red); - p.setPen(Qt::red); + p.setBrush(TQt::red); + p.setPen(TQt::red); for (int i = 0; i < 5; i++) { for (int j = 0; j < 4; j++) { - shape = n[j + i * 4]; - if (shape == 0) + tqshape = n[j + i * 4]; + if (tqshape == 0) { - p.fillRect(7 * (j-1), 7 * (i-1), 6, 6, Qt::red); + p.fillRect(7 * (j-1), 7 * (i-1), 6, 6, TQt::red); } - else if (shape != 5) + else if (tqshape != 5) { - if (shape == 1) p.translate(7 * (j-1), 7 * (i-1)); - else if (shape == 2) + if (tqshape == 1) p.translate(7 * (j-1), 7 * (i-1)); + else if (tqshape == 2) { p.translate(7 * j - 2, 7 * (i-1)); p.rotate(90); } - else if (shape == 3) + else if (tqshape == 3) { p.translate(7 * j - 2, 7 * i - 2); p.rotate(180); } - else if (shape == 4) + else if (tqshape == 4) { p.translate(7 * (j-1), 7 * i - 2); p.rotate(270); @@ -173,19 +173,19 @@ void number::paintDigit(TQPainter &p, int number) const p.drawPie(0, 0, 11, 11, 90 * 16, 16 * 90); - if (shape == 1) p.translate(-7 * (j-1), -7 * (i-1)); - else if (shape == 2) + if (tqshape == 1) p.translate(-7 * (j-1), -7 * (i-1)); + else if (tqshape == 2) { p.rotate(-90); p.translate(-(7 * j - 2), -7 * (i-1)); } - else if (shape == 3) + else if (tqshape == 3) { p.rotate(-180); p.translate(-(7 * j - 2), -(7 * i - 2)); } - else if (shape == 4) + else if (tqshape == 4) { p.rotate(-270); p.translate(- (7 * (j-1)), -(7 * i - 2)); diff --git a/kalzium/ChangeLog b/kalzium/ChangeLog index 61d29e3a..ce67fc51 100644 --- a/kalzium/ChangeLog +++ b/kalzium/ChangeLog @@ -19,7 +19,7 @@ Add: - The menustructure is now more consistent - One icon has been added - Make the mainwidget a QScrollView. This make sizehandling easier - - Improved layout of the detailed information dialog + - Improved tqlayout of the detailed information dialog - Added a widget which shows you a table of the isotopes - Added EqChem, a chemical equation solver - Added several glossary-items diff --git a/kalzium/RELEASE-PLAN b/kalzium/RELEASE-PLAN index f556379b..3554ccb1 100644 --- a/kalzium/RELEASE-PLAN +++ b/kalzium/RELEASE-PLAN @@ -1,7 +1,7 @@ Release plan ============ -Status: Under discussion +tqStatus: Under discussion Overview diff --git a/kalzium/src/detailedgraphicaloverview.cpp b/kalzium/src/detailedgraphicaloverview.cpp index d31e2579..67a4d231 100644 --- a/kalzium/src/detailedgraphicaloverview.cpp +++ b/kalzium/src/detailedgraphicaloverview.cpp @@ -28,14 +28,14 @@ email : cniehaus@kde.org #include #include -DetailedGraphicalOverview::DetailedGraphicalOverview( Element *el, TQWidget *parent, const char *name ) -: TQWidget( parent, name ) +DetailedGraphicalOverview::DetailedGraphicalOverview( Element *el, TQWidget *tqparent, const char *name ) +: TQWidget( tqparent, name ) { init( el ); } -DetailedGraphicalOverview::DetailedGraphicalOverview( TQWidget *parent, const char *name ) -: TQWidget( parent, name ) +DetailedGraphicalOverview::DetailedGraphicalOverview( TQWidget *tqparent, const char *name ) +: TQWidget( tqparent, name ) { init( 0L ); } @@ -59,12 +59,12 @@ void DetailedGraphicalOverview::paintEvent( TQPaintEvent* ) TQPainter p; p.begin( &pm ); - p.setBrush(Qt::SolidPattern); + p.setBrush(TQt::SolidPattern); if ( !m_element ) { pm.fill( paletteBackgroundColor() ); - p.drawText( 0, 0, w, h, Qt::AlignCenter | Qt::WordBreak, i18n( "No element selected" ) ); + p.drawText( 0, 0, w, h, TQt::AlignCenter | TQt::WordBreak, i18n( "No element selected" ) ); } else { @@ -80,8 +80,8 @@ void DetailedGraphicalOverview::paintEvent( TQPaintEvent* ) p.setBrush( m_element->elementColor() ); p.drawRect( x1 , y1 , x2 , y2 ); - p.setBrush( Qt::black ); - p.setBrush(Qt::NoBrush); + p.setBrush( TQt::black ); + p.setBrush(TQt::NoBrush); TQFont fA = KGlobalSettings::generalFont(); TQFont fB = KGlobalSettings::generalFont(); @@ -126,20 +126,20 @@ void DetailedGraphicalOverview::paintEvent( TQPaintEvent* ) p.setFont( fC ); //Name - p.drawText( 1, 0, w/2, h, Qt::AlignLeft, m_element->elname() ); + p.drawText( 1, 0, w/2, h, TQt::AlignLeft, m_element->elname() ); //Oxidationstates fC.setPointSize( size2 ); p.setFont( fC ); int offsetOx = KalziumUtils::StringHeight( strLocalizedMass , fC, &p ); - p.drawText( 1, h-offsetOx, w/2, offsetOx, Qt::AlignLeft, m_element->oxstage() ); + p.drawText( 1, h-offsetOx, w/2, offsetOx, TQt::AlignLeft, m_element->oxstage() ); //Mass fC.setPointSize( size3 ); p.setFont( fC ); int offset = KalziumUtils::StringHeight( strLocalizedMass, fC, &p ); - p.drawText( w/2, h-offset, w/2, offset, Qt::AlignRight, strLocalizedMass ); + p.drawText( w/2, h-offset, w/2, offset, TQt::AlignRight, strLocalizedMass ); drawBiologicalSymbol( &p ); } @@ -164,9 +164,9 @@ void DetailedGraphicalOverview::drawBiologicalSymbol( TQPainter *p ) if ( m_element->biological() > 0 ) { const int radius = db + 8; - p->setBrush( Qt::SolidPattern ); - p->setBrush( Qt::white ); - p->setPen( Qt::black ); + p->setBrush( TQt::SolidPattern ); + p->setBrush( TQt::white ); + p->setPen( TQt::black ); p->drawRoundRect( TQRect( width() - radius, -radius, 2 * radius, @@ -178,52 +178,52 @@ void DetailedGraphicalOverview::drawBiologicalSymbol( TQPainter *p ) case 0: //nothing break; case 1: //red, red - p->setBrush( Qt::red ); - p->setBrush(Qt::NoBrush); - p->setPen( Qt::red ); + p->setBrush( TQt::red ); + p->setBrush(TQt::NoBrush); + p->setPen( TQt::red ); p->drawEllipse( pos_x,pos_y,db,db ); - p->setBrush(Qt::SolidPattern); - p->setBrush( Qt::red ); + p->setBrush(TQt::SolidPattern); + p->setBrush( TQt::red ); p->drawEllipse( pos_x+d_ds, pos_y+d_ds, ds, ds ); break; case 2: //green, red - p->setBrush( Qt::red ); - p->setBrush(Qt::NoBrush); - p->setPen( Qt::red ); + p->setBrush( TQt::red ); + p->setBrush(TQt::NoBrush); + p->setPen( TQt::red ); p->drawEllipse( pos_x,pos_y,db,db ); - p->setBrush(Qt::SolidPattern); - p->setBrush( Qt::green ); - p->setPen( Qt::green ); + p->setBrush(TQt::SolidPattern); + p->setBrush( TQt::green ); + p->setPen( TQt::green ); p->drawEllipse( pos_x+d_ds, pos_y+d_ds, ds, ds ); break; case 3: //green - p->setBrush(Qt::SolidPattern); - p->setBrush( Qt::green ); - p->setPen( Qt::green ); + p->setBrush(TQt::SolidPattern); + p->setBrush( TQt::green ); + p->setPen( TQt::green ); p->drawEllipse( pos_x+d_ds, pos_y+d_ds, ds, ds ); break; case 4: //green, blue - p->setBrush( Qt::blue ); - p->setBrush(Qt::NoBrush); - p->setPen( Qt::blue ); + p->setBrush( TQt::blue ); + p->setBrush(TQt::NoBrush); + p->setPen( TQt::blue ); p->drawEllipse( pos_x,pos_y,db,db ); - p->setBrush(Qt::SolidPattern); - p->setBrush( Qt::green ); - p->setPen( Qt::green ); + p->setBrush(TQt::SolidPattern); + p->setBrush( TQt::green ); + p->setPen( TQt::green ); p->drawEllipse( pos_x+d_ds, pos_y+d_ds, ds, ds ); break; case 5: //blue - p->setBrush(Qt::SolidPattern); - p->setBrush( Qt::blue ); - p->setPen( Qt::blue ); + p->setBrush(TQt::SolidPattern); + p->setBrush( TQt::blue ); + p->setPen( TQt::blue ); p->drawEllipse( pos_x+d_ds, pos_y+d_ds, ds, ds ); break; case 6: //blue, blue - p->setBrush( Qt::blue ); - p->setBrush(Qt::NoBrush); - p->setPen( Qt::blue ); + p->setBrush( TQt::blue ); + p->setBrush(TQt::NoBrush); + p->setPen( TQt::blue ); p->drawEllipse( pos_x,pos_y,db,db ); - p->setBrush(Qt::SolidPattern); + p->setBrush(TQt::SolidPattern); p->drawEllipse( pos_x+d_ds, pos_y+d_ds, ds, ds ); break; } diff --git a/kalzium/src/detailedgraphicaloverview.h b/kalzium/src/detailedgraphicaloverview.h index 6fb649dc..90658abc 100644 --- a/kalzium/src/detailedgraphicaloverview.h +++ b/kalzium/src/detailedgraphicaloverview.h @@ -25,13 +25,14 @@ class Element; * in one widget like a lot people know it from school * @author Carsten Niehaus */ -class DetailedGraphicalOverview : public QWidget +class DetailedGraphicalOverview : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DetailedGraphicalOverview( Element *el, TQWidget *parent, const char *name=0 ); - DetailedGraphicalOverview( TQWidget *parent, const char *name=0 ); + DetailedGraphicalOverview( Element *el, TQWidget *tqparent, const char *name=0 ); + DetailedGraphicalOverview( TQWidget *tqparent, const char *name=0 ); /** * sets the elements whose data will be used to @p el diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index c4fc8899..7503c77d 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -44,8 +44,8 @@ //TODO add bondxx-radius (H-H-distance for example) -DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *name) - : KDialogBase( IconList, name, Help|User1|User2|Close, Close, parent, name, +DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *tqparent, const char *name) + : KDialogBase( IconList, name, Help|User1|User2|Close, Close, tqparent, name, false, //non modal false, KGuiItem(i18n("Next element", "Next"), "1rightarrow"), @@ -66,7 +66,7 @@ DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *na createContent(); m_actionCollection = new KActionCollection(this); - KStdAction::quit(this, TQT_SLOT(slotClose()), m_actionCollection); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection); setButtonTip( User2, i18n( "Goes to the previous element" ) ); setButtonTip( User1, i18n( "Goes to the next element" ) ); @@ -94,10 +94,10 @@ void DetailedInfoDlg::setElement(Element *element) KHTMLPart* DetailedInfoDlg::addHTMLTab( const TQString& title, const TQString& icontext, const TQString& iconname ) { TQFrame *frame = addPage(title, icontext, BarIcon(iconname)); - TQVBoxLayout *layout = new TQVBoxLayout( frame ); - layout->setMargin( 0 ); - KHTMLPart *w = new KHTMLPart( frame, "html-part", frame ); - layout->addWidget( w->view() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( frame ); + tqlayout->setMargin( 0 ); + KHTMLPart *w = new KHTMLPart( frame, "html-part", TQT_TQOBJECT(frame) ); + tqlayout->addWidget( w->view() ); return w; } @@ -122,43 +122,43 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type) html.append( "
" ); html.append( m_element->symbol() ); html.append( "" ); - html.append( i18n( "Block: %1" ).arg( m_element->block() ) ); + html.append( i18n( "Block: %1" ).tqarg( m_element->block() ) ); html.append( "
" ); html.append( ""); switch ( type ) { case CHEMICAL: html.append( "" ); html.append( "" ); html.append( "" ); if ( m_element->radius(Element::IONIC) > 0.0 ) { html.append( "" ); } if ( m_element->radius(Element::VDW) > 0.0 ) { html.append( "" ); } if ( m_element->radius(Element::ATOMIC) > 0.0 ) { html.append( "" ); } html.append( "" ); if ( !m_element->isotopes().isEmpty() ) { @@ -171,22 +171,22 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type) html.append( "" ); if ( m_element->abundance() > 0 ){ html.append( "" ); } html.append( "" ); if ( !m_element->nameOrigin().isEmpty() ) { html.append( "" ); } if ( m_element->artificial() || m_element->radioactive() ) @@ -203,16 +203,16 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type) break; case ENERGY: html.append( "" ); html.append( "" ); html.append( "" ); html.append( "" ); @@ -221,7 +221,7 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type) { html.append( "" ); } break; @@ -264,13 +264,13 @@ TQString DetailedInfoDlg::isotopeTable() { html.append( "" ); @@ -379,7 +379,7 @@ void DetailedInfoDlg::reloadContent() const TQString element_symbol = m_element->symbol(); // updating caption - setCaption( i18n( "For example Carbon (6)" , "%1 (%2)" ).arg( element_name ).arg( m_elementNumber ) ); + setCaption( i18n( "For example Carbon (6)" , "%1 (%2)" ).tqarg( element_name ).tqarg( m_elementNumber ) ); // updating overview tab dTab->setElement( m_element ); @@ -389,21 +389,21 @@ void DetailedInfoDlg::reloadContent() if ( TQFile::exists( picpath ) ) { TQImage img( picpath, "JPEG" ); - img = img.smoothScale ( 400, 400, TQImage::ScaleMin ); + img = img.smoothScale ( 400, 400, TQ_ScaleMin ); TQPixmap pic; pic.convertFromImage( img ); piclabel->setPixmap( pic ); } else - piclabel->setText( i18n( "No picture of %1 found." ).arg( element_name ) ); + piclabel->setText( i18n( "No picture of %1 found." ).tqarg( element_name ) ); // updating atomic model tab wOrbits->setElementNumber( m_elementNumber ); TQWhatsThis::add( wOrbits, i18n( "Here you can see the atomic hull of %1. %2 has the configuration %3." ) - .arg( m_element->elname() ) - .arg( m_element->elname() ) - .arg( m_element->parsedOrbits() ) ); + .tqarg( m_element->elname() ) + .tqarg( m_element->elname() ) + .tqarg( m_element->parsedOrbits() ) ); // updating html tabs fillHTMLTab( m_htmlpages["chemical"], getHtml( CHEMICAL ) ); @@ -422,7 +422,7 @@ void DetailedInfoDlg::reloadContent() } else { - m_spectrumLabel->setText( i18n( "No spectrum of %1 found." ).arg( element_name ) ); + m_spectrumLabel->setText( i18n( "No spectrum of %1 found." ).tqarg( element_name ) ); m_spectrumStack->raiseWidget( m_spectrumLabel ); } } diff --git a/kalzium/src/detailinfodlg.h b/kalzium/src/detailinfodlg.h index a00c06a2..4087239d 100644 --- a/kalzium/src/detailinfodlg.h +++ b/kalzium/src/detailinfodlg.h @@ -39,9 +39,10 @@ class KHTMLPart; class DetailedInfoDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DetailedInfoDlg( Element *el , TQWidget *parent=0, const char *name=0); + DetailedInfoDlg( Element *el , TQWidget *tqparent=0, const char *name=0); void setElement(Element *el); diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp index 3fc7e493..687f0ad8 100644 --- a/kalzium/src/element.cpp +++ b/kalzium/src/element.cpp @@ -68,8 +68,8 @@ TQString Element::parsedOrbits( bool canBeEmpty ) TQString orbits = m_orbits; TQRegExp rxs("([a-z])([0-9]+)"); TQRegExp rxb("([a-z]{2}) ",false); - orbits.replace(rxs,"\\1\\2"); //superscript around electron number - orbits.replace(rxb,"\\1 "); //bold around element symbols + orbits.tqreplace(rxs,"\\1\\2"); //superscript around electron number + orbits.tqreplace(rxb,"\\1 "); //bold around element symbols return orbits; } @@ -106,7 +106,7 @@ const TQString Element::adjustRadius( RADIUSTYPE rtype ) if ( val <= 0 ) v = i18n( "Value unknown" ); else - v = i18n( "%1 is a length, eg: 12.3 pm", "%1 pm" ).arg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 is a length, eg: 12.3 pm", "%1 pm" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); return v; } @@ -132,7 +132,7 @@ const TQString Element::adjustUnits( const int type, double value ) const TQString Element::adjustUnits( const int type ) { - TQString v = TQString::null; + TQString v = TQString(); double val = 0.0; //the value to convert @@ -151,19 +151,19 @@ const TQString Element::adjustUnits( const int type ) TQString strVal = KalziumUtils::localizedValue( newvalue, 6 ); switch (Prefs::temperature()) { case 0: //Kelvin - v = i18n( "%1 is the temperature in Kelvin", "%1 K" ).arg( strVal ); + v = i18n( "%1 is the temperature in Kelvin", "%1 K" ).tqarg( strVal ); break; case 1://Kelvin to Celsius - v = i18n( "%1 is the temperature in Celsius", "%1 %2C" ).arg( strVal ).arg( TQChar(0xB0) ); + v = i18n( "%1 is the temperature in Celsius", "%1 %2C" ).tqarg( strVal ).tqarg( TQChar(0xB0) ); break; case 2: // Kelvin to Fahrenheit - v = i18n( "%1 is the temperature in Fahrenheit", "%1 %2F" ).arg( strVal ).arg( TQChar(0xB0) ); + v = i18n( "%1 is the temperature in Fahrenheit", "%1 %2F" ).tqarg( strVal ).tqarg( TQChar(0xB0) ); break; case 3: // Kelvin to Rankine - v = i18n( "%1 is the temperature in Rankine", "%1 %2Ra" ).arg( strVal ).arg( TQChar(0xB0) ); + v = i18n( "%1 is the temperature in Rankine", "%1 %2Ra" ).tqarg( strVal ).tqarg( TQChar(0xB0) ); break; case 4: // Kelvin to Reaumur - v = i18n( "%1 is the temperature in Reaumur", "%1 %2R" ).arg( strVal ).arg( TQChar(0xB0) ); + v = i18n( "%1 is the temperature in Reaumur", "%1 %2R" ).tqarg( strVal ).tqarg( TQChar(0xB0) ); break; } } @@ -186,12 +186,12 @@ const TQString Element::adjustUnits( const int type ) { if ( Prefs::energies() == 0 ) { - v = i18n( "%1 kJ/mol" ).arg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 kJ/mol" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); } else // use electronvolt { val/=96.6; - v = i18n( "%1 eV" ).arg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 eV" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); } } } @@ -201,7 +201,7 @@ const TQString Element::adjustUnits( const int type ) if ( val <= 0 ) v = i18n( "Value unknown" ); else - v = i18n( "%1 u" ).arg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 u" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); } else if ( type == DENSITY ) // its a density { @@ -213,11 +213,11 @@ const TQString Element::adjustUnits( const int type ) { if ( boiling() < 295.0 && melting() < 295.0)//gasoline { - v = i18n( "%1 g/L" ).arg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 g/L" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); } else//liquid or solid { - v = i18n( "%1 g/cm3" ).arg( KalziumUtils::localizedValue( val, 6 )); + v = i18n( "%1 g/cm3" ).tqarg( KalziumUtils::localizedValue( val, 6 )); } } } @@ -230,7 +230,7 @@ const TQString Element::adjustUnits( const int type ) } else { - v = i18n( "This element was discovered in the year %1" ).arg( TQString::number( val ) ); + v = i18n( "This element was discovered in the year %1" ).tqarg( TQString::number( val ) ); } } @@ -263,18 +263,18 @@ void Element::drawStateOfMatter( TQPainter* p, double temp ) p->setFont( f ); //top left - p->setPen( Qt::black ); + p->setPen( TQt::black ); text = KalziumUtils::localizedValue( KalziumUtils::strippedValue( mass( ) ), 6 ); - p->drawText( X,Y ,ELEMENTSIZE,h_small,Qt::AlignCenter, text ); + p->drawText( X,Y ,ELEMENTSIZE,h_small,TQt::AlignCenter, text ); text = TQString::number( number() ); - p->drawText( X,Y+ELEMENTSIZE-h_small , ELEMENTSIZE, h_small,Qt::AlignCenter, text ); + p->drawText( X,Y+ELEMENTSIZE-h_small , ELEMENTSIZE, h_small,TQt::AlignCenter, text ); p->setFont( symbol_font ); - p->drawText( X,Y, ELEMENTSIZE,ELEMENTSIZE,Qt::AlignCenter, symbol() ); + p->drawText( X,Y, ELEMENTSIZE,ELEMENTSIZE,TQt::AlignCenter, symbol() ); //border - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawRect( X, Y,ELEMENTSIZE+1,ELEMENTSIZE+1); } @@ -289,7 +289,7 @@ TQColor Element::currentColor( const double temp ) //If either the mp or bp is not known return //This is to avoid undefined behaviour // if ( iButton_boiling <= 0.0 || iButton_melting <= 0.0 ) -// return Qt::lightGray; +// return TQt::lightGray; if ( temp < iButton_melting ) { //the element is solid @@ -305,7 +305,7 @@ TQColor Element::currentColor( const double temp ) color= Prefs::color_vapor(); } else - color = Qt::lightGray; + color = TQt::lightGray; return color; } @@ -329,23 +329,23 @@ void Element::drawGradient( TQPainter* p, const TQString& value, const TQColor& p->setPen( c ); p->fillRect( X, Y,ELEMENTSIZE,ELEMENTSIZE, c ); - p->setPen( Qt::black ); + p->setPen( TQt::black ); TQFont symbol_font = p->font(); TQFont f = p->font(); f.setPointSize( KalziumUtils::maxSize(value, TQRect( X,Y+ELEMENTSIZE-h_small, ELEMENTSIZE, h_small ),f, p ) ); p->setFont( f ); - p->drawText( X,Y+ELEMENTSIZE-h_small , ELEMENTSIZE, h_small,Qt::AlignCenter, value ); + p->drawText( X,Y+ELEMENTSIZE-h_small , ELEMENTSIZE, h_small,TQt::AlignCenter, value ); const TQRect rect = TQRect( X,Y,ELEMENTSIZE-2,ELEMENTSIZE-10 ); int goodsize = KalziumUtils::maxSize( symbol(), rect, symbol_font, p ); symbol_font.setPointSize( goodsize ); p->setFont( symbol_font ); - p->drawText( X+1,Y+5, ELEMENTSIZE-2,ELEMENTSIZE-10,Qt::AlignCenter, symbol() ); + p->drawText( X+1,Y+5, ELEMENTSIZE-2,ELEMENTSIZE-10,TQt::AlignCenter, symbol() ); //border - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawRect( X, Y,ELEMENTSIZE+1,ELEMENTSIZE+1); } @@ -357,18 +357,18 @@ void Element::drawGrayedOut( TQPainter *p ) //The Y-coordinate int Y = yPos(); - p->fillRect( X, Y,ELEMENTSIZE,ELEMENTSIZE, Qt::lightGray ); + p->fillRect( X, Y,ELEMENTSIZE,ELEMENTSIZE, TQt::lightGray ); - p->setPen( Qt::darkGray ); + p->setPen( TQt::darkGray ); TQFont symbol_font = p->font(); const TQRect rect = TQRect( X,Y,ELEMENTSIZE-2,ELEMENTSIZE-10 ); int goodsize = KalziumUtils::maxSize( symbol(), rect, symbol_font, p ); symbol_font.setPointSize( goodsize ); p->setFont( symbol_font ); - p->drawText( X+1,Y+5, ELEMENTSIZE-2,ELEMENTSIZE-10,Qt::AlignCenter, symbol() ); + p->drawText( X+1,Y+5, ELEMENTSIZE-2,ELEMENTSIZE-10,TQt::AlignCenter, symbol() ); - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawRect( X, Y,ELEMENTSIZE+1,ELEMENTSIZE+1); } @@ -385,7 +385,7 @@ void Element::drawSelf( TQPainter* p, bool simple, bool isCrystal ) p->setPen( elementColor() ); p->fillRect( X, Y,ELEMENTSIZE,ELEMENTSIZE, elementColor() ); - p->setPen( Qt::black ); + p->setPen( TQt::black ); TQString text; TQFont symbol_font = p->font(); @@ -399,9 +399,9 @@ void Element::drawSelf( TQPainter* p, bool simple, bool isCrystal ) p->setFont( symbol_font ); if ( !simple ) - p->drawText( X+1,Y+5, ELEMENTSIZE-2,max,Qt::AlignCenter, symbol() ); + p->drawText( X+1,Y+5, ELEMENTSIZE-2,max,TQt::AlignCenter, symbol() ); else - p->drawText( X+1,Y+5, ELEMENTSIZE-2,max,Qt::AlignHCenter, symbol() ); + p->drawText( X+1,Y+5, ELEMENTSIZE-2,max,TQt::AlignHCenter, symbol() ); TQFont f = p->font(); @@ -441,11 +441,11 @@ void Element::drawSelf( TQPainter* p, bool simple, bool isCrystal ) } else text = KalziumUtils::localizedValue( KalziumUtils::strippedValue( mass( ) ), 6 ); - p->drawText( X+2,Y ,ELEMENTSIZE-4 ,h_small,Qt::AlignCenter, text ); + p->drawText( X+2,Y ,ELEMENTSIZE-4 ,h_small,TQt::AlignCenter, text ); } text = TQString::number( number() ); - p->drawText( X+2,Y+ELEMENTSIZE-h_small , ELEMENTSIZE-4, h_small,Qt::AlignCenter, text ); + p->drawText( X+2,Y+ELEMENTSIZE-h_small , ELEMENTSIZE-4, h_small,TQt::AlignCenter, text ); p->drawRect( X, Y,ELEMENTSIZE+1,ELEMENTSIZE+1); } diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp index 108889cc..d14eb343 100644 --- a/kalzium/src/elementdataviewer.cpp +++ b/kalzium/src/elementdataviewer.cpp @@ -30,18 +30,18 @@ #include #include -ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) +ElementDataViewer::ElementDataViewer( TQWidget *tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n( "Plot Data") , Help | User1 | Close, User1, - parent, name ) + tqparent, name ) { d = KalziumDataObject::instance(); yData = new AxisData(); - TQHBoxLayout *layout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() ); + TQHBoxLayout *tqlayout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() ); m_pPlotSetupWidget = new PlotSetupWidget( plainPage(), "plotsetup" ); m_pPlotSetupWidget->from->setMaxValue( d->numberOfElements() - 1 ); @@ -51,10 +51,10 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) m_pPlotWidget->setMinimumWidth( 200 ); m_pPlotWidget->resize( 400, m_pPlotWidget->height() ); - layout->addWidget( m_pPlotSetupWidget ); - layout->addWidget( m_pPlotWidget ); - layout->setStretchFactor( m_pPlotSetupWidget, 0 ); - layout->setStretchFactor( m_pPlotWidget, 1 ); + tqlayout->addWidget( m_pPlotSetupWidget ); + tqlayout->addWidget( m_pPlotWidget ); + tqlayout->setStretchFactor( m_pPlotSetupWidget, 0 ); + tqlayout->setStretchFactor( m_pPlotWidget, 1 ); // setup the list of names EList::iterator it = d->ElementList.begin(); @@ -69,7 +69,7 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) setButtonText( User1, i18n("&Plot") ); m_actionCollection = new KActionCollection(this); - KStdAction::quit(this, TQT_SLOT(slotClose()), m_actionCollection); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection); connect ( m_pPlotSetupWidget->KCB_y, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( drawPlot()) ); @@ -294,7 +294,7 @@ void ElementDataViewer::drawPlot() /* * reserve the memory for the KPlotObjects */ - //TODO QT4 replace TQMemArray with QVector + //TODO QT4 replace TQMemArray with TQVector TQMemArray dataPoint(num); TQMemArray dataPointLabel(num); diff --git a/kalzium/src/elementdataviewer.h b/kalzium/src/elementdataviewer.h index 76fea4b1..062377ae 100644 --- a/kalzium/src/elementdataviewer.h +++ b/kalzium/src/elementdataviewer.h @@ -96,9 +96,10 @@ class AxisData class ElementDataViewer : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ElementDataViewer( TQWidget *parent=0 , const char *name =0 ); + ElementDataViewer( TQWidget *tqparent=0 , const char *name =0 ); /** * the AxixData for the y-Axis diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp index fee6e9c7..4a22cd20 100644 --- a/kalzium/src/eqchemview.cpp +++ b/kalzium/src/eqchemview.cpp @@ -46,11 +46,11 @@ extern "C" { char* solve_equation(const char *) { return NULL; } #endif -eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent) +eqchemView::eqchemView(TQWidget *tqparent) : TQWidget(tqparent) { settingsChanged(); - TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView layout"); + TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView tqlayout"); m_eqResult = new EqResult(this); m_eqedit = new KLineEdit(this); @@ -89,8 +89,8 @@ void eqchemView::clear() void eqchemView::compute() { TQString equation( m_eqedit->text() ); - equation.replace("+", "+"); - equation.replace("->", " -> "); + equation.tqreplace("+", "+"); + equation.tqreplace("->", " -> "); equation.append(" "); equation.prepend(" "); @@ -104,13 +104,13 @@ void eqchemView::compute() m_eqResult->add( equation, disp ); } -EQChemDialog::EQChemDialog( TQWidget *parent ) - : KDialogBase(parent, "EQChemDialog", true, i18n( "Solve Chemical Equations" ), +ETQChemDialog::ETQChemDialog( TQWidget *tqparent ) + : KDialogBase(tqparent, "ETQChemDialog", true, i18n( "Solve Chemical Equations" ), KDialogBase::Apply|KDialogBase::Close|KDialogBase::Help, KDialogBase::Apply, true ) { } -void EQChemDialog::slotHelp() +void ETQChemDialog::slotHelp() { emit helpClicked(); if ( kapp ) diff --git a/kalzium/src/eqchemview.h b/kalzium/src/eqchemview.h index 0e1ad686..85a9dda8 100644 --- a/kalzium/src/eqchemview.h +++ b/kalzium/src/eqchemview.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef _EQCHEMVIEW_H_ -#define _EQCHEMVIEW_H_ +#ifndef _ETQCHEMVIEW_H_ +#define _ETQCHEMVIEW_H_ #include #include @@ -40,14 +40,15 @@ class KPushButton; * @author Thomas Nagy * @version 0.1 */ -class eqchemView : public QWidget +class eqchemView : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - eqchemView(TQWidget *parent); + eqchemView(TQWidget *tqparent); /** * Destructor @@ -82,17 +83,18 @@ private: /** * @author Carsten Niehaus */ -class EQChemDialog : public KDialogBase +class ETQChemDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * public constructor * - * @param parent the parent widget + * @param tqparent the tqparent widget */ - EQChemDialog( TQWidget *parent ); + ETQChemDialog( TQWidget *tqparent ); private slots: /** @@ -101,4 +103,4 @@ class EQChemDialog : public KDialogBase void slotHelp(); }; -#endif // _EQCHEMVIEW_H_ +#endif // _ETQCHEMVIEW_H_ diff --git a/kalzium/src/eqresult.cpp b/kalzium/src/eqresult.cpp index c128c93e..a4aad576 100644 --- a/kalzium/src/eqresult.cpp +++ b/kalzium/src/eqresult.cpp @@ -47,7 +47,7 @@ TQListBoxItem ( listBox ) void QuestionItem::paint( TQPainter* painter ) { - int tf = Qt::NoAccel | Qt::SingleLine | Qt::AlignVCenter; + int tf = TQt::NoAccel | TQt::SingleLine | TQt::AlignVCenter; TQRect r ( 0, 0, listBox()->contentsWidth(), height( listBox() ) ); painter->fillRect( r, m_bgcolor ); @@ -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()->colorGroup(); + TQColorGroup cg = listBox()->tqcolorGroup(); cg.setColor( TQColorGroup::Background, m_bgcolor ); m_richtext->draw(painter, 0, 0, r, cg ); @@ -89,7 +89,7 @@ void AnswerItem::checkSize() m_richtext->setWidth( (t1>t2)?t1:t2 ); } -EqResult::EqResult(TQWidget *parent) : TQListBox(parent) +EqResult::EqResult(TQWidget *tqparent) : TQListBox(tqparent) { m_alternate_color = false; setMinimumWidth(140); @@ -101,7 +101,7 @@ EqResult::~EqResult() void EqResult::add(const TQString & question, const TQString & answer) { - TQColor bgcolor = colorGroup().base(); + TQColor bgcolor = tqcolorGroup().base(); if ( m_alternate_color ) bgcolor = bgcolor.dark( 120 ); diff --git a/kalzium/src/eqresult.h b/kalzium/src/eqresult.h index 39e7d85a..2b862d3b 100644 --- a/kalzium/src/eqresult.h +++ b/kalzium/src/eqresult.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef _EQRESULT_H_ -#define _EQRESULT_H_ +#ifndef _ETQRESULT_H_ +#define _ETQRESULT_H_ #include #include @@ -27,7 +27,7 @@ /** * @author Thomas Nagy */ -class QuestionItem : public QListBoxItem +class QuestionItem : public TQListBoxItem { public: QuestionItem( TQListBox*, const TQString&, TQColor bg ); @@ -43,7 +43,7 @@ class QuestionItem : public QListBoxItem /** * @author Thomas Nagy */ -class AnswerItem : public QListBoxItem +class AnswerItem : public TQListBoxItem { public: AnswerItem( TQListBox*, const TQString&, const TQString&, TQColor bg ); @@ -69,12 +69,13 @@ class AnswerItem : public QListBoxItem /** * @author Thomas Nagy */ -class EqResult : public QListBox +class EqResult : public TQListBox { Q_OBJECT + TQ_OBJECT public: - EqResult(TQWidget *parent); + EqResult(TQWidget *tqparent); ~EqResult(); public slots: @@ -86,5 +87,5 @@ private: bool m_alternate_color; }; -#endif // _EQRESULT_H_ +#endif // _ETQRESULT_H_ diff --git a/kalzium/src/isotope.cpp b/kalzium/src/isotope.cpp index 268e99d4..3b2dbe63 100644 --- a/kalzium/src/isotope.cpp +++ b/kalzium/src/isotope.cpp @@ -52,24 +52,24 @@ TQString Isotope::halflifeAsString() if ( !seconds() )//years { if ( m_halflife > 1000000 ) - halflife = i18n("%1 million years").arg( KalziumUtils::localizedValue( m_halflife/1000000.0, 2 ) ); + halflife = i18n("%1 million years").tqarg( KalziumUtils::localizedValue( m_halflife/1000000.0, 2 ) ); if ( m_halflife > 1000000000 ) - halflife = i18n("%1 billion years").arg( KalziumUtils::localizedValue( m_halflife/1000000000.0, 2 ) ); + halflife = i18n("%1 billion years").tqarg( KalziumUtils::localizedValue( m_halflife/1000000000.0, 2 ) ); else - halflife = i18n("%1 years").arg( KalziumUtils::localizedValue( m_halflife, 2 ) ); + halflife = i18n("%1 years").tqarg( KalziumUtils::localizedValue( m_halflife, 2 ) ); } else { if ( m_halflife < 120 ) - halflife = i18n("%1 seconds").arg( KalziumUtils::localizedValue( m_halflife, 2 ) ); + halflife = i18n("%1 seconds").tqarg( KalziumUtils::localizedValue( m_halflife, 2 ) ); else if ( m_halflife > 1000 ) - halflife = i18n("%1 minutes").arg( KalziumUtils::localizedValue( m_halflife/60.0, 2 ) ); + halflife = i18n("%1 minutes").tqarg( KalziumUtils::localizedValue( m_halflife/60.0, 2 ) ); else if ( m_halflife > 3600 ) - halflife = i18n("%1 hours").arg( KalziumUtils::localizedValue( m_halflife/( 60*60 ), 2 ) ); + halflife = i18n("%1 hours").tqarg( KalziumUtils::localizedValue( m_halflife/( 60*60 ), 2 ) ); if ( m_halflife > 86400 ) //one day - halflife = i18n("%1 days").arg( KalziumUtils::localizedValue( m_halflife/( 60*60*24 ), 2 ) ); + halflife = i18n("%1 days").tqarg( KalziumUtils::localizedValue( m_halflife/( 60*60*24 ), 2 ) ); if ( m_halflife > ( 31536000 * 2 ) ) //two year - halflife = i18n("%1 years").arg( KalziumUtils::localizedValue( m_halflife/( 3600.0*365 ), 2 ) ); + halflife = i18n("%1 years").tqarg( KalziumUtils::localizedValue( m_halflife/( 3600.0*365 ), 2 ) ); } return halflife; diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp index 84c2c984..747c230f 100644 --- a/kalzium/src/kalzium.cpp +++ b/kalzium/src/kalzium.cpp @@ -74,10 +74,10 @@ Kalzium::Kalzium() m_infoDialog = 0; m_toolboxCurrent = 0; - connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), this, TQT_SLOT( openInformationDialog( int ) )); - connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotStatusbar( int ) )); + connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( openInformationDialog( int ) )); + connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotStatusbar( int ) )); - // layouting + // tqlayouting setCentralWidget( centralWidget ); centralWidget->show(); @@ -107,14 +107,14 @@ Kalzium::Kalzium() void Kalzium::setupActions() { - m_actionNoScheme = new KToggleAction(i18n("&No Color Scheme"), 0, this, TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme"); + m_actionNoScheme = new KToggleAction(i18n("&No Color Scheme"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme"); // the actions for the color schemes - m_actionGroups = new KToggleAction(i18n("Show &Groups"), 0, this, TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups"); - m_actionBlocks = new KToggleAction(i18n("Show &Blocks"), 0, this, TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks"); - m_actionAcid = new KToggleAction(i18n("Show &Acid Behavior"), 0, this, TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid"); - m_actionFamily = new KToggleAction(i18n("Show &Family"), 0, this, TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family"); - m_actionCrystal = new KToggleAction(i18n("Show &Crystal Structures"), 0, this, TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal"); + m_actionGroups = new KToggleAction(i18n("Show &Groups"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups"); + m_actionBlocks = new KToggleAction(i18n("Show &Blocks"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks"); + m_actionAcid = new KToggleAction(i18n("Show &Acid Behavior"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid"); + m_actionFamily = new KToggleAction(i18n("Show &Family"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family"); + m_actionCrystal = new KToggleAction(i18n("Show &Crystal Structures"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal"); //the actions for switching PerodicTableView TQStringList gradientlist; @@ -127,9 +127,9 @@ void Kalzium::setupActions() gradientlist.append(i18n("Melting Point")); gradientlist.append(i18n("Electronegativity")); gradientlist.append(i18n("Electron Affinity")); - gradient_action = new KSelectAction(i18n("&Gradient"), 0, this, 0, actionCollection(), "view_look_gradmenu"); + gradient_action = new KSelectAction(i18n("&Gradient"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_look_gradmenu"); gradient_action->setItems(gradientlist); - connect (gradient_action, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwitchtoGradient(int))); + connect (gradient_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoGradient(int))); // the actions for switching PerodicTableView TQStringList numlist; @@ -137,28 +137,28 @@ void Kalzium::setupActions() numlist.append(i18n("Show &IUPAC")); numlist.append(i18n("Show &CAS")); numlist.append(i18n("Show &Old IUPAC")); - numeration_action = new KSelectAction (i18n("&Numeration"), 0, this, 0, actionCollection(), "view_numerationtype"); + numeration_action = new KSelectAction (i18n("&Numeration"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_numerationtype"); numeration_action->setItems(numlist); numeration_action->setCurrentItem(Prefs::numeration()); - connect (numeration_action, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwitchtoNumeration(int))); + connect (numeration_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoNumeration(int))); - m_SidebarAction = new KAction(i18n("Show &Sidebar"), "sidebar", 0, this, TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar"); + m_SidebarAction = new KAction(i18n("Show &Sidebar"), "sidebar", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar"); #ifdef HAVE_FACILE - m_EQSolverAction = new KAction(i18n("&Equation Solver..."), "eqchem", 0, this, TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver"); + m_ETQSolverAction = new KAction(i18n("&Equation Solver..."), "eqchem", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowETQSolver()), actionCollection(), "tools_eqsolver"); #endif // tools actions - m_pPlotAction = new KAction(i18n("&Plot Data..."), "plot", 0, this, TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata"); - m_pGlossaryAction = new KAction(i18n("&Glossary..."), "glossary", 0, this, TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary"); + m_pPlotAction = new KAction(i18n("&Plot Data..."), "plot", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata"); + m_pGlossaryAction = new KAction(i18n("&Glossary..."), "glossary", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary"); // other period view options - m_pLegendAction = new KAction(i18n("Show &Legend"), "legend", 0, this, TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend"); - m_pTooltipAction = new KAction(i18n("Show &Tooltip"), "tooltip", 0, this, TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip"); + m_pLegendAction = new KAction(i18n("Show &Legend"), "legend", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend"); + m_pTooltipAction = new KAction(i18n("Show &Tooltip"), "tooltip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip"); // the standard actions - KStdAction::preferences(this, TQT_SLOT(showSettingsDialog()), actionCollection()); - KStdAction::quit( kapp, TQT_SLOT (closeAllWindows()),actionCollection() ); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettingsDialog()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()),actionCollection() ); slotShowScheme( Prefs::colorschemebox() ); slotSwitchtoNumeration( Prefs::numeration() ); @@ -212,8 +212,8 @@ void Kalzium::setupSidebars() TQVBoxLayout *lay = new TQVBoxLayout( fake, 5 ); lay->activate(); m_detailWidget = new DetailedGraphicalOverview( fake, "DetailedGraphicalOverview" ); - m_detailWidget->setMinimumSize( 200, m_detailWidget->minimumSize().height() ); - connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotSelectedNumber( int ) )); + m_detailWidget->setMinimumSize( 200, m_detailWidget->tqminimumSize().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 ) ); m_toolbox->addItem( fake, SmallIcon( "overview" ), i18n( "Overview" ) ); @@ -235,13 +235,13 @@ void Kalzium::setupSidebars() m_PerodicTableView, TQT_SLOT( setTemperature( int ) ) ); m_toolbox->addItem( m_somWidget, SmallIcon( "statematter" ), i18n( "State of Matter" ) ); - connect( m_toolbox, TQT_SIGNAL( currentChanged( int ) ), this, TQT_SLOT( slotToolboxCurrentChanged( int ) ) ); + connect( m_toolbox, TQT_SIGNAL( currentChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolboxCurrentChanged( int ) ) ); moveDockWindow( m_dockWin, DockLeft ); setDockEnabled( /*m_dockWin, */DockTop, false ); setDockEnabled( /*m_dockWin, */DockBottom, false ); m_dockWin->hide(); - connect( m_dockWin, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(slotSidebarVisibilityChanged(bool))); + connect( m_dockWin, TQT_SIGNAL(visibilityChanged(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSidebarVisibilityChanged(bool))); } @@ -250,10 +250,10 @@ void Kalzium::slotGlossary() m_glossarydlg->show(); } -void Kalzium::slotShowEQSolver() +void Kalzium::slotShowETQSolver() { #ifdef HAVE_FACILE - EQChemDialog *dlg = new EQChemDialog( this ); + ETQChemDialog *dlg = new ETQChemDialog( this ); TQWidget *page = new TQWidget( dlg ); dlg->setMainWidget( page ); @@ -422,7 +422,7 @@ void Kalzium::setupStatusBar() void Kalzium::slotStatusbar( int num ) { Element *e = KalziumDataObject::instance()->element( num ); - statusBar()->changeItem( i18n( "For example: \"Carbon (6), Mass: 12.0107 u\"", "%1 (%2), Mass: %3 u" ).arg( e->elname() ).arg(e->number() ).arg( KalziumUtils::localizedValue( e->mass(), 6 ) ) , IDS_ELEMENTINFO ); + statusBar()->changeItem( i18n( "For example: \"Carbon (6), Mass: 12.0107 u\"", "%1 (%2), Mass: %3 u" ).tqarg( e->elname() ).tqarg(e->number() ).tqarg( KalziumUtils::localizedValue( e->mass(), 6 ) ) , IDS_ELEMENTINFO ); } void Kalzium::openInformationDialog( int number ) diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h index 1a726fed..44b2583e 100644 --- a/kalzium/src/kalzium.h +++ b/kalzium/src/kalzium.h @@ -46,6 +46,7 @@ class GlossaryDialog; class Kalzium : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor @@ -95,7 +96,7 @@ class Kalzium : public KMainWindow KAction *m_pTooltipAction; KAction *m_pLegendAction; KAction *m_SidebarAction; - KAction *m_EQSolverAction; + KAction *m_ETQSolverAction; KToggleAction *m_actionNoScheme; KToggleAction *m_actionGroups; @@ -105,7 +106,7 @@ class Kalzium : public KMainWindow KToggleAction *m_actionCrystal; /** - * the layout of the central Widget ( CentralWidget ) + * the tqlayout of the central Widget ( CentralWidget ) */ TQVBoxLayout *m_pCentralLayout; @@ -138,7 +139,7 @@ class Kalzium : public KMainWindow */ void slotShowScheme(int); - void slotShowEQSolver(); + void slotShowETQSolver(); void slotShowLegend(); diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp index a759fee2..f25cbfc4 100644 --- a/kalzium/src/kalziumdataobject.cpp +++ b/kalzium/src/kalziumdataobject.cpp @@ -46,29 +46,29 @@ KalziumDataObject::KalziumDataObject() KURL url; url.setPath( locate("data", "kalzium/data/")); url.setFileName( "data.xml" ); - TQFile layoutFile( url.path() ); + TQFile tqlayoutFile( url.path() ); - if (!layoutFile.exists()) + if (!tqlayoutFile.exists()) { kdDebug() << "data.xml not found, exiting" << endl; kapp->exit(0); return; } - if (!layoutFile.open(IO_ReadOnly)) + if (!tqlayoutFile.open(IO_ReadOnly)) { kdDebug() << "data.xml IO-error" << endl; return; } // Check if the document is well-formed - if (!doc.setContent(&layoutFile)) + if (!doc.setContent(&tqlayoutFile)) { kdDebug() << "wrong xml" << endl; - layoutFile.close(); + tqlayoutFile.close(); return; } - layoutFile.close(); + tqlayoutFile.close(); ElementList = readData( doc ); m_numOfElements = ElementList.count(); diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp index ba2a8252..794c9f25 100644 --- a/kalzium/src/kalziumtip.cpp +++ b/kalzium/src/kalziumtip.cpp @@ -38,9 +38,9 @@ #include #include -KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWidget( parent, name, f ) +KalziumTip::KalziumTip( TQWidget * tqparent, const char * name, WFlags f ) : TQWidget( tqparent, name, f ) { - setFocusPolicy(NoFocus); //the widget don't get the keyboard focus + setFocusPolicy(TQ_NoFocus); //the widget don't get the keyboard focus setBackgroundMode(NoBackground); // widget has no background resize(0,0); hide(); //initailly hide it @@ -54,8 +54,8 @@ KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWid void KalziumTip::showTip( TQPoint mouse, Element* element, int visibleWidth, int visibleHeight ) { TQWidget *p = 0; - if ( dynamic_cast( parent() ) ) - p = static_cast( parent() ); + if ( dynamic_cast( tqparent() ) ) + p = TQT_TQWIDGET( tqparent() ); if ( p ) { @@ -82,8 +82,8 @@ void KalziumTip::showTip( TQPoint mouse, Element* element, int visibleWidth, int if( element == m_tippedElement ) { // Avoid moving out of the current screen - if (m_mousePointer.x()+width() > qApp->desktop()->width()) - m_mousePointer.setX(qApp->desktop()->width() - width()); + if (m_mousePointer.x()+width() > tqApp->desktop()->width()) + m_mousePointer.setX(tqApp->desktop()->width() - width()); move(m_mousePointer); //do not paint again if already painted } @@ -113,7 +113,7 @@ void KalziumTip::paintEvent(TQPaintEvent* e) void KalziumTip::mouseMoveEvent(TQMouseEvent * e) { - // delegate the mouse move event to the parent (actually the elements table) + // delegate the mouse move event to the tqparent (actually the elements table) // so that this tooltip doesn't stop to be updated e->ignore(); } @@ -128,10 +128,10 @@ void KalziumTip::display() TQString elementname = m_tippedElement->elname(); TQString number = i18n( "Number: %1" ) - .arg( TQString::number(m_tippedElement->number()) ); + .tqarg( TQString::number(m_tippedElement->number()) ); TQString mass = i18n( "Mass: %1" ) - .arg( KalziumUtils::localizedValue(m_tippedElement->mass(), 6) ); + .tqarg( KalziumUtils::localizedValue(m_tippedElement->mass(), 6) ); m_richText = new TQSimpleRichText("

" + elementname + "

" + number + "

" @@ -139,7 +139,7 @@ void KalziumTip::display() m_richText->setWidth(400); - m_maskEffect = isVisible() ? Plain : Dissolve; + m_tqmaskEffect = isVisible() ? Plain : Dissolve; m_dissolveSize = 24; m_dissolveDelta = -1; @@ -167,18 +167,18 @@ void KalziumTip::displayInternal() textRect.addCoords(0,0,2,2); int margin = KDialog::marginHint(); - int height = QMAX(m_icon.height(), textRect.height()) + 2 * margin; + int height = TQMAX(m_icon.height(), textRect.height()) + 2 * margin; int textX = 2 + m_icon.width() + 2 * margin; int width = textX + textRect.width() + margin; int textY = (height - textRect.height()) / 2; - //resize pixmap, mask and widget - m_mask.resize(width, height); + //resize pixmap, tqmask and widget + m_tqmask.resize(width, height); m_pixmap.resize(width, height); resize(width, height); - // create and set transparency mask - switch(m_maskEffect) + // create and set transparency tqmask + switch(m_tqmaskEffect) { case Plain: plainMask(); @@ -191,7 +191,7 @@ void KalziumTip::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(Qt::black); + bufferPainter.setPen(TQt::black); bufferPainter.setBrush(backgroundColor()); bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); @@ -206,32 +206,32 @@ void KalziumTip::displayInternal() } // draw text shadow - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); 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 = colorGroup(); + cg = tqcolorGroup(); m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg); } void KalziumTip::dissolveMask() { - TQPainter maskPainter(&m_mask); + TQPainter tqmaskPainter(&m_tqmask); - m_mask.fill(Qt::black); + m_tqmask.fill(TQt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); - maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), - 1600 / m_mask.rect().height()); + tqmaskPainter.setBrush(TQt::white); + tqmaskPainter.setPen(TQt::white); + tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), + 1600 / m_tqmask.rect().height()); m_dissolveSize += m_dissolveDelta; if (m_dissolveSize > 0) { - maskPainter.setRasterOp(Qt::EraseROP); + tqmaskPainter.setRasterOp(TQt::EraseROP); int x, y, s; const int size = 16; @@ -247,7 +247,7 @@ void KalziumTip::dissolveMask() { s = 0; } - maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); + tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); } } } @@ -257,7 +257,7 @@ void KalziumTip::dissolveMask() m_dissolveDelta = 1; } - setMask(m_mask); + setMask(m_tqmask); } void KalziumTip::hide() @@ -269,15 +269,15 @@ void KalziumTip::hide() void KalziumTip::plainMask() { - TQPainter maskPainter(&m_mask); + TQPainter tqmaskPainter(&m_tqmask); - m_mask.fill(Qt::black); + m_tqmask.fill(TQt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); - maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), - 1600 / m_mask.rect().height()); - setMask(m_mask); + tqmaskPainter.setBrush(TQt::white); + tqmaskPainter.setPen(TQt::white); + tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), + 1600 / m_tqmask.rect().height()); + setMask(m_tqmask); m_frameTimer.stop(); } @@ -293,7 +293,7 @@ void KalziumTip::loadIcon() if ( !iconpath.isEmpty() ) { TQImage img ( iconpath, "JPEG" ); - img = img.smoothScale ( 128, 128, TQImage::ScaleMin ); + img = img.smoothScale ( 128, 128, TQ_ScaleMin ); m_icon.convertFromImage( img ); } diff --git a/kalzium/src/kalziumtip.h b/kalzium/src/kalziumtip.h index 0186529f..79923bd0 100644 --- a/kalzium/src/kalziumtip.h +++ b/kalzium/src/kalziumtip.h @@ -37,14 +37,15 @@ class TQTimer; * @short tooltip for kalzium * @author Martin Pfeiffer */ -class KalziumTip : public QWidget +class KalziumTip : public TQWidget { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: enum MaskEffect { Plain, Dissolve }; - KalziumTip( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KalziumTip( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); void showTip( TQPoint, Element* element, int visibleWidth, int visibleHeight ); //show the tip void hide(); // hide it @@ -54,7 +55,7 @@ class KalziumTip : public QWidget void plainMask(); void dissolveMask(); - // if the mouse pointer hovers us, send the event to the parent + // if the mouse pointer hovers us, send the event to the tqparent // so we are some-what 'mouse transparent' void mouseMoveEvent(TQMouseEvent * e); void displayInternal(); @@ -66,20 +67,20 @@ class KalziumTip : public QWidget void internalUpdate(); private: - TQBitmap m_mask; + TQBitmap m_tqmask; TQPoint m_mousePointer; TQPixmap m_pixmap; TQPixmap m_icon; //icon shown on the tip TQPixmap m_noElemIcon; //icon for element wich have no image - MaskEffect m_maskEffect; //inidicates to show mask effect or plain + MaskEffect m_tqmaskEffect; //inidicates to show tqmask effect or plain TQSimpleRichText* m_richText; int m_dissolveSize; int m_dissolveDelta; TQTimer m_frameTimer; //timer for the dissolve effect - bool m_dirty; //indicates repainting the tooltip internal + bool m_dirty; //indicates tqrepainting the tooltip internal const Element* m_tippedElement; //the element the tip is about }; diff --git a/kalzium/src/kalziumutils.cpp b/kalzium/src/kalziumutils.cpp index 1522e495..f7ed9d09 100644 --- a/kalzium/src/kalziumutils.cpp +++ b/kalzium/src/kalziumutils.cpp @@ -35,10 +35,10 @@ int KalziumUtils::maxSize( const TQString& string, const TQRect& rect, TQFont fo { font.setPointSize( size ); p->setFont( font ); - r = p->boundingRect( TQRect(), Qt::AlignAuto, string ); + r = p->boundingRect( TQRect(), TQt::AlignAuto, string ); r.moveBy( rect.left(), rect.top() ); - if ( rect.contains( r ) ) + if ( rect.tqcontains( r ) ) goodSizeFound = true; else size--; @@ -50,12 +50,12 @@ int KalziumUtils::maxSize( const TQString& string, const TQRect& rect, TQFont fo int KalziumUtils::StringHeight( const TQString& string, const TQFont& font, TQPainter* p ) { - return p->boundingRect( TQRect(), Qt::AlignAuto, string ).height(); + return p->boundingRect( TQRect(), TQt::AlignAuto, string ).height(); } int KalziumUtils::StringWidth( const TQString& string, const TQFont& font, TQPainter* p ) { - return p->boundingRect( TQRect(), Qt::AlignAuto, string ).width(); + return p->boundingRect( TQRect(), TQt::AlignAuto, string ).width(); } double KalziumUtils::strippedValue( double num ) @@ -69,7 +69,7 @@ double KalziumUtils::strippedValue( double num ) power *= 10; num = num / power * 10000; - num = qRound( num ); + num = tqRound( num ); return num * power / 10000; } diff --git a/kalzium/src/molcalcwidget.cpp b/kalzium/src/molcalcwidget.cpp index 60eb5108..0bcc4f80 100644 --- a/kalzium/src/molcalcwidget.cpp +++ b/kalzium/src/molcalcwidget.cpp @@ -41,8 +41,8 @@ #include -MolcalcWidget::MolcalcWidget( TQWidget *parent, const char *name ) - : MolcalcWidgetBase( parent, name ) +MolcalcWidget::MolcalcWidget( TQWidget *tqparent, const char *name ) + : MolcalcWidgetBase( tqparent, name ) { clear(); } @@ -82,16 +82,16 @@ void MolcalcWidget::updateUI() for ( ; it != itEnd; ++it ) { // Update the resultLabel str += i18n( "For example: \"1 Carbon\" or \"3 Oxygen\"", "%1 %2\n" ) - .arg( (*it)->count() ) - .arg( (*it)->element()->elname() ); + .tqarg( (*it)->count() ) + .tqarg( (*it)->element()->elname() ); complexString += i18n( "For example: 1 Seaborgium. Cumulative Mass: 263.119 u (39.25%)", "%1 %2. Cumulative Mass: %3 u (%4%)\n" ) - .arg( (*it)->count() ) - .arg( (*it)->element()->elname() ) - .arg( (*it)->count() * (*it)->element()->mass() ) - .arg( KalziumUtils::strippedValue( (( (*it)->count() * (*it)->element()->mass() ) + .tqarg( (*it)->count() ) + .tqarg( (*it)->element()->elname() ) + .tqarg( (*it)->count() * (*it)->element()->mass() ) + .tqarg( KalziumUtils::strippedValue( (( (*it)->count() * (*it)->element()->mass() ) / m_mass ) * 100 ) ); } resultLabel->setText( str ); @@ -100,7 +100,7 @@ void MolcalcWidget::updateUI() resultComposition->setText( compositionString(m_elementMap) ); // The mass - resultMass->setText( i18n( "Molecular mass: %1 u" ).arg( m_mass ) ); + resultMass->setText( i18n( "Molecular mass: %1 u" ).tqarg( m_mass ) ); TQToolTip::add( resultMass, complexString ); TQToolTip::add( resultComposition, complexString ); @@ -126,8 +126,8 @@ TQString MolcalcWidget::compositionString( ElementCountMap &_map ) ElementCountMap::Iterator itEnd = _map.end(); for (; it != itEnd; ++it) { str += i18n( "%1%2 " ) - .arg( (*it)->element()->symbol() ) - .arg( (*it)->count() ); + .tqarg( (*it)->element()->symbol() ) + .tqarg( (*it)->count() ); } return str; diff --git a/kalzium/src/molcalcwidget.h b/kalzium/src/molcalcwidget.h index c86d41d3..27cb0269 100644 --- a/kalzium/src/molcalcwidget.h +++ b/kalzium/src/molcalcwidget.h @@ -41,13 +41,14 @@ class MoleculeParser; class MolcalcWidget : public MolcalcWidgetBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parent parent widget + * @param tqparent tqparent widget * @param name name of this widget */ - MolcalcWidget( TQWidget *parent = 0, const char *name = 0 ); + MolcalcWidget( TQWidget *tqparent = 0, const char *name = 0 ); protected slots: void slotCalcButtonClicked(); diff --git a/kalzium/src/molcalcwidgetbase.ui b/kalzium/src/molcalcwidgetbase.ui index a330b773..ab3f9f80 100644 --- a/kalzium/src/molcalcwidgetbase.ui +++ b/kalzium/src/molcalcwidgetbase.ui @@ -1,10 +1,10 @@ MolcalcWidgetBase - + MolcalcWidgetBase - + 0 0 @@ -22,7 +22,7 @@ 6 - + @@ -56,7 +56,7 @@ Horizontal - + resultComposition @@ -69,7 +69,7 @@ - + AlignCenter @@ -83,14 +83,14 @@ MinimumExpanding - + 20 10 - + resultLabel @@ -98,7 +98,7 @@ - + resultMass @@ -124,10 +124,10 @@ slotCalcButtonClicked() - + slotCalcButtonClicked() - - + + klineedit.h kpushbutton.h diff --git a/kalzium/src/moleculeparser.cpp b/kalzium/src/moleculeparser.cpp index 6780e65e..b3d19120 100644 --- a/kalzium/src/moleculeparser.cpp +++ b/kalzium/src/moleculeparser.cpp @@ -172,7 +172,7 @@ MoleculeParser::parseSubmolecule(double *_resultMass, // Parse a term within the molecule, i.e. a single atom or a -// submolecule within parenthesis followed by an optional number. +// submolecule within tqparenthesis followed by an optional number. // Examples: Bk, Mn2, (COOH)2 // // Return true if correct, otherwise return false. diff --git a/kalzium/src/orbitswidget.cpp b/kalzium/src/orbitswidget.cpp index 06824c0f..35e74bf7 100644 --- a/kalzium/src/orbitswidget.cpp +++ b/kalzium/src/orbitswidget.cpp @@ -24,7 +24,7 @@ static TQStringList hulllist; -OrbitsWidget::OrbitsWidget( TQWidget *parent, const char *name) : TQWidget( parent, name ) +OrbitsWidget::OrbitsWidget( TQWidget *tqparent, const char *name) : TQWidget( tqparent, name ) { if ( hulllist.count() == 0 ) { @@ -162,20 +162,20 @@ void OrbitsWidget::getNumberOfOrbits() int cut = 0; bool cont = true; - if ( !o.contains( rxb ) ) //only true for H and He + if ( !o.tqcontains( rxb ) ) //only true for H and He numOfElectrons.append( o.toInt() ); else //every other element { while ( cont ) { - pos = o.find( rxb ); + pos = o.tqfind( rxb ); cut = o.length()-pos-1; numOfElectrons.append(o.left( pos ).toInt()); o = o.right( cut ); num++; - if ( !o.contains( rxb ) ) + if ( !o.tqcontains( rxb ) ) { numOfElectrons.append( o.toInt() ); cont = false; diff --git a/kalzium/src/orbitswidget.h b/kalzium/src/orbitswidget.h index cd7279bf..14ab4752 100644 --- a/kalzium/src/orbitswidget.h +++ b/kalzium/src/orbitswidget.h @@ -26,12 +26,13 @@ * @short the widget which displays the Bohr-orbit of the element * @author Carsten Niehaus */ -class OrbitsWidget : public QWidget +class OrbitsWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - OrbitsWidget( TQWidget *parent=0 , const char *name =0 ); + OrbitsWidget( TQWidget *tqparent=0 , const char *name =0 ); void setElementNumber( const int num ); diff --git a/kalzium/src/parser.cpp b/kalzium/src/parser.cpp index d678885f..9edd9f1f 100644 --- a/kalzium/src/parser.cpp +++ b/kalzium/src/parser.cpp @@ -21,7 +21,7 @@ Parser::Parser() { - start(TQString::null); + start(TQString()); } @@ -48,7 +48,7 @@ Parser::start(const TQString& _str) } else { m_index = 0; - m_nextChar = m_str.at(0).latin1(); + m_nextChar = m_str.tqat(0).latin1(); getNextToken(); } } @@ -148,7 +148,7 @@ Parser::getNextChar() m_nextChar = -1; } else - m_nextChar = m_str.at(++m_index).latin1(); + m_nextChar = m_str.tqat(++m_index).latin1(); // Take care of null-terminated strings. if (m_nextChar == 0) { diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp index a09dcf34..0e810aff 100644 --- a/kalzium/src/periodictableview.cpp +++ b/kalzium/src/periodictableview.cpp @@ -41,8 +41,8 @@ #include #include -PerodicTableView::PerodicTableView(TQWidget *parent, const char *name) - : TQWidget(parent, name), m_kalziumTip(0), table(0), table2(0) +PerodicTableView::PerodicTableView(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name), m_kalziumTip(0), table(0), table2(0) { d = KalziumDataObject::instance(); @@ -171,8 +171,8 @@ void PerodicTableView::slotToolTip( int number ) m_tooltipElementNumber = number; TQWidget *p = 0; - if ( dynamic_cast( parent() ) ) - p = static_cast( parent() ); + if ( dynamic_cast( tqparent() ) ) + p = TQT_TQWIDGET( tqparent() ); if( p ) m_kalziumTip->showTip( mapFromGlobal(TQCursor::pos()), @@ -328,7 +328,7 @@ void PerodicTableView::resizeEvent( TQResizeEvent * /*e*/ ) table->resize( width(), height() ); table2->resize( width(), height() ); // XXX: I know it isn't the best way, but otherwise the table won't be redrawn - // on repaint... Feel *free* to remove these two lines if you foind a better + // on tqrepaint... Feel *free* to remove these two lines if you foind a better // solution... doFullDraw = true; update(); @@ -417,14 +417,14 @@ void PerodicTableView::paintCurrentSelection() p.begin(table); TQPen pen; - pen.setStyle( DotLine ); + pen.setStyle( Qt::DotLine ); pen.setWidth( 4 ); - pen.setColor( Qt::blue ); + pen.setColor( TQt::blue ); p.setPen( pen ); p.drawEllipse( x-10,y-10,ELEMENTSIZE+20,ELEMENTSIZE+20 ); pen.setWidth( 3 ); - pen.setColor( Qt::red ); + pen.setColor( TQt::red ); p.setPen( pen ); p.drawEllipse( x-5,y-5,ELEMENTSIZE+10,ELEMENTSIZE+10 ); @@ -491,12 +491,12 @@ void PerodicTableView::drawLegendToolTip( TQPainter* p ) bRect.moveBy( 15, 0 ); } - p->setBrush(Qt::SolidPattern); + p->setBrush(TQt::SolidPattern); p->setBrush( TQColor( 255, 255, 220 ) ); p->drawRect( bRectExt ); - p->setBrush( Qt::black ); - p->setBrush(Qt::NoBrush); + p->setBrush( TQt::black ); + p->setBrush(TQt::NoBrush); p->drawText( bRect, AlignLeft|AlignTop, text ); } @@ -582,9 +582,9 @@ void PerodicTableView::drawLegend( TQPainter* p ) p->fillRect(x1, fieldheight*3, square_w, square_h, c_liquid ); p->fillRect(x1, fieldheight*4, square_w, square_h, c_vapor ); - p->drawText(x1 + textOffset, fieldheight*2, fieldsize, fieldheight, Qt::AlignLeft, i18n("Solid") ); - p->drawText(x1 + textOffset, fieldheight*3, fieldsize, fieldheight, Qt::AlignLeft, i18n("Liquid") ); - p->drawText(x1 + textOffset, fieldheight*4, fieldsize, fieldheight, Qt::AlignLeft, i18n("Vaporous") ); + p->drawText(x1 + textOffset, fieldheight*2, fieldsize, fieldheight, TQt::AlignLeft, i18n("Solid") ); + p->drawText(x1 + textOffset, fieldheight*3, fieldsize, fieldheight, TQt::AlignLeft, i18n("Liquid") ); + p->drawText(x1 + textOffset, fieldheight*4, fieldsize, fieldheight, TQt::AlignLeft, i18n("Vaporous") ); return; } switch ( m_currentScheme ){ @@ -601,14 +601,14 @@ void PerodicTableView::drawLegend( TQPainter* p ) p->fillRect( x2, fieldheight*4, square_w, square_h, color_7); p->fillRect( x2, fieldheight*5, square_w, square_h, color_8 ); - p->drawText( x1 + textOffset , fieldheight*2, fieldsize, fieldheight, Qt::AlignLeft, i18n("Group 1") ); - p->drawText( x1 + textOffset , fieldheight*3, fieldsize, fieldheight, Qt::AlignLeft, i18n("Group 2")); - p->drawText( x1 + textOffset , fieldheight*4, fieldsize, fieldheight, Qt::AlignLeft, i18n("Group 3")); - p->drawText( x1 + textOffset , fieldheight*5, fieldsize, fieldheight, Qt::AlignLeft, i18n("Group 4")); - p->drawText( x2 + textOffset , fieldheight*2, fieldsize, fieldheight, Qt::AlignLeft, i18n("Group 5")); - p->drawText( x2 + textOffset , fieldheight*3, fieldsize, fieldheight, Qt::AlignLeft, i18n("Group 6")); - p->drawText( x2 + textOffset , fieldheight*4, fieldsize, fieldheight, Qt::AlignLeft, i18n("Group 7")); - p->drawText( x2 + textOffset , fieldheight*5, fieldsize, fieldheight, Qt::AlignLeft, i18n("Group 8")); + p->drawText( x1 + textOffset , fieldheight*2, fieldsize, fieldheight, TQt::AlignLeft, i18n("Group 1") ); + p->drawText( x1 + textOffset , fieldheight*3, fieldsize, fieldheight, TQt::AlignLeft, i18n("Group 2")); + p->drawText( x1 + textOffset , fieldheight*4, fieldsize, fieldheight, TQt::AlignLeft, i18n("Group 3")); + p->drawText( x1 + textOffset , fieldheight*5, fieldsize, fieldheight, TQt::AlignLeft, i18n("Group 4")); + p->drawText( x2 + textOffset , fieldheight*2, fieldsize, fieldheight, TQt::AlignLeft, i18n("Group 5")); + p->drawText( x2 + textOffset , fieldheight*3, fieldsize, fieldheight, TQt::AlignLeft, i18n("Group 6")); + p->drawText( x2 + textOffset , fieldheight*4, fieldsize, fieldheight, TQt::AlignLeft, i18n("Group 7")); + p->drawText( x2 + textOffset , fieldheight*5, fieldsize, fieldheight, TQt::AlignLeft, i18n("Group 8")); break; case PerodicTableView::BLOCK: p->fillRect(x1, fieldheight*2, square_w, square_h, color_s ); @@ -616,10 +616,10 @@ void PerodicTableView::drawLegend( TQPainter* p ) p->fillRect(x1, fieldheight*4, square_w, square_h, color_d ); p->fillRect(x1, fieldheight*5, square_w, square_h, color_f ); - p->drawText(x1 + textOffset, fieldheight*2, fieldsize, fieldheight, Qt::AlignLeft, i18n("s-Block") ); - p->drawText(x1 + textOffset, fieldheight*3, fieldsize, fieldheight, Qt::AlignLeft, i18n("p-Block") ); - p->drawText(x1 + textOffset, fieldheight*4, fieldsize, fieldheight, Qt::AlignLeft, i18n("d-Block") ); - p->drawText(x1 + textOffset, fieldheight*5, fieldsize, fieldheight, Qt::AlignLeft, i18n("f-Block") ); + p->drawText(x1 + textOffset, fieldheight*2, fieldsize, fieldheight, TQt::AlignLeft, i18n("s-Block") ); + p->drawText(x1 + textOffset, fieldheight*3, fieldsize, fieldheight, TQt::AlignLeft, i18n("p-Block") ); + p->drawText(x1 + textOffset, fieldheight*4, fieldsize, fieldheight, TQt::AlignLeft, i18n("d-Block") ); + p->drawText(x1 + textOffset, fieldheight*5, fieldsize, fieldheight, TQt::AlignLeft, i18n("f-Block") ); break; case PerodicTableView::ACIDIC: p->fillRect(x1, fieldheight*2, square_w, square_h, color_ba ); @@ -627,10 +627,10 @@ void PerodicTableView::drawLegend( TQPainter* p ) p->fillRect(x1, fieldheight*4, square_w, square_h, color_ac ); p->fillRect(x1, fieldheight*5, square_w, square_h, color_amp ); - p->drawText(x1 + textOffset, fieldheight*2, fieldsize, fieldheight, Qt::AlignLeft, i18n("Basic") ); - p->drawText(x1 + textOffset, fieldheight*3, fieldsize, fieldheight, Qt::AlignLeft, i18n("Neutral") ); - p->drawText(x1 + textOffset, fieldheight*4, fieldsize, fieldheight, Qt::AlignLeft, i18n("Acidic") ); - p->drawText(x1 + textOffset, fieldheight*5, fieldsize, fieldheight, Qt::AlignLeft, i18n("both acidic and basic behaviour","Amphoteric") ); + p->drawText(x1 + textOffset, fieldheight*2, fieldsize, fieldheight, TQt::AlignLeft, i18n("Basic") ); + p->drawText(x1 + textOffset, fieldheight*3, fieldsize, fieldheight, TQt::AlignLeft, i18n("Neutral") ); + p->drawText(x1 + textOffset, fieldheight*4, fieldsize, fieldheight, TQt::AlignLeft, i18n("Acidic") ); + p->drawText(x1 + textOffset, fieldheight*5, fieldsize, fieldheight, TQt::AlignLeft, i18n("both acidic and basic behaviour","Amphoteric") ); break; case PerodicTableView::FAMILY: p->fillRect( x1, fieldheight*2, square_w, square_h, c_alkaline ); @@ -643,28 +643,28 @@ void PerodicTableView::drawLegend( TQPainter* p ) p->fillRect( x2, fieldheight*5, square_w, square_h, c_noble_gas ); p->fillRect( x1, fieldheight*6, square_w, square_h, c_metalloid ); - p->drawText( x1 + textOffset , fieldheight*2, fieldsize, fieldheight, Qt::AlignLeft, i18n("Alkaline") ); - p->drawText( x2 + textOffset , fieldheight*2, fieldsize, fieldheight, Qt::AlignLeft, i18n("Rare Earth")); - p->drawText( x1 + textOffset , fieldheight*3, fieldsize, fieldheight, Qt::AlignLeft, i18n("Non-Metals")); - p->drawText( x2 + textOffset , fieldheight*3, fieldsize, fieldheight, Qt::AlignLeft, i18n("Alkalie-Metals")); - p->drawText( x1 + textOffset , fieldheight*4, fieldsize, fieldheight, Qt::AlignLeft, i18n("Other Metal")); - p->drawText( x2 + textOffset , fieldheight*4, fieldsize, fieldheight, Qt::AlignLeft, i18n("Halogene")); - p->drawText( x1 + textOffset , fieldheight*5, fieldsize, fieldheight, Qt::AlignLeft, i18n("Transition Metal")); - p->drawText( x2 + textOffset , fieldheight*5, fieldsize, fieldheight, Qt::AlignLeft, i18n("Noble Gas")); - p->drawText( x1 + textOffset , fieldheight*6, fieldsize, fieldheight, Qt::AlignLeft, i18n("Metalloid")); + p->drawText( x1 + textOffset , fieldheight*2, fieldsize, fieldheight, TQt::AlignLeft, i18n("Alkaline") ); + p->drawText( x2 + textOffset , fieldheight*2, fieldsize, fieldheight, TQt::AlignLeft, i18n("Rare Earth")); + p->drawText( x1 + textOffset , fieldheight*3, fieldsize, fieldheight, TQt::AlignLeft, i18n("Non-Metals")); + p->drawText( x2 + textOffset , fieldheight*3, fieldsize, fieldheight, TQt::AlignLeft, i18n("Alkalie-Metals")); + p->drawText( x1 + textOffset , fieldheight*4, fieldsize, fieldheight, TQt::AlignLeft, i18n("Other Metal")); + p->drawText( x2 + textOffset , fieldheight*4, fieldsize, fieldheight, TQt::AlignLeft, i18n("Halogene")); + p->drawText( x1 + textOffset , fieldheight*5, fieldsize, fieldheight, TQt::AlignLeft, i18n("Transition Metal")); + p->drawText( x2 + textOffset , fieldheight*5, fieldsize, fieldheight, TQt::AlignLeft, i18n("Noble Gas")); + p->drawText( x1 + textOffset , fieldheight*6, fieldsize, fieldheight, TQt::AlignLeft, i18n("Metalloid")); break; case PerodicTableView::CRYSTAL: - p->fillRect(x1, fieldheight*2, square_w, square_h, Qt::cyan ); - p->fillRect(x1, fieldheight*3, square_w, square_h, Qt::red ); - p->fillRect(x1, fieldheight*4, square_w, square_h, Qt::yellow ); - p->fillRect(x1, fieldheight*5, square_w, square_h, Qt::green ); - p->fillRect(x1, fieldheight*6, square_w, square_h, Qt::white ); - - p->drawText(x1 + textOffset, fieldheight*2, fieldsize, fieldheight, Qt::AlignLeft, i18n("Own") ); - p->drawText(x1 + textOffset, fieldheight*3, fieldsize, fieldheight, Qt::AlignLeft, i18n("bcc, body centered cubic") ); - p->drawText(x1 + textOffset, fieldheight*4, fieldsize, fieldheight, Qt::AlignLeft, i18n("hdp, hexagonal") ); - p->drawText(x1 + textOffset, fieldheight*5, fieldsize, fieldheight, Qt::AlignLeft, i18n("ccp, cubic close packed") ); - p->drawText(x1 + textOffset, fieldheight*6, fieldsize, fieldheight, Qt::AlignLeft, i18n("Unknown") ); + p->fillRect(x1, fieldheight*2, square_w, square_h, TQt::cyan ); + p->fillRect(x1, fieldheight*3, square_w, square_h, TQt::red ); + p->fillRect(x1, fieldheight*4, square_w, square_h, TQt::yellow ); + p->fillRect(x1, fieldheight*5, square_w, square_h, TQt::green ); + p->fillRect(x1, fieldheight*6, square_w, square_h, TQt::white ); + + p->drawText(x1 + textOffset, fieldheight*2, fieldsize, fieldheight, TQt::AlignLeft, i18n("Own") ); + p->drawText(x1 + textOffset, fieldheight*3, fieldsize, fieldheight, TQt::AlignLeft, i18n("bcc, body centered cubic") ); + p->drawText(x1 + textOffset, fieldheight*4, fieldsize, fieldheight, TQt::AlignLeft, i18n("hdp, hexagonal") ); + p->drawText(x1 + textOffset, fieldheight*5, fieldsize, fieldheight, TQt::AlignLeft, i18n("ccp, cubic close packed") ); + p->drawText(x1 + textOffset, fieldheight*6, fieldsize, fieldheight, TQt::AlignLeft, i18n("Unknown") ); break; } } @@ -679,19 +679,19 @@ void PerodicTableView::drawNumeration( TQPainter* p ) case PerodicTableView::CAS: for(int i = 0; i < 18 ; ++i ) { - p->drawText( i*ELEMENTSIZE,0 ,ELEMENTSIZE,ELEMENTSIZE, Qt::AlignCenter, TQString::number(i+1)); + p->drawText( i*ELEMENTSIZE,0 ,ELEMENTSIZE,ELEMENTSIZE, TQt::AlignCenter, TQString::number(i+1)); } break; case PerodicTableView::IUPAC: for(int i = 0; i < 18 ; ++i ) { - p->drawText( i*ELEMENTSIZE,0 ,ELEMENTSIZE,ELEMENTSIZE, Qt::AlignCenter, m_IUPAClist[i]); + p->drawText( i*ELEMENTSIZE,0 ,ELEMENTSIZE,ELEMENTSIZE, TQt::AlignCenter, m_IUPAClist[i]); } break; case PerodicTableView::IUPACOLD: for(int i = 0; i < 18 ; ++i ) { - p->drawText( i*ELEMENTSIZE,0 ,ELEMENTSIZE,ELEMENTSIZE, Qt::AlignCenter, m_IUPACOLDlist[i]); + p->drawText( i*ELEMENTSIZE,0 ,ELEMENTSIZE,ELEMENTSIZE, TQt::AlignCenter, m_IUPACOLDlist[i]); } break; } @@ -741,7 +741,7 @@ void PerodicTableView::mouseMoveEvent( TQMouseEvent * /*mouse*/ ) //JH: only update() if we were showing a tooltip if ( m_tooltipElementNumber || m_showLegendTooltip ) { - //this invalidates the number. If the mouse + //this tqinvalidates the number. If the mouse //is moved, the number is invalid. m_tooltipElementNumber = 0; m_showLegendTooltip = false; @@ -977,7 +977,7 @@ void PerodicTableView::calculateGradient( TQPainter *p ) void PerodicTableView::drawGradientPerodicTableView( TQPainter *p, const double min, const double max ) { - TQString title = TQString::null; + TQString title = TQString(); const double var = max-min; EList::ConstIterator it = d->ElementList.begin(); @@ -1103,7 +1103,7 @@ void PerodicTableView::drawGradientPerodicTableView( TQPainter *p, const double // Create the gradient image. TQSize s( ELEMENTSIZE*7+20, 20 ); - TQImage img = KImageEffect::gradient ( s, Qt::white, Qt::red, + TQImage img = KImageEffect::gradient ( s, TQt::white, TQt::red, KImageEffect::HorizontalGradient ); TQPixmap pm( img ); @@ -1122,7 +1122,7 @@ void PerodicTableView::drawGradientPerodicTableView( TQPainter *p, const double font.setPointSize(maxSize); p->setFont(font); - p->drawText( x+5, y+50, ELEMENTSIZE*10,20, Qt::AlignCenter, title ); + p->drawText( x+5, y+50, ELEMENTSIZE*10,20, TQt::AlignCenter, title ); p->drawPixmap( x+50, y+80, pm ); if ( m_gradientType == Element::EA ) @@ -1130,13 +1130,13 @@ void PerodicTableView::drawGradientPerodicTableView( TQPainter *p, const double // FIXME: In the lines below, "30" is the max allowed text // height. This should be calculated from the font // metrics, not hard coded. - p->drawText( x+50,y+100,ELEMENTSIZE*7+20,30, Qt::AlignRight, TQString::number( min ) ); - p->drawText( x+50,y+100,ELEMENTSIZE*7+20,30, Qt::AlignLeft, TQString::number( max ) ); + p->drawText( x+50,y+100,ELEMENTSIZE*7+20,30, TQt::AlignRight, TQString::number( min ) ); + p->drawText( x+50,y+100,ELEMENTSIZE*7+20,30, TQt::AlignLeft, TQString::number( max ) ); } else { - p->drawText( x+50,y+100,ELEMENTSIZE*7+20,30, Qt::AlignRight, TQString::number( max ) ); - p->drawText( x+50,y+100,ELEMENTSIZE*7+20,30, Qt::AlignLeft, TQString::number( min ) ); + p->drawText( x+50,y+100,ELEMENTSIZE*7+20,30, TQt::AlignRight, TQString::number( max ) ); + p->drawText( x+50,y+100,ELEMENTSIZE*7+20,30, TQt::AlignLeft, TQString::number( min ) ); } } @@ -1178,13 +1178,13 @@ void PerodicTableView::drawGradientButton( TQPainter *p, Element* e, double coef e->drawGradient( p, v, c ); } else - e->drawGradient( p, i18n("It means: Not Available. Translators: keep it as short as you can!", "N/A"), Qt::lightGray ); + e->drawGradient( p, i18n("It means: Not Available. Translators: keep it as short as you can!", "N/A"), TQt::lightGray ); } TQColor PerodicTableView::calculateColor( const double coeff ) { - const TQColor color2 = Qt::white; - const TQColor color1 = Qt::red; + const TQColor color2 = TQt::white; + const TQColor color1 = TQt::red; int red = (int)( (color1.red() - color2.red()) * coeff + color2.red() ); int green = (int)( (color1.green() - color2.green()) * coeff + color2.green() ); @@ -1347,15 +1347,15 @@ void PerodicTableView::setLook( PerodicTableView::SCHEMETYPE type, int which ) { structure = ( *it )->crystalstructure(); if ( structure == "own") - (*it)->setElementColor( Qt::cyan ); + (*it)->setElementColor( TQt::cyan ); else if ( structure == "bcc" ) - (*it)->setElementColor( Qt::red ); + (*it)->setElementColor( TQt::red ); else if ( structure == "hdp" ) - (*it)->setElementColor( Qt::yellow ); + (*it)->setElementColor( TQt::yellow ); else if ( structure == "ccp" ) - (*it)->setElementColor( Qt::green ); + (*it)->setElementColor( TQt::green ); else - (*it)->setElementColor( Qt::white ); + (*it)->setElementColor( TQt::white ); ++it; } setGradient( false ); diff --git a/kalzium/src/periodictableview.h b/kalzium/src/periodictableview.h index 6f373555..8115ebe2 100644 --- a/kalzium/src/periodictableview.h +++ b/kalzium/src/periodictableview.h @@ -38,17 +38,18 @@ class KalziumTip; * @short basic class for the specific PerodicTableViews * @author Carsten Niehaus */ -class PerodicTableView : public QWidget +class PerodicTableView : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parent parent widget + * @param tqparent tqparent widget * @param name name of this widget */ - PerodicTableView( TQWidget *parent = 0, const char *name = 0); + PerodicTableView( TQWidget *tqparent = 0, const char *name = 0); ~PerodicTableView(); enum SCHEMETYPE diff --git a/kalzium/src/plotsetupwidget.ui b/kalzium/src/plotsetupwidget.ui index a395541d..f3de4fc9 100644 --- a/kalzium/src/plotsetupwidget.ui +++ b/kalzium/src/plotsetupwidget.ui @@ -1,10 +1,10 @@ PlotSetupWidget - + PlotSetupWidget - + 0 0 @@ -16,7 +16,7 @@ unnamed - + textLabel3 @@ -24,15 +24,15 @@ First element: - + - layout4 + tqlayout4 unnamed - + textLabel1_2 @@ -40,7 +40,7 @@ Average value: - + aValue @@ -67,15 +67,15 @@ Define the last element whose value should be plotted - + - layout2 + tqlayout2 unnamed - + textLabel3_2 @@ -83,7 +83,7 @@ Minimum value: - + minValue @@ -93,7 +93,7 @@ - + showNames @@ -104,7 +104,7 @@ Define whether the names of the plotted element should be displayed - + textLabel4 @@ -112,15 +112,15 @@ Last element: - + - layout3 + tqlayout3 unnamed - + textLabel2 @@ -128,7 +128,7 @@ Maximum value: - + maxValue @@ -138,7 +138,7 @@ - + connectPoints @@ -176,14 +176,14 @@ Expanding - + 20 60 - + groupBox1 @@ -248,7 +248,7 @@ - + knuminput.h kcombobox.h diff --git a/kalzium/src/plotwidget.cpp b/kalzium/src/plotwidget.cpp index 2619b504..6a5a9156 100644 --- a/kalzium/src/plotwidget.cpp +++ b/kalzium/src/plotwidget.cpp @@ -25,9 +25,9 @@ PlotWidget::PlotWidget( double x1, double x2, double y1, double y2, - TQWidget *parent, + TQWidget *tqparent, const char* name) - : KPlotWidget( x1, x2, y1, y2, parent, name ) + : KPlotWidget( x1, x2, y1, y2, tqparent, name ) { m_connectPoints = false; } @@ -63,7 +63,7 @@ void PlotWidget::drawObjects( TQPainter *p ) old.setX( q.x() ); old.setY( q.y() ); } - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); } } diff --git a/kalzium/src/plotwidget.h b/kalzium/src/plotwidget.h index 44591f39..1c5ed5de 100644 --- a/kalzium/src/plotwidget.h +++ b/kalzium/src/plotwidget.h @@ -24,9 +24,10 @@ class PlotWidget : public KPlotWidget { Q_OBJECT + TQ_OBJECT public: - PlotWidget( double x1 = 0.0, double x2 = 0.0, double y1 = 0.0, double y2 = 0.0, TQWidget *parent=0 , const char *name =0 ); + PlotWidget( double x1 = 0.0, double x2 = 0.0, double y1 = 0.0, double y2 = 0.0, TQWidget *tqparent=0 , const char *name =0 ); /** * toggles if the points will be connected with diff --git a/kalzium/src/settings_colors.ui b/kalzium/src/settings_colors.ui index f32360d0..e2d338a1 100644 --- a/kalzium/src/settings_colors.ui +++ b/kalzium/src/settings_colors.ui @@ -1,10 +1,10 @@ setColors - + setColors - + 0 0 @@ -19,11 +19,11 @@ unnamed - + dfgdfg - + tab @@ -34,23 +34,23 @@ unnamed - + - layout32 + tqlayout32 unnamed - + - layout28 + tqlayout28 unnamed - + textLabel13 @@ -68,15 +68,15 @@ - + - layout29 + tqlayout29 unnamed - + textLabel14 @@ -94,15 +94,15 @@ - + - layout30 + tqlayout30 unnamed - + textLabel15 @@ -120,15 +120,15 @@ - + - layout31 + tqlayout31 unnamed - + textLabel16 @@ -150,7 +150,7 @@ - + tab @@ -161,23 +161,23 @@ unnamed - + - layout26 + tqlayout26 unnamed - + - layout23 + tqlayout23 unnamed - + textLabel9 @@ -195,15 +195,15 @@ - + - layout24 + tqlayout24 unnamed - + textLabel10 @@ -221,15 +221,15 @@ - + - layout25 + tqlayout25 unnamed - + textLabel11 @@ -247,15 +247,15 @@ - + - layout26 + tqlayout26 unnamed - + textLabel12 @@ -277,7 +277,7 @@ - + TabPage @@ -288,23 +288,23 @@ unnamed - + - layout22 + tqlayout22 unnamed - + - layout12 + tqlayout12 unnamed - + textLabel2_2_2 @@ -322,15 +322,15 @@ - + - layout19 + tqlayout19 unnamed - + textLabel8 @@ -348,15 +348,15 @@ - + - layout18 + tqlayout18 unnamed - + textLabel7 @@ -374,15 +374,15 @@ - + - layout17 + tqlayout17 unnamed - + textLabel6 @@ -400,15 +400,15 @@ - + - layout16 + tqlayout16 unnamed - + textLabel5_2 @@ -426,15 +426,15 @@ - + - layout15 + tqlayout15 unnamed - + textLabel4_2 @@ -452,15 +452,15 @@ - + - layout14 + tqlayout14 unnamed - + textLabel3_2 @@ -478,15 +478,15 @@ - + - layout13 + tqlayout13 unnamed - + textLabel2_2 @@ -508,7 +508,7 @@ - + TabPage @@ -519,23 +519,23 @@ unnamed - + - layout14 + tqlayout14 unnamed - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -556,15 +556,15 @@ - + - layout6 + tqlayout6 unnamed - + textLabel2 @@ -582,15 +582,15 @@ - + - layout7 + tqlayout7 unnamed - + textLabel3 @@ -612,7 +612,7 @@ - + TabPage @@ -623,23 +623,23 @@ unnamed - + - layout36 + tqlayout36 unnamed - + - layout12_2 + tqlayout12_2 unnamed - + textLabel2_2_2_2 @@ -657,15 +657,15 @@ - + - layout19_2 + tqlayout19_2 unnamed - + textLabel8_2 @@ -683,15 +683,15 @@ - + - layout18_2 + tqlayout18_2 unnamed - + textLabel7_2 @@ -709,15 +709,15 @@ - + - layout17_2 + tqlayout17_2 unnamed - + textLabel6_2 @@ -735,15 +735,15 @@ - + - layout16_2 + tqlayout16_2 unnamed - + textLabel5_2_2 @@ -761,15 +761,15 @@ - + - layout15_2 + tqlayout15_2 unnamed - + textLabel4_2_2 @@ -787,15 +787,15 @@ - + - layout14_2 + tqlayout14_2 unnamed - + textLabel3_2_2 @@ -813,15 +813,15 @@ - + - layout13_2 + tqlayout13_2 unnamed - + textLabel2_2_3 @@ -839,15 +839,15 @@ - + - layout35 + tqlayout35 unnamed - + textLabel2_2_3_2 @@ -869,7 +869,7 @@ - + TabPage @@ -901,7 +901,7 @@ - + kcolorbutton.h kcolorbutton.h diff --git a/kalzium/src/settings_misc.ui b/kalzium/src/settings_misc.ui index a66693dd..189dc1b9 100644 --- a/kalzium/src/settings_misc.ui +++ b/kalzium/src/settings_misc.ui @@ -1,10 +1,10 @@ setupMisc - + setupMisc - + 0 0 @@ -16,7 +16,7 @@ unnamed - + kcfg_pselook @@ -30,7 +30,7 @@ unnamed - + radioButton10 @@ -38,7 +38,7 @@ Display atomic &mass in the PSE - + radioButton13 @@ -58,7 +58,7 @@ Expanding - + 20 30 @@ -67,5 +67,5 @@ - + diff --git a/kalzium/src/settings_units.ui b/kalzium/src/settings_units.ui index e054021a..4888572f 100644 --- a/kalzium/src/settings_units.ui +++ b/kalzium/src/settings_units.ui @@ -1,10 +1,10 @@ setupUnits - + setupUnits - + 0 0 @@ -16,7 +16,7 @@ unnamed - + kcfg_temperature @@ -30,7 +30,7 @@ unnamed - + radioButton19 @@ -47,7 +47,7 @@ If selected, the temperatures will be displayed in Kelvin. This is then saved in configuration and restored next time you start Kalzium. - + radioButton11_2 @@ -64,7 +64,7 @@ If selected, the temperatures will be displayed in Degrees Fahrenheit. This is then saved in configuration and restored next time you start Kalzium. - + radioButton21 @@ -81,7 +81,7 @@ If selected, the temperatures will be displayed in Degrees Rankine. This is then saved in configuration and restored next time you start Kalzium. - + radioButton22 @@ -98,7 +98,7 @@ If selected, the temperatures will be displayed in Degrees Réaumur. This is then saved in configuration and restored next time you start Kalzium. - + radioButton20 @@ -117,7 +117,7 @@ - + kcfg_energies @@ -131,7 +131,7 @@ unnamed - + radioButton3_2_2_2 @@ -145,7 +145,7 @@ Check this if you prefer the energy unit in kJ/mol (kilojoule per mol). The other choice you have is eV (electronvolt). - + radioButton4_2_2_2 @@ -163,5 +163,5 @@ - + diff --git a/kalzium/src/somwidget.ui b/kalzium/src/somwidget.ui index 83e19209..d39b9a9b 100644 --- a/kalzium/src/somwidget.ui +++ b/kalzium/src/somwidget.ui @@ -1,10 +1,10 @@ SOMWidget - + SOMWidget - + 0 0 @@ -26,14 +26,14 @@ Fixed - + 21 10 - + text @@ -58,22 +58,22 @@ the state of matter Fixed - + 21 10 - + - layout3 + tqlayout3 unnamed - + lbl1 @@ -91,7 +91,7 @@ the state of matter Expanding - + 20 21 @@ -100,15 +100,15 @@ the state of matter - + - layout4 + tqlayout4 unnamed - + temp_slider @@ -141,7 +141,7 @@ the state of matter Fixed - + 5 20 @@ -162,7 +162,7 @@ the state of matter 295 - + lblUnit @@ -178,7 +178,7 @@ the state of matter - + knuminput.h diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp index 6e3f4b71..a2b3da77 100644 --- a/kalzium/src/somwidget_impl.cpp +++ b/kalzium/src/somwidget_impl.cpp @@ -30,13 +30,13 @@ #include "prefs.h" #include "tempunit.h" -SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name ) - : SOMWidget( parent,name ) +SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *tqparent, const char* name ) + : SOMWidget( tqparent,name ) { m_list = KalziumDataObject::instance()->ElementList; - text->setAlignment( text->alignment() | Qt::WordBreak ); - text->setTextFormat( Qt::RichText ); + text->tqsetAlignment( text->tqalignment() | TQt::WordBreak ); + text->setTextFormat( TQt::RichText ); text->setReadOnly( true ); text->setPaletteBackgroundColor( paletteBackgroundColor() ); text->setFrameStyle( TQFrame::NoFrame ); @@ -58,7 +58,7 @@ SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name ) void SOMWidgetIMPL::reloadUnits() { lblUnit->setText( TempUnit::unitListSymbol( Prefs::temperature() ) ); - QPair range = TempUnit::rangeForUnit( Prefs::temperature() ); + TQPair range = TempUnit::rangeForUnit( Prefs::temperature() ); double newvalue = TempUnit::convert( Number1->value(), m_prevUnit, Prefs::temperature() ); Number1->setRange( range.first, range.second, 0.1, 1 ); @@ -70,7 +70,7 @@ kdDebug() << "min: " << Number1->minValue() << " - max: " << Number1->maxValue() void SOMWidgetIMPL::sliderValueChanged( int temp ) { -// TODO check if in Qt4 the RangeControl emits the signal again +// TODO check if in TQt4 the RangeControl emits the signal again disconnect( Number1, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( spinValueChanged( double ) ) ); disconnect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), @@ -139,7 +139,7 @@ void SOMWidgetIMPL::setNewTemp( double newtemp ) htmlcode += i18n( "Elements with melting point around this temperature:" ) + "
"; for ( uint i = 0; i < listMeltingPoint.count(); i++ ) { - htmlcode += " · " + i18n( "For example: Carbon (300K)", "%1 (%2)" ).arg( listMeltingPoint[i] ).arg( listMeltingPointValue[i] ) + "
"; + htmlcode += " · " + i18n( "For example: Carbon (300K)", "%1 (%2)" ).tqarg( listMeltingPoint[i] ).tqarg( listMeltingPointValue[i] ) + "
"; } htmlcode += "
"; } @@ -153,7 +153,7 @@ void SOMWidgetIMPL::setNewTemp( double newtemp ) htmlcode += i18n( "Elements with boiling point around this temperature:" ) + "
"; for ( uint i = 0; i < listBoilingPoint.count(); i++ ) { - htmlcode += " · " + i18n( "For example: Carbon (300K)", "%1 (%2)" ).arg( listBoilingPoint[i] ).arg( listBoilingPointValue[i] ) + "
"; + htmlcode += " · " + i18n( "For example: Carbon (300K)", "%1 (%2)" ).tqarg( listBoilingPoint[i] ).tqarg( listBoilingPointValue[i] ) + "
"; } htmlcode += "
"; } diff --git a/kalzium/src/somwidget_impl.h b/kalzium/src/somwidget_impl.h index ab616f54..5d32dbdc 100644 --- a/kalzium/src/somwidget_impl.h +++ b/kalzium/src/somwidget_impl.h @@ -29,13 +29,14 @@ class Element; class SOMWidgetIMPL : public SOMWidget { Q_OBJECT + TQ_OBJECT public: /** - * @param parent The parent of this widget + * @param tqparent The tqparent of this widget * @param name The name of this widget */ - SOMWidgetIMPL( TQWidget *parent = 0, const char* name = 0 ); + SOMWidgetIMPL( TQWidget *tqparent = 0, const char* name = 0 ); public slots: /** diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp index dc8abb01..45c62180 100644 --- a/kalzium/src/spectrum.cpp +++ b/kalzium/src/spectrum.cpp @@ -97,7 +97,7 @@ void Spectrum::adjustIntensities() double curInt = ( ( double )( *it ).intensity ); double newInt = max*1000/curInt; - ( *it ).intensity = qRound( newInt ); + ( *it ).intensity = tqRound( newInt ); } } @@ -130,17 +130,17 @@ TQString Spectrum::bandsAsHtml() for (;it!=itEnd;++it) { html += TQString( "

" ) - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + "\n"; } diff --git a/kalzium/src/spectrum.h b/kalzium/src/spectrum.h index 090822a6..4d71837f 100644 --- a/kalzium/src/spectrum.h +++ b/kalzium/src/spectrum.h @@ -143,9 +143,9 @@ class Spectrum TQString bandsAsHtml(); /** - * @return the parent element of this spectrum + * @return the tqparent element of this spectrum */ - Element* parentElement() + Element* tqparentElement() { return m_parentElement; } private: diff --git a/kalzium/src/spectrumview.ui b/kalzium/src/spectrumview.ui index 2787ab66..c7d53dbb 100644 --- a/kalzium/src/spectrumview.ui +++ b/kalzium/src/spectrumview.ui @@ -1,10 +1,10 @@ SpectrumView - + SpectrumView - + 0 0 @@ -36,15 +36,15 @@ This is the spectrum of the element - + - layout2 + tqlayout2 unnamed - + label1 @@ -55,7 +55,7 @@ minimumValue - + minimumValue @@ -75,7 +75,7 @@ This sets the leftmost wavelength of the spectrum - + label2 @@ -86,7 +86,7 @@ maximumValue - + maximumValue @@ -108,9 +108,9 @@ - + - layout4 + tqlayout4 @@ -126,7 +126,7 @@ Expanding - + 211 21 @@ -159,7 +159,7 @@ Expanding - + 21 1 @@ -213,10 +213,10 @@ slotExportAsImage() - + slotExportAsImage() - - + + spectrumwidget.h kpushbutton.h diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp index 89bc36ac..d862e5fd 100644 --- a/kalzium/src/spectrumviewimpl.cpp +++ b/kalzium/src/spectrumviewimpl.cpp @@ -22,10 +22,10 @@ #include "exporter.h" -SpectrumViewImpl::SpectrumViewImpl( TQWidget *parent, const char* name ) - : SpectrumView( parent, name ) +SpectrumViewImpl::SpectrumViewImpl( TQWidget *tqparent, const char* name ) + : SpectrumView( tqparent, name ) { - resize( minimumSizeHint() ); + resize( tqminimumSizeHint() ); // simulating an update m_spectrumWidget->setRightBorder( maximumValue->value() ); exportButton->setGuiItem( KGuiItem( i18n( "&Export Spectrum as Image" ), "fileexport" ) ); @@ -35,7 +35,7 @@ void SpectrumViewImpl::slotExportAsImage() { Exporter* exporter = new Exporter(); TQString fileName = KFileDialog::getSaveFileName( - TQString::null, exporter->supportedImageFormats(), + TQString(), exporter->supportedImageFormats(), this, i18n( "Save Spectrum" ) ); if( !fileName.isEmpty() ) { diff --git a/kalzium/src/spectrumviewimpl.h b/kalzium/src/spectrumviewimpl.h index ed02db85..aea5ad2a 100644 --- a/kalzium/src/spectrumviewimpl.h +++ b/kalzium/src/spectrumviewimpl.h @@ -23,13 +23,14 @@ class SpectrumViewImpl : public SpectrumView { Q_OBJECT + TQ_OBJECT public: /** - * @param parent the parent widget + * @param tqparent the tqparent widget * @param name the name used internally */ - SpectrumViewImpl( TQWidget* parent, const char* name ); + SpectrumViewImpl( TQWidget* tqparent, const char* name ); /** * sets the spectrum to @p spec diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp index 54f70972..2431b407 100644 --- a/kalzium/src/spectrumwidget.cpp +++ b/kalzium/src/spectrumwidget.cpp @@ -39,7 +39,7 @@ #include #endif -SpectrumWidget::SpectrumWidget( TQWidget *parent, const char* name ) : TQWidget( parent, name ) +SpectrumWidget::SpectrumWidget( TQWidget *tqparent, const char* name ) : TQWidget( tqparent, name ) { startValue = 0; endValue = 0; @@ -57,7 +57,7 @@ SpectrumWidget::SpectrumWidget( TQWidget *parent, const char* name ) : TQWidget( setType( EmissionSpectrum ); setMinimumSize( 400, 230 ); - setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); setBackgroundMode( NoBackground ); } @@ -70,8 +70,8 @@ void SpectrumWidget::paintEvent( TQPaintEvent * /*e*/ ) m_pixmap.fill( this, width(), height() ); TQPainter p; - p.begin( &m_pixmap, this ); - p.fillRect( 0, 0, width(), m_realHeight, Qt::black ); + p.tqbegin( &m_pixmap, this ); + p.fillRect( 0, 0, width(), m_realHeight, TQt::black ); paintBands( &p ); @@ -89,7 +89,7 @@ void SpectrumWidget::paintEvent( TQPaintEvent * /*e*/ ) void SpectrumWidget::drawZoomLine( TQPainter* p ) { - p->setPen( Qt::white ); + p->setPen( TQt::white ); p->drawLine( m_LMBPointPress.x(), m_LMBPointPress.y(), m_LMBPointCurrent.x(), m_LMBPointPress.y() ); p->drawLine( m_LMBPointCurrent.x(), m_LMBPointPress.y()+10, m_LMBPointCurrent.x(), m_LMBPointPress.y()-10 ); p->drawLine( m_LMBPointPress.x(), m_LMBPointPress.y()+10, m_LMBPointPress.x(), m_LMBPointPress.y()-10 ); @@ -107,7 +107,7 @@ void SpectrumWidget::paintBands( TQPainter* p ) p->drawLine( x,0,x, m_realHeight ); } - p->setPen( Qt::black ); + p->setPen( TQt::black ); } int i = 0; @@ -131,12 +131,12 @@ void SpectrumWidget::paintBands( TQPainter* p ) p->setPen( linecolor( ( *it ).wavelength ) ); p->drawLine( x,0,x, m_realHeight-1 ); - p->setPen( Qt::black ); + p->setPen( TQt::black ); // p->drawLine( x,m_realHeight,x, m_realHeight ); break; case AbsorptionSpectrum: - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawLine( x,0,x, m_realHeight-1 ); break; } @@ -223,7 +223,7 @@ int SpectrumWidget::Adjust( double color, double factor ) if ( color == 0.0 ) return 0; else - return qRound( IntensityMax * pow( color*factor, Gamma ) ); + return tqRound( IntensityMax * pow( color*factor, Gamma ) ); } void SpectrumWidget::drawTickmarks( TQPainter* p ) @@ -249,8 +249,8 @@ void SpectrumWidget::drawTickmarks( TQPainter* p ) i*d < width()-space ) { pos = ( double ) ( i*d )/width(); - p->fillRect( i*d-space, m_realHeight+12, 2*space, 15, Qt::white ); - p->drawText( i*d-space, m_realHeight+12, 2*space, 15, Qt::AlignCenter, KalziumUtils::localizedValue( KalziumUtils::strippedValue( Wavelength( pos ) ), 6 ) ); + p->fillRect( i*d-space, m_realHeight+12, 2*space, 15, TQt::white ); + p->drawText( i*d-space, m_realHeight+12, 2*space, 15, TQt::AlignCenter, KalziumUtils::localizedValue( KalziumUtils::strippedValue( Wavelength( pos ) ), 6 ) ); } } else {//small tickmarks @@ -320,9 +320,9 @@ void SpectrumWidget::mouseMoveEvent( TQMouseEvent *e ) void SpectrumWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == TQMouseEvent::LeftButton ) + if ( e->button() == Qt::LeftButton ) m_LMBPointPress = e->pos(); - if ( e->button() == TQMouseEvent::RightButton ) + if ( e->button() == Qt::RightButton ) slotZoomOut(); //FIXME //the tooltip is not really working. Better to not have it @@ -376,22 +376,22 @@ void SpectrumWidget::PrepareTooltip( double wavelength ) void SpectrumWidget::drawTooltip( TQPainter *p ) { - p->setPen( Qt::white ); + p->setPen( TQt::white ); TQPoint pt = mapFromGlobal( TQCursor::pos() ); - p->drawText( pt, i18n("Wavelength: %1").arg(m_band.wavelength) ); + p->drawText( pt, i18n("Wavelength: %1").tqarg(m_band.wavelength) ); pt.setY( pt.y() + 15 ); - p->drawText( pt, i18n("Intensity: %1").arg(m_band.intensity) ); + p->drawText( pt, i18n("Intensity: %1").tqarg(m_band.intensity) ); pt.setY( pt.y() + 15 ); - p->drawText( pt, i18n("Energy 1, Energy 2: %1, %2").arg(m_band.energy1).arg( m_band.energy2 )); + p->drawText( pt, i18n("Energy 1, Energy 2: %1, %2").tqarg(m_band.energy1).tqarg( m_band.energy2 )); pt.setY( pt.y() + 15 ); - p->drawText( pt, i18n("Term 1, Term 2: %1, %2").arg(m_band.term1).arg( m_band.term2 )); + p->drawText( pt, i18n("Term 1, Term 2: %1, %2").tqarg(m_band.term1).tqarg( m_band.term2 )); pt.setY( pt.y() + 15 ); - p->drawText( pt, i18n("J 1, J 2: %1, %2").arg(m_band.J1).arg( m_band.J2 )); + p->drawText( pt, i18n("J 1, J 2: %1, %2").tqarg(m_band.J1).tqarg( m_band.J2 )); } void SpectrumWidget::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == TQMouseEvent::LeftButton ) + if ( e->button() == Qt::LeftButton ) { int left = (int)Wavelength( ( double )m_LMBPointPress.x()/width() ); int right = (int)Wavelength( ( double )e->pos().x()/width() ); @@ -415,12 +415,12 @@ TQPixmap SpectrumWidget::pixmap() TQString text; if( m_type == EmissionSpectrum ) - text = i18n( "Emission spectrum of %1" ).arg( m_spectrum->parentElement()->elname() ); + text = i18n( "Emission spectrum of %1" ).tqarg( m_spectrum->tqparentElement()->elname() ); else - text = i18n( "Absorption spectrum of %1" ).arg( m_spectrum->parentElement()->elname() ); + text = i18n( "Absorption spectrum of %1" ).tqarg( m_spectrum->tqparentElement()->elname() ); TQPainter p( &tmp ); - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawText( 30, m_realHeight + 70, text ); return tmp; diff --git a/kalzium/src/spectrumwidget.h b/kalzium/src/spectrumwidget.h index c29e433c..f5c98099 100644 --- a/kalzium/src/spectrumwidget.h +++ b/kalzium/src/spectrumwidget.h @@ -31,12 +31,13 @@ * @author Carsten Niehaus * */ -class SpectrumWidget : public QWidget +class SpectrumWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SpectrumWidget( TQWidget *parent, const char* name = 0 ); + SpectrumWidget( TQWidget *tqparent, const char* name = 0 ); ~SpectrumWidget(){} diff --git a/kalzium/src/tempunit.cpp b/kalzium/src/tempunit.cpp index a4e18ef7..bab2461c 100644 --- a/kalzium/src/tempunit.cpp +++ b/kalzium/src/tempunit.cpp @@ -94,40 +94,40 @@ TQString TempUnit::unitListSymbol( int i ) return l[i]; } -QPair TempUnit::rangeForUnit( TempUnit::Unit u ) +TQPair TempUnit::rangeForUnit( TempUnit::Unit u ) { switch( u ) { case Kelvin: { - return QPair( 0.0, 5000.0 ); + return TQPair( 0.0, 5000.0 ); break; } case Celsius: { - return QPair( -273.16, 4726.84 ); + return TQPair( -273.16, 4726.84 ); break; } case Fahrenheit: { - return QPair( -459.67, 8540.33 ); + return TQPair( -459.67, 8540.33 ); break; } case Rankine: { - return QPair( 0.0, 9000.0 ); + return TQPair( 0.0, 9000.0 ); break; } case Reaumur: { - return QPair( -218.52, 3781.48 ); + return TQPair( -218.52, 3781.48 ); break; } } - return QPair( 0.0, 5000.0 ); + return TQPair( 0.0, 5000.0 ); } -QPair TempUnit::rangeForUnit( int u ) +TQPair TempUnit::rangeForUnit( int u ) { return rangeForUnit( (TempUnit::Unit)u ); } diff --git a/kalzium/src/tempunit.h b/kalzium/src/tempunit.h index 23629bb2..5c3e5e4e 100644 --- a/kalzium/src/tempunit.h +++ b/kalzium/src/tempunit.h @@ -81,12 +81,12 @@ class TempUnit */ static TQString unitListSymbol( int i ); - static QPair rangeForUnit( TempUnit::Unit u ); + static TQPair rangeForUnit( TempUnit::Unit u ); /** * @overload */ - static QPair rangeForUnit( int u ); + static TQPair rangeForUnit( int u ); }; #endif // TEMPUNIT_H diff --git a/kalzium/src/timewidget.ui b/kalzium/src/timewidget.ui index fcb46391..7466c21c 100644 --- a/kalzium/src/timewidget.ui +++ b/kalzium/src/timewidget.ui @@ -1,10 +1,10 @@ TimeWidget - + TimeWidget - + 0 0 @@ -26,22 +26,22 @@ Fixed - + 21 20 - + - layout3 + tqlayout3 unnamed - + lbl1_2 @@ -67,7 +67,7 @@ Expanding - + 20 21 @@ -76,15 +76,15 @@ - + - layout5 + tqlayout5 unnamed - + time_slider @@ -117,7 +117,7 @@ Fixed - + 5 21 @@ -150,14 +150,14 @@ Fixed - + 20 16 - + text @@ -194,7 +194,7 @@ of the elements setValue(int) - + knuminput.h diff --git a/kalzium/src/timewidget_impl.cpp b/kalzium/src/timewidget_impl.cpp index a5f186bc..576ab17d 100644 --- a/kalzium/src/timewidget_impl.cpp +++ b/kalzium/src/timewidget_impl.cpp @@ -20,11 +20,11 @@ #include -TimeWidgetIMPL::TimeWidgetIMPL( TQWidget *parent, const char* name ) - : TimeWidget( parent, name ) +TimeWidgetIMPL::TimeWidgetIMPL( TQWidget *tqparent, const char* name ) + : TimeWidget( tqparent, name ) { - text->setAlignment( text->alignment() | Qt::WordBreak ); - text->setTextFormat( Qt::RichText ); + text->tqsetAlignment( text->tqalignment() | TQt::WordBreak ); + text->setTextFormat( TQt::RichText ); text->setReadOnly( true ); text->setPaletteBackgroundColor( paletteBackgroundColor() ); text->setFrameStyle( TQFrame::NoFrame ); diff --git a/kalzium/src/timewidget_impl.h b/kalzium/src/timewidget_impl.h index 65030da1..b728b435 100644 --- a/kalzium/src/timewidget_impl.h +++ b/kalzium/src/timewidget_impl.h @@ -22,13 +22,14 @@ class TimeWidgetIMPL : public TimeWidget { Q_OBJECT + TQ_OBJECT public: /** - * @param parent The parent of this widget + * @param tqparent The tqparent of this widget * @param name The name of this widget */ - TimeWidgetIMPL( TQWidget *parent = 0, const char* name = 0 ); + TimeWidgetIMPL( TQWidget *tqparent = 0, const char* name = 0 ); public slots: /** diff --git a/kanagram/Doxyfile b/kanagram/Doxyfile index 27b7cf29..5ffa50d0 100644 --- a/kanagram/Doxyfile +++ b/kanagram/Doxyfile @@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - contains \ + tqcontains \ represents \ a \ an \ @@ -124,7 +124,7 @@ FILE_PATTERNS = *.c \ *.tlh \ *.diff \ *.patch \ - *.moc \ + *.tqmoc \ *.xpm \ *.dox RECURSIVE = yes diff --git a/kanagram/data/fruits.kvtml b/kanagram/data/fruits.kvtml index 60a8881a..22c838a8 100644 --- a/kanagram/data/fruits.kvtml +++ b/kanagram/data/fruits.kvtml @@ -93,7 +93,7 @@ Valid xml means: grapefruit - kiwi + kiwi lemon @@ -117,7 +117,7 @@ Valid xml means: peach - pear + pear pineapple diff --git a/kanagram/data/objects.kvtml b/kanagram/data/objects.kvtml index d9e52eb1..f1573de3 100644 --- a/kanagram/data/objects.kvtml +++ b/kanagram/data/objects.kvtml @@ -78,7 +78,7 @@ Valid xml means: cooker - fireplace + fitqreplace table diff --git a/kanagram/data/space.kvtml b/kanagram/data/space.kvtml index 97f6b813..8c86acf9 100644 --- a/kanagram/data/space.kvtml +++ b/kanagram/data/space.kvtml @@ -78,7 +78,7 @@ Valid xml means: comet - constellation + constellation cosmonaut diff --git a/kanagram/data/vegetables.kvtml b/kanagram/data/vegetables.kvtml index b3356f3f..4c2bdb9f 100644 --- a/kanagram/data/vegetables.kvtml +++ b/kanagram/data/vegetables.kvtml @@ -84,7 +84,7 @@ Valid xml means: chickpeas - cucumber + cucumber garlic diff --git a/kanagram/src/fontutils.cpp b/kanagram/src/fontutils.cpp index 14fff456..5b3dfdca 100644 --- a/kanagram/src/fontutils.cpp +++ b/kanagram/src/fontutils.cpp @@ -18,7 +18,7 @@ int fontUtils::fontSize(TQPainter &p, const TQString &s1, int w, int h) f.setPointSize(28); p.setFont(f); - aux1 = p.boundingRect(TQRect(), Qt::AlignAuto, s1); + aux1 = p.boundingRect(TQRect(), TQt::AlignAuto, s1); - return QMIN(w * 28 / aux1.width(), h * 28 / aux1.height()); + return TQMIN(w * 28 / aux1.width(), h * 28 / aux1.height()); } diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index 42cb90f9..df845ac6 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -180,8 +180,8 @@ void Kanagram::setupRects() //set appropriate yOffset for different fonts if(m_useStandardFonts) yOffset = 6; TQRect r = innerRect(m_blackboardRect, 6, yOffset); - m_hintRect = tmpp.boundingRect(r, Qt::AlignBottom|Qt::AlignLeft, i18n(m_textHint)); - m_revealRect = tmpp.boundingRect(r, Qt::AlignBottom|Qt::AlignRight, i18n(m_textRevealWord)); + m_hintRect = tmpp.boundingRect(r, TQt::AlignBottom|TQt::AlignLeft, i18n(m_textHint)); + m_revealRect = tmpp.boundingRect(r, TQt::AlignBottom|TQt::AlignRight, i18n(m_textRevealWord)); tmpp.end(); } @@ -210,14 +210,14 @@ void Kanagram::paintEvent(TQPaintEvent *) p.drawPixmap(520, 362, *m_quit); //draw main Anagram - drawTextNew(p, m_game->getAnagram(), Qt::AlignCenter, 10, 10, m_blackboardRect, true, 28); + drawTextNew(p, m_game->getAnagram(), TQt::AlignCenter, 10, 10, m_blackboardRect, true, 28); int yOffset = 0; //set appropriate yOffset for different fonts if(m_useStandardFonts) yOffset = 6; //draw text using appropriate yOffset - drawTextNew(p, i18n(m_textRevealWord), Qt::AlignBottom | Qt::AlignRight, 6, yOffset, m_blackboardRect, m_overReveal, 14); - drawTextNew(p, i18n(m_textHint), Qt::AlignBottom | Qt::AlignLeft, 6, yOffset, m_blackboardRect, m_overHint, 14); + drawTextNew(p, i18n(m_textRevealWord), TQt::AlignBottom | TQt::AlignRight, 6, yOffset, m_blackboardRect, m_overReveal, 14); + drawTextNew(p, i18n(m_textHint), TQt::AlignBottom | TQt::AlignLeft, 6, yOffset, m_blackboardRect, m_overHint, 14); //draw vocab switcher drawSwitcher(p, 9, 8); @@ -225,7 +225,7 @@ void Kanagram::paintEvent(TQPaintEvent *) p.setPen(TQPen(black, 3)); //Draw the border of the input box - TQRect borderRect = m_inputBox->geometry(); + TQRect borderRect = m_inputBox->tqgeometry(); borderRect.setLeft(borderRect.left() - 2); borderRect.setTop(borderRect.top() - 2); borderRect.setWidth(borderRect.width() + 2 * 1); @@ -340,7 +340,7 @@ void Kanagram::drawSwitcher(TQPainter &p, const int xMargin, const int yMargin) r.normalize(); r.moveBy(- padding - (m_overSwitcher ? m_arrowOver : m_arrow )->width(), yMargin); r.setHeight( (m_overSwitcher ? m_arrowOver : m_arrow )->height()); - m_switcherRect = p.boundingRect(r, Qt::AlignVCenter|Qt::AlignRight, text); + m_switcherRect = p.boundingRect(r, TQt::AlignVCenter|TQt::AlignRight, text); p.setFont(font); if (m_overSwitcher) { @@ -353,7 +353,7 @@ void Kanagram::drawSwitcher(TQPainter &p, const int xMargin, const int yMargin) p.drawPixmap(m_switcherRect.right() + padding, m_switcherRect.top(), *m_arrow); } m_switcherRect.moveBy(0, -2); - p.drawText(m_switcherRect, Qt::AlignVCenter|Qt::AlignRight, text); + p.drawText(m_switcherRect, TQt::AlignVCenter|TQt::AlignRight, text); } TQRect Kanagram::innerRect(const TQRect &rect, const int xMargin, const int yMargin) @@ -377,7 +377,7 @@ TQRect Kanagram::innerRect(const TQRect &rect, const int xMargin, const int yMar void Kanagram::mousePressEvent(TQMouseEvent *e) { - if (m_nextRect.contains(e->pos())) + if (m_nextRect.tqcontains(e->pos())) { hideHint(); m_game->nextAnagram(); @@ -386,53 +386,53 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) update(); } - if(m_configRect.contains(e->pos())) + if(m_configRect.tqcontains(e->pos())) { showSettings(); } - if(m_quitRect.contains(e->pos())) + if(m_quitRect.tqcontains(e->pos())) { kapp->quit(); } - if(m_revealRect.contains(e->pos())) + if(m_revealRect.tqcontains(e->pos())) { m_game->restoreWord(); update(); } - if(m_logoRect.contains(e->pos())) + if(m_logoRect.tqcontains(e->pos())) { m_helpMenu->aboutApplication(); } if(!m_showHint && m_overHelp) { - if(m_handbookRect.contains(e->pos())) + if(m_handbookRect.tqcontains(e->pos())) { m_helpMenu->appHelpActivated(); } - if(m_aboutKDERect.contains(e->pos())) + if(m_aboutKDERect.tqcontains(e->pos())) { m_helpMenu->aboutKDE(); } - if(m_aboutAppRect.contains(e->pos())) + if(m_aboutAppRect.tqcontains(e->pos())) { m_helpMenu->aboutApplication(); } } - if(m_hintBoxRect.contains(e->pos())) + if(m_hintBoxRect.tqcontains(e->pos())) { hideHint(); } - if(m_switcherRect.contains(e->pos()) || m_arrowRect.contains(e->pos())) + if(m_switcherRect.tqcontains(e->pos()) || m_arrowRect.tqcontains(e->pos())) { - if(!(e->button() == RightButton)) + if(!(e->button() == Qt::RightButton)) m_game->nextVocab(); else m_game->previousVocab(); @@ -444,7 +444,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) update(); } - if(m_hintRect.contains(e->pos())) + if(m_hintRect.tqcontains(e->pos())) { if(m_showHint == true) m_showHint = false; else @@ -459,7 +459,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) update(); } - if(m_upRect.contains(e->pos()) && m_inputBox->text() != "") + if(m_upRect.tqcontains(e->pos()) && m_inputBox->text() != "") { if(m_inputBox->text().lower().stripWhiteSpace() == m_game->getWord()) { @@ -492,7 +492,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) bool haveToUpdate; haveToUpdate = false; - if (m_nextRect.contains(p)) + if (m_nextRect.tqcontains(p)) { if (!m_overNext) { @@ -506,7 +506,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_configRect.contains(p)) + if(m_configRect.tqcontains(p)) { if(!m_overConfig) { @@ -520,7 +520,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_helpRect.contains(p)) + if(m_helpRect.tqcontains(p)) { if(!m_overHelp) { @@ -534,7 +534,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_quitRect.contains(p)) + if(m_quitRect.tqcontains(p)) { if(!m_overQuit) { @@ -548,7 +548,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_hintRect.contains(p)) + if(m_hintRect.tqcontains(p)) { if(!m_overHint) { @@ -562,7 +562,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_hintBoxRect.contains(p)) + if(m_hintBoxRect.tqcontains(p)) { if(!m_overHintBox) { @@ -576,7 +576,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_revealRect.contains(p)) + if(m_revealRect.tqcontains(p)) { if(!m_overReveal) { @@ -590,7 +590,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_upRect.contains(p)) + if(m_upRect.tqcontains(p)) { if(!m_overUp) { @@ -604,7 +604,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_switcherRect.contains(p) || m_arrowRect.contains(p)) + if(m_switcherRect.tqcontains(p) || m_arrowRect.tqcontains(p)) { if(!m_overSwitcher) { @@ -618,7 +618,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_aboutAppRect.contains(p)) + if(m_aboutAppRect.tqcontains(p)) { if(!m_overAboutApp) { @@ -634,7 +634,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) if(!m_showHint) { - if(m_handbookRect.contains(p)) + if(m_handbookRect.tqcontains(p)) { if(!m_overHandbook) { @@ -648,7 +648,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_aboutKDERect.contains(p)) + if(m_aboutKDERect.tqcontains(p)) { if(!m_overAboutKDE) { @@ -679,7 +679,7 @@ void Kanagram::drawText(TQPainter &p, const TQString &text, const TQPoint ¢e font.setBold(true); p.setFont(font); - r = p.boundingRect(TQRect(), Qt::AlignAuto, text); + r = p.boundingRect(TQRect(), TQt::AlignAuto, text); r = TQRect(0, 0, r.width() + xMargin, r.height() + yMargin); r.moveBy(center.x() - r.width() / 2, center.y() - r.height() / 2); @@ -692,7 +692,7 @@ void Kanagram::drawText(TQPainter &p, const TQString &text, const TQPoint ¢e if (!highlight) p.setPen(m_chalkColor); else p.setPen(m_chalkHighlightColor); - p.drawText(r, Qt::AlignCenter, text); + p.drawText(r, TQt::AlignCenter, text); if(rect) *rect = r; } diff --git a/kanagram/src/kanagram.h b/kanagram/src/kanagram.h index db39fccc..504667c1 100644 --- a/kanagram/src/kanagram.h +++ b/kanagram/src/kanagram.h @@ -54,9 +54,10 @@ class KRandomSequence; class KanagramGame; class VocabSettings; -class Kanagram : public QWidget +class Kanagram : public TQWidget { Q_OBJECT + TQ_OBJECT public: Kanagram(); ~Kanagram(); diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp index 67212168..972c4c19 100644 --- a/kanagram/src/kanagramgame.cpp +++ b/kanagram/src/kanagramgame.cpp @@ -34,9 +34,9 @@ #include -KanagramGame::KanagramGame(TQWidget* parent) : m_index(0) +KanagramGame::KanagramGame(TQWidget* tqparent) : m_index(0) { - m_parent = parent; + m_parent = tqparent; loadDefaultVocab(); } @@ -48,7 +48,7 @@ void KanagramGame::checkFile() { if (!TQFile::exists(locate("appdata", m_filename))) { TQString msg = i18n("File %1 cannot be found.\n Please ensure that Kanagram is properly installed.") - .arg(m_filename); + .tqarg(m_filename); KMessageBox::sorry(m_parent, msg, i18n("Error")); exit(0); } @@ -138,7 +138,7 @@ void KanagramGame::nextAnagram() { m_answeredWords.clear(); } - while(m_answeredWords.findIndex(doc->getEntry(wordNumber)->getOriginal()) != -1) + while(m_answeredWords.tqfindIndex(doc->getEntry(wordNumber)->getOriginal()) != -1) { wordNumber = m_random.getLong(totalWords); } diff --git a/kanagram/src/kanagramgame.h b/kanagram/src/kanagramgame.h index b7e30237..09b6c077 100644 --- a/kanagram/src/kanagramgame.h +++ b/kanagram/src/kanagramgame.h @@ -28,11 +28,12 @@ class TQWidget; -class KanagramGame : public QObject +class KanagramGame : public TQObject { Q_OBJECT + TQ_OBJECT public: - KanagramGame(TQWidget *parent); + KanagramGame(TQWidget *tqparent); ~KanagramGame(); void refreshVocabList(); void loadDefaultVocab(); diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp index 4bfe29fc..49f5402c 100644 --- a/kanagram/src/keduvocdocument.cpp +++ b/kanagram/src/keduvocdocument.cpp @@ -44,7 +44,7 @@ using namespace std; // KEduVocDocument //******************************************************** -KEduVocDocument::KEduVocDocument(TQObject * /*parent*/) +KEduVocDocument::KEduVocDocument(TQObject * /*tqparent*/) { Init(); } @@ -99,7 +99,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) if (!url.isEmpty()) doc_url = url; - // TODO EPT connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) ); + // TODO EPT connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), tqparent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) ); TQString tmpfile; if (KIO::NetAccess::download( url, tmpfile, 0 )) @@ -107,7 +107,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) TQFile f(tmpfile); if (!f.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("Cannot open file
%1").arg(url.path())); + KMessageBox::error(0, i18n("Cannot open file
%1").tqarg(url.path())); return false; } @@ -163,7 +163,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) // TODO new readers provide an explicite error message // the two messages should be merged TQString format = i18n("Could not load \"%1\"\nDo you want to try again?"); - TQString msg = format.arg(url.path()); + TQString msg = format.tqarg(url.path()); int result = KMessageBox::warningContinueCancel(0, msg, kapp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); @@ -180,9 +180,9 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) } -bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType ft, const TQString & generator) +bool KEduVocDocument::saveAs(TQObject * /*tqparent*/, const KURL & url, FileType ft, const TQString & generator) { -// connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) ); +// connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), tqparent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) ); KURL tmp (url); @@ -211,7 +211,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f if (!f.open(IO_WriteOnly)) { - KMessageBox::error(0, i18n("Cannot write to file
%1").arg(tmp.path())); + KMessageBox::error(0, i18n("Cannot write to file
%1").tqarg(tmp.path())); return false; } @@ -253,7 +253,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f // TODO new writers provide an explicite error message // the two messages should be merged TQString format = i18n("Could not save \"%1\"\nDo you want to try again?"); - TQString msg = format.arg(tmp.path()); + TQString msg = format.tqarg(tmp.path()); int result = KMessageBox::warningContinueCancel(0, msg, kapp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); @@ -717,7 +717,7 @@ void KEduVocDocument::setLeitnerSystem( LeitnerSystem* system ) { leitnerSystem = system; - /*KWordQuizApp* app = (KWordQuizApp*) parent(); + /*KWordQuizApp* app = (KWordQuizApp*) tqparent(); app->slotLeitnerSystem();*/ } @@ -901,11 +901,11 @@ int KEduVocDocument::search(TQString substr, int id, if (id == 0) { for (int i = first; i < last; i++) { if (word_start) { - if (getEntry(i)->getOriginal().find (substr, 0, false) == 0) // case insensitive + if (getEntry(i)->getOriginal().tqfind (substr, 0, false) == 0) // case insensitive return i; } else { - if (getEntry(i)->getOriginal().find (substr, 0, false) > -1) // case insensitive + if (getEntry(i)->getOriginal().tqfind (substr, 0, false) > -1) // case insensitive return i; } } @@ -913,11 +913,11 @@ int KEduVocDocument::search(TQString substr, int id, else { for (int i = first; i < last; i++) { if (word_start) { - if (getEntry(i)->getTranslation(id).find (substr, 0, false) == 0) // case insensitive + if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) == 0) // case insensitive return i; } else { - if (getEntry(i)->getTranslation(id).find (substr, 0, false) > -1) // case insensitive + if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) > -1) // case insensitive return i; } } @@ -972,7 +972,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename) TQDataStream is( &f ); - Q_INT8 c1, c2, c3, c4, c5; + TQ_INT8 c1, c2, c3, c4, c5; is >> c1 >> c2 >> c3 @@ -989,13 +989,13 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename) line.insert (0, c1); f.close(); - bool stat = is.device()->status(); + bool stat = is.tqdevice()->status(); if (stat != IO_Ok) return kvd_none; if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l') return kvtml; - if (line.find (VCB_SEPARATOR) >= 0) + if (line.tqfind (VCB_SEPARATOR) >= 0) return vt_vcb; if (line == LEX_IDENT_50) diff --git a/kanagram/src/keduvocdocument.h b/kanagram/src/keduvocdocument.h index ebc48010..468f3089 100644 --- a/kanagram/src/keduvocdocument.h +++ b/kanagram/src/keduvocdocument.h @@ -48,7 +48,7 @@ #define KV_ORG "o" // original expression in specified language #define KV_TRANS "t" // translated expression in specified language #define KV_LANG "l" // language: en, de, it, fr ... -#define KV_QUERY "q" // query: org or translation +#define KV_TQUERY "q" // query: org or translation #define KV_O "o" // org #define KV_T "t" // translation #define KV_GRADE "g" // grade of knowledge: 0=well known, x=not known for x times @@ -104,7 +104,7 @@ #define KV_LESS_GRP "lesson" // lesson descriptor group #define KV_LESS_CURR "current" // is current lesson #define KV_LESS_DESC "desc" // lesson descriptor -#define KV_LESS_QUERY "query" // lesson contained in query +#define KV_LESS_TQUERY "query" // lesson contained in query #define KV_LESS_NO "no" // lesson descriptor number /* @@ -232,7 +232,7 @@ #define KVTML_EXT "kvtml" #define VT5_LEX_EXT "lex" -#define QVOCAB_EXT "qvo" +#define TQVOCAB_EXT "qvo" #define VCB_EXT "vocab" #define KVL_EXT "vl" #define CSV_EXT "csv" @@ -249,9 +249,10 @@ class LeitnerSystem; * This class contains the expressions of your vocabulary ************************************************************/ -class KEduVocDocument : public QObject +class KEduVocDocument : public TQObject { Q_OBJECT + TQ_OBJECT friend class KEduVocKvtmlWriter; friend class KEduVocKvtmlReader; @@ -439,7 +440,7 @@ class KEduVocDocument : public QObject * @param url if url is empty (or NULL) actual name is preserved * @result true if successful */ - bool saveAs(TQObject *parent, const KURL & url, FileType ft, const TQString & generator); + bool saveAs(TQObject *tqparent, const KURL & url, FileType ft, const TQString & generator); /** returns count of entries */ diff --git a/kanagram/src/keduvocexpression.cpp b/kanagram/src/keduvocexpression.cpp index 8d01c8ba..0c82897b 100644 --- a/kanagram/src/keduvocexpression.cpp +++ b/kanagram/src/keduvocexpression.cpp @@ -55,7 +55,7 @@ KEduVocExpression::KEduVocExpression (TQString &s, TQString separator, int _less lesson = _lesson; if (separator.length() ) { - int pos = s.find(separator); + int pos = s.tqfind(separator); if (pos == -1) { setOriginal(s.stripWhiteSpace()); @@ -67,7 +67,7 @@ KEduVocExpression::KEduVocExpression (TQString &s, TQString separator, int _less // s.stripWhiteSpace(); // gather all translations - while ((pos = s.find(separator)) != -1) { + while ((pos = s.tqfind(separator)) != -1) { se = s.left(pos).stripWhiteSpace(); addTranslation(se, KV_NORM_GRADE, KV_NORM_GRADE); s.remove (0, pos+separator.length() ); diff --git a/kanagram/src/keduvocexpression.h b/kanagram/src/keduvocexpression.h index eb3ac4ec..c86acf8e 100644 --- a/kanagram/src/keduvocexpression.h +++ b/kanagram/src/keduvocexpression.h @@ -23,7 +23,7 @@ #define KV_MIN_GRADE 0 #define KV_NORM_GRADE 0 // not queried yet -#define KV_NORM_COLOR Qt::black +#define KV_NORM_COLOR TQt::black #define KV_NORM_TEXT I18N_NOOP("Not Queried Yet") #define KV_LEV1_GRADE 1 diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp index fc1441f6..687fdaee 100644 --- a/kanagram/src/keduvockvtmlreader.cpp +++ b/kanagram/src/keduvockvtmlreader.cpp @@ -78,7 +78,7 @@ bool KEduVocKvtmlReader::readLesson(TQDomElement &domElementParent) if (isCurr && no != 0) m_doc->setCurrentLesson(no); - TQDomAttr domAttrQuery = domElementChild.attributeNode(KV_LESS_QUERY); + TQDomAttr domAttrQuery = domElementChild.attributeNode(KV_LESS_TQUERY); if (!domAttrQuery.isNull()) m_doc->lessons_in_query.push_back(domAttrQuery.value().toInt() != 0); else @@ -131,7 +131,7 @@ bool KEduVocKvtmlReader::readArticle(TQDomElement &domElementParent) { if (domElementEntry.tagName() != KV_ART_ENTRY) { - domError(i18n("expected tag <%1>").arg(KV_ART_ENTRY)); + domError(i18n("expected tag <%1>").tqarg(KV_ART_ENTRY)); return false; } @@ -331,7 +331,7 @@ bool KEduVocKvtmlReader::readConjug(TQDomElement &domElementParent, if (type.length() != 0 && type.left(1) == UL_USER_TENSE) { - int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check + int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check if( num > (int) m_doc->tense_descr.size() ) { // description missing ? @@ -783,7 +783,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement if (!domAttrGrade.isNull()) { TQString s = domAttrGrade.value(); - if ((pos = s.find(';')) >= 1) + if ((pos = s.tqfind(';')) >= 1) { grade = s.left(pos).toInt(); rev_grade = s.mid(pos+1, s.length()).toInt(); @@ -798,7 +798,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement if (!domAttrCount.isNull()) { TQString s = domAttrCount.value(); - if ((pos = s.find(';')) >= 1) + if ((pos = s.tqfind(';')) >= 1) { count = s.left(pos).toInt(); rev_count = s.mid(pos+1, s.length()).toInt(); @@ -813,7 +813,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement if (!domAttrBad.isNull()) { TQString s = domAttrBad.value(); - if ((pos = s.find(';')) >= 1) + if ((pos = s.tqfind(';')) >= 1) { bcount = s.left(pos).toInt(); rev_bcount = s.mid(pos+1, s.length()).toInt(); @@ -828,7 +828,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement if (!domAttrDate.isNull()) { TQString s = domAttrDate.value(); - if ((pos = s.find(';')) >= 1) + if ((pos = s.tqfind(';')) >= 1) { date = s.left(pos).toInt(); rev_date = s.mid(pos+1, s.length()).toInt(); @@ -841,7 +841,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement if (!domAttrDate2.isNull()) { TQString s = domAttrDate2.value(); - if ((pos = s.find(';')) >= 1) + if ((pos = s.tqfind(';')) >= 1) { date = m_doc->decompressDate(s.left(pos)); rev_date = m_doc->decompressDate(s.mid(pos+1, s.length())); @@ -882,7 +882,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement usage = domAttrUsage.value(); if (usage.length() != 0 && usage.left(1) == UL_USER_USAGE) { - int num = QMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check + int num = TQMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check if( num > (int) m_doc->usage_descr.size() ) { // description missing ? @@ -912,15 +912,15 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement { type = domAttrExprType.value(); if (type == "1") - type = QM_VERB; + type = TQM_VERB; else if (type == "2") // convert from pre-0.5 versions - type = QM_NOUN; + type = TQM_NOUN; else if (type == "3") - type = QM_NAME; + type = TQM_NAME; - if (type.length() != 0 && type.left(1) == QM_USER_TYPE) + if (type.length() != 0 && type.left(1) == TQM_USER_TYPE) { - int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check + int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check if( num > (int) m_doc->type_descr.size() ) { // description missing ? @@ -941,7 +941,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement pronunce = domAttrPronunce.value(); query_id = ""; - TQDomAttr domAttrQuery = domElementExpressionChild.attributeNode(KV_QUERY); + TQDomAttr domAttrQuery = domElementExpressionChild.attributeNode(KV_TQUERY); if (!domAttrQuery.isNull()) query_id = domAttrQuery.value(); @@ -1010,15 +1010,15 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent) { exprtype = !domAttrType.value().toInt(); if (exprtype == "1") - exprtype = QM_VERB; + exprtype = TQM_VERB; else if (exprtype == "2") // convert from pre-0.5 versions - exprtype = QM_NOUN; + exprtype = TQM_NOUN; else if (exprtype == "3") - exprtype = QM_NAME; + exprtype = TQM_NAME; - if (exprtype.length() != 0 && exprtype.left(1) == QM_USER_TYPE) + if (exprtype.length() != 0 && exprtype.left(1) == TQM_USER_TYPE) { - int num = QMIN(exprtype.mid (1, 40).toInt(), 1000); // paranoia check + int num = TQMIN(exprtype.mid (1, 40).toInt(), 1000); // paranoia check if( num > (int) m_doc->type_descr.size() ) { // description missing ? @@ -1059,7 +1059,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent) if (domElementExpressionChild.tagName() != KV_ORG) { // must be preceded by "original" - domError(i18n("starting tag <%1> is missing").arg(KV_ORG)); + domError(i18n("starting tag <%1> is missing").tqarg(KV_ORG)); return false; } @@ -1139,7 +1139,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent) { if (bConjug) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName())); return false; } bConjug = true; @@ -1152,7 +1152,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent) { if (bComparison) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName())); return false; } bComparison = true; @@ -1165,7 +1165,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent) { if (bMultipleChoice) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName())); return false; } bMultipleChoice = true; @@ -1236,7 +1236,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent) if (domElementExpressionChild.tagName() != KV_TRANS) { // "original" must be followed by "translations" - domError(i18n("starting tag <%1> is missing").arg(KV_TRANS)); + domError(i18n("starting tag <%1> is missing").tqarg(KV_TRANS)); return false; } @@ -1317,7 +1317,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent) { if (bConjug) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName())); return false; } bConjug = true; @@ -1330,7 +1330,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent) { if (bComparison) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName())); return false; } bComparison = true; @@ -1343,7 +1343,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent) { if (bMultipleChoice) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName())); return false; } bMultipleChoice = true; @@ -1456,7 +1456,7 @@ if (lines != 0) { if (lessgroup) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName())); return false; } lessgroup = true; @@ -1468,7 +1468,7 @@ if (lines != 0) { if (articlegroup) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName())); return false; } articlegroup = true; @@ -1480,7 +1480,7 @@ if (lines != 0) { if (conjuggroup) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName())); return false; } conjuggroup = true; @@ -1492,7 +1492,7 @@ if (lines != 0) { if (optgroup) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName())); return false; } optgroup = true; @@ -1504,7 +1504,7 @@ if (lines != 0) { if (attrgroup) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName())); return false; } attrgroup = true; @@ -1516,7 +1516,7 @@ if (lines != 0) { if (tensegroup) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName())); return false; } tensegroup = true; @@ -1528,7 +1528,7 @@ if (lines != 0) { if (usagegroup) { - domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName())); + domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName())); return false; } usagegroup = true; @@ -1590,7 +1590,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc) if( domElementKvtml.tagName() != KV_DOCTYPE ) { domError(i18n("Tag <%1> was expected " - "but tag <%2> was read." ).arg(KV_DOCTYPE).arg(domElementKvtml.tagName())); + "but tag <%2> was read." ).tqarg(KV_DOCTYPE).tqarg(domElementKvtml.tagName())); return false; } @@ -1602,7 +1602,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc) if (!domAttrEncoding.isNull()) { // TODO handle old encodings - // Qt DOM API autodetects encoding, so is there anything to do ? + // TQt DOM API autodetects encoding, so is there anything to do ? } TQDomAttr domAttrTitle = domElementKvtml.attributeNode(KV_TITLE); @@ -1633,7 +1633,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc) if (!domAttrGenerator.isNull()) { m_doc->generator = domAttrGenerator.value(); - int pos = m_doc->generator.findRev (KVD_VERS_PREFIX); + int pos = m_doc->generator.tqfindRev (KVD_VERS_PREFIX); if (pos >= 0) { m_doc->doc_version = m_doc->generator; @@ -1667,7 +1667,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc) void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem) { - TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path()); + TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path()); TQString format = i18n( "Your document contains an unknown tag <%1>. " // keep trailing space @@ -1676,7 +1676,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem) "Loading is aborted because KVocTrain cannot " "read documents with unknown elements.\n" ); - TQString msg = format.arg(elem); + TQString msg = format.tqarg(elem); TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Unknown Element")); KMessageBox::sorry(0, ln+msg, s); @@ -1687,7 +1687,7 @@ void KEduVocKvtmlReader::domError(const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Error")); - TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path()); + TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path()); TQString msg = text; KMessageBox::error(0, ln+msg, s); TQApplication::restoreOverrideCursor(); diff --git a/kanagram/src/keduvockvtmlreader.h b/kanagram/src/keduvockvtmlreader.h index a68d4575..acd29782 100644 --- a/kanagram/src/keduvockvtmlreader.h +++ b/kanagram/src/keduvockvtmlreader.h @@ -30,36 +30,36 @@ class KEduVocDocument; // internal types, indented are subtypes -#define QM_VERB "v" // go -#define QM_VERB_IRR "ir" -#define QM_VERB_REG "re" -#define QM_NOUN "n" // table, coffee -#define QM_NOUN_F "f" -#define QM_NOUN_M "m" -#define QM_NOUN_S "s" -#define QM_NAME "nm" -#define QM_ART "ar" // article -#define QM_ART_DEF "def" // definite a/an -#define QM_ART_IND "ind" // indefinite the -#define QM_ADJ "aj" // adjective expensive, good -#define QM_ADV "av" // adverb today, strongly -#define QM_PRON "pr" // pronoun you, she -#define QM_PRON_POS "pos" // possessive my, your -#define QM_PRON_PER "per" // personal -#define QM_PHRASE "ph" -#define QM_NUM "num" // numeral -#define QM_NUM_ORD "ord" // ordinal first, second -#define QM_NUM_CARD "crd" // cardinal one, two -#define QM_INFORMAL "ifm" -#define QM_FIG "fig" -#define QM_CON "con" // conjuncton and, but -#define QM_PREP "pre" // preposition behind, between -#define QM_QUEST "qu" // question who, what +#define TQM_VERB "v" // go +#define TQM_VERB_IRR "ir" +#define TQM_VERB_REG "re" +#define TQM_NOUN "n" // table, coffee +#define TQM_NOUN_F "f" +#define TQM_NOUN_M "m" +#define TQM_NOUN_S "s" +#define TQM_NAME "nm" +#define TQM_ART "ar" // article +#define TQM_ART_DEF "def" // definite a/an +#define TQM_ART_IND "ind" // indefinite the +#define TQM_ADJ "aj" // adjective expensive, good +#define TQM_ADV "av" // adverb today, strongly +#define TQM_PRON "pr" // pronoun you, she +#define TQM_PRON_POS "pos" // possessive my, your +#define TQM_PRON_PER "per" // personal +#define TQM_PHRASE "ph" +#define TQM_NUM "num" // numeral +#define TQM_NUM_ORD "ord" // ordinal first, second +#define TQM_NUM_CARD "crd" // cardinal one, two +#define TQM_INFORMAL "ifm" +#define TQM_FIG "fig" +#define TQM_CON "con" // conjuncton and, but +#define TQM_PREP "pre" // preposition behind, between +#define TQM_QUEST "qu" // question who, what // type delimiters -#define QM_USER_TYPE "#" // designates number of user type -#define QM_TYPE_DIV ":" // divide main from subtype +#define TQM_USER_TYPE "#" // designates number of user type +#define TQM_TYPE_DIV ":" // divide main from subtype // usage delimiters (also declared in UsageManager.h) @@ -68,7 +68,7 @@ class KEduVocDocument; /** @author Eric Pignet */ -class KEduVocKvtmlReader : public QObject +class KEduVocKvtmlReader : public TQObject { public: KEduVocKvtmlReader(TQFile *file); diff --git a/kanagram/src/keduvockvtmlwriter.cpp b/kanagram/src/keduvockvtmlwriter.cpp index 5aef1645..8789c7d6 100644 --- a/kanagram/src/keduvockvtmlwriter.cpp +++ b/kanagram/src/keduvockvtmlwriter.cpp @@ -126,7 +126,7 @@ bool KEduVocKvtmlWriter::saveLessonKvtMl (TQDomDocument &domDoc, TQDomElement &d if (m_doc->getCurrentLesson() == lfn+1) domElementDesc.setAttribute (KV_LESS_CURR, 1); if (lfn < (int) m_doc->lessons_in_query.size() && m_doc->lessons_in_query[lfn]) - domElementDesc.setAttribute (KV_LESS_QUERY, 1); + domElementDesc.setAttribute (KV_LESS_TQUERY, 1); domElementDesc.appendChild(domTextDesc); domElementLesson.appendChild(domElementDesc); @@ -268,7 +268,7 @@ bool KEduVocKvtmlWriter::saveConjugHeader(TQDomDocument &domDoc, TQDomElement &d TQDomElement domElementConjug = domDoc.createElement(KV_CONJUG_GRP); TQString s; - for (int ent = 0; ent < QMIN((int) curr_conjug.size(), m_doc->numLangs()); ent++) + for (int ent = 0; ent < TQMIN((int) curr_conjug.size(), m_doc->numLangs()); ent++) { TQDomElement domElementEntry = domDoc.createElement(KV_CON_ENTRY); @@ -478,7 +478,7 @@ bool KEduVocKvtmlWriter::saveArticleKvtMl(TQDomDocument &domDoc, TQDomElement &d TQDomElement domElementArticle = domDoc.createElement(KV_ARTICLE_GRP); TQString def, indef, s; - for (int lfn = 0; lfn < QMIN((int) m_doc->articles.size(), m_doc->numLangs()); lfn++) + for (int lfn = 0; lfn < TQMIN((int) m_doc->articles.size(), m_doc->numLangs()); lfn++) { TQDomElement domElementEntry = domDoc.createElement(KV_ART_ENTRY); if (lfn == 0) @@ -746,9 +746,9 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato s = "original"; domElementOriginal.setAttribute (KV_LANG, s); if (s == q_org) - domElementOriginal.setAttribute(KV_QUERY, (TQString) KV_O); + domElementOriginal.setAttribute(KV_TQUERY, (TQString) KV_O); else if (s == q_trans) - domElementOriginal.setAttribute(KV_QUERY, (TQString) KV_T); + domElementOriginal.setAttribute(KV_TQUERY, (TQString) KV_T); } @@ -781,20 +781,20 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato TQString s; TQString entype = s = (*first).getType(0); - int pos = s.find (QM_TYPE_DIV); + int pos = s.tqfind (TQM_TYPE_DIV); if (pos >= 0) entype = s.left (pos); else entype = s; - if (entype == QM_VERB + if (entype == TQM_VERB && (*first).getConjugation(0).numEntries() > 0) { Conjugation conj = (*first).getConjugation(0); if (!saveConjugEntry(domDoc, domElementOriginal, conj)) return false; } - else if (entype == QM_ADJ + else if (entype == TQM_ADJ && !(*first).getComparison(0).isEmpty()) { Comparison comp = (*first).getComparison(0); @@ -825,9 +825,9 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato } domElementTranslation.setAttribute(KV_LANG, s); if (s == q_org) - domElementTranslation.setAttribute(KV_QUERY, (TQString) KV_O); + domElementTranslation.setAttribute(KV_TQUERY, (TQString) KV_O); else if (s == q_trans) - domElementTranslation.setAttribute(KV_QUERY, (TQString) KV_T); + domElementTranslation.setAttribute(KV_TQUERY, (TQString) KV_T); } TQString s1, s2; @@ -901,13 +901,13 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato TQString s; TQString entype = s = (*first).getType(0); - int pos = s.find (QM_TYPE_DIV); + int pos = s.tqfind (TQM_TYPE_DIV); if (pos >= 0) entype = s.left (pos); else entype = s; - if (entype == QM_VERB + if (entype == TQM_VERB && (*first).getConjugation(trans).numEntries() > 0) { Conjugation conj = (*first).getConjugation(trans); @@ -915,7 +915,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato return false; } - if (entype == QM_ADJ + if (entype == TQM_ADJ && !(*first).getComparison(trans).isEmpty()) { Comparison comp = (*first).getComparison(trans); diff --git a/kanagram/src/keduvockvtmlwriter.h b/kanagram/src/keduvockvtmlwriter.h index 969cedf0..e8ff5de8 100644 --- a/kanagram/src/keduvockvtmlwriter.h +++ b/kanagram/src/keduvockvtmlwriter.h @@ -30,36 +30,36 @@ class KEduVocDocument; // internal types, indented are subtypes -#define QM_VERB "v" // go -#define QM_VERB_IRR "ir" -#define QM_VERB_REG "re" -#define QM_NOUN "n" // table, coffee -#define QM_NOUN_F "f" -#define QM_NOUN_M "m" -#define QM_NOUN_S "s" -#define QM_NAME "nm" -#define QM_ART "ar" // article -#define QM_ART_DEF "def" // definite a/an -#define QM_ART_IND "ind" // indefinite the -#define QM_ADJ "aj" // adjective expensive, good -#define QM_ADV "av" // adverb today, strongly -#define QM_PRON "pr" // pronoun you, she -#define QM_PRON_POS "pos" // possessive my, your -#define QM_PRON_PER "per" // personal -#define QM_PHRASE "ph" -#define QM_NUM "num" // numeral -#define QM_NUM_ORD "ord" // ordinal first, second -#define QM_NUM_CARD "crd" // cardinal one, two -#define QM_INFORMAL "ifm" -#define QM_FIG "fig" -#define QM_CON "con" // conjuncton and, but -#define QM_PREP "pre" // preposition behind, between -#define QM_QUEST "qu" // question who, what +#define TQM_VERB "v" // go +#define TQM_VERB_IRR "ir" +#define TQM_VERB_REG "re" +#define TQM_NOUN "n" // table, coffee +#define TQM_NOUN_F "f" +#define TQM_NOUN_M "m" +#define TQM_NOUN_S "s" +#define TQM_NAME "nm" +#define TQM_ART "ar" // article +#define TQM_ART_DEF "def" // definite a/an +#define TQM_ART_IND "ind" // indefinite the +#define TQM_ADJ "aj" // adjective expensive, good +#define TQM_ADV "av" // adverb today, strongly +#define TQM_PRON "pr" // pronoun you, she +#define TQM_PRON_POS "pos" // possessive my, your +#define TQM_PRON_PER "per" // personal +#define TQM_PHRASE "ph" +#define TQM_NUM "num" // numeral +#define TQM_NUM_ORD "ord" // ordinal first, second +#define TQM_NUM_CARD "crd" // cardinal one, two +#define TQM_INFORMAL "ifm" +#define TQM_FIG "fig" +#define TQM_CON "con" // conjuncton and, but +#define TQM_PREP "pre" // preposition behind, between +#define TQM_QUEST "qu" // question who, what // type delimiters -#define QM_USER_TYPE "#" // designates number of user type -#define QM_TYPE_DIV ":" // divide main from subtype +#define TQM_USER_TYPE "#" // designates number of user type +#define TQM_TYPE_DIV ":" // divide main from subtype /** @author Eric Pignet diff --git a/kanagram/src/leitnersystem.cpp b/kanagram/src/leitnersystem.cpp index 0705c5c2..6a44593b 100644 --- a/kanagram/src/leitnersystem.cpp +++ b/kanagram/src/leitnersystem.cpp @@ -79,7 +79,7 @@ const TQString& LeitnerSystem::getNextBox( TQString& previousBox ) return getBox( i ); } - return TQString::null; + return TQString(); } const TQString& LeitnerSystem::getCorrectBox( int box ) @@ -114,7 +114,7 @@ void LeitnerSystem::deleteBox( LeitnerBox* box ) bool LeitnerSystem::insertBox( const TQString& name, int correctWordBox, int wrongWordBox ) { - if( getBoxNameList().contains( name ) != 0 ) + if( getBoxNameList().tqcontains( name ) != 0 ) return false; LeitnerBox tmpBox; @@ -133,9 +133,9 @@ void LeitnerSystem::setSystemName( const TQString& name ) int LeitnerSystem::getNumber( LeitnerBox* box ) { - if( m_boxes.findIndex( *box ) == -1 ) + if( m_boxes.tqfindIndex( *box ) == -1 ) kdDebug() << "muhaha" << endl; - return m_boxes.findIndex( *box ); + return m_boxes.tqfindIndex( *box ); } bool LeitnerSystem::setBoxName( int box, const TQString& name ) @@ -164,7 +164,7 @@ bool LeitnerSystem::setBoxName( LeitnerBox* box, const TQString& name ) bool LeitnerSystem::insertBox( const TQString& name ) { - if( getBoxNameList().contains( name ) != 0 ) + if( getBoxNameList().tqcontains( name ) != 0 ) return false; LeitnerBox tmpBox; diff --git a/kanagram/src/leitnersystemview.cpp b/kanagram/src/leitnersystemview.cpp index cbbb0400..e49c0e07 100644 --- a/kanagram/src/leitnersystemview.cpp +++ b/kanagram/src/leitnersystemview.cpp @@ -20,8 +20,8 @@ #include -LeitnerSystemView::LeitnerSystemView(TQWidget * parent, const char* name, WFlags f) - : TQScrollView(parent, name, f) +LeitnerSystemView::LeitnerSystemView(TQWidget * tqparent, const char* name, WFlags f) + : TQScrollView(tqparent, name, f) { m_highlightedBox = -1; } @@ -116,7 +116,7 @@ void LeitnerSystemView::setSystem(LeitnerSystem* leitnersystem) //calculate the new sizes calculateSize(); updateContents(); - //repaint + //tqrepaint //update(); //TQPainter* p = new TQPainter(this); //drawContents( p, 0, 0, 0, 0 ); diff --git a/kanagram/src/leitnersystemview.h b/kanagram/src/leitnersystemview.h index 9f540cdf..11108f9f 100644 --- a/kanagram/src/leitnersystemview.h +++ b/kanagram/src/leitnersystemview.h @@ -22,12 +22,13 @@ class LeitnerSystem; @author Martin Pfeiffer */ -class LeitnerSystemView : public QScrollView +class LeitnerSystemView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - LeitnerSystemView(TQWidget* parent = 0, const char* name = 0, WFlags f = 0); + LeitnerSystemView(TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0); ~LeitnerSystemView(); diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp index 1e026758..6ca548ee 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -35,11 +35,11 @@ #include "mainsettings.h" #include "kanagramsettings.h" -MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent) +MainSettings::MainSettings(TQWidget *tqparent) : MainSettingsWidget(tqparent) { - m_parent = (KConfigDialog*)parent; + m_parent = (KConfigDialog*)tqparent; - connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation())); + connect(tqparent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation())); connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent())); setupTranslations(); @@ -109,7 +109,7 @@ void MainSettings::setupTranslations() temp_languages.remove(".."); for (TQStringList::const_iterator it2 = temp_languages.begin(); it2 != temp_languages.end(); ++it2 ) { - if (!languages.contains(*it2)) languages.append(*it2); + if (!languages.tqcontains(*it2)) languages.append(*it2); } } diff --git a/kanagram/src/mainsettings.h b/kanagram/src/mainsettings.h index 172b5276..c82d8fd6 100644 --- a/kanagram/src/mainsettings.h +++ b/kanagram/src/mainsettings.h @@ -30,8 +30,9 @@ class KConfigDialog; class MainSettings : public MainSettingsWidget { Q_OBJECT + TQ_OBJECT public: - MainSettings(TQWidget *parent); + MainSettings(TQWidget *tqparent); ~MainSettings(); public slots: diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui index ef9d017e..2848bb43 100644 --- a/kanagram/src/mainsettingswidget.ui +++ b/kanagram/src/mainsettingswidget.ui @@ -1,10 +1,10 @@ MainSettingsWidget - + MainSettingsWidget - + 0 0 @@ -22,7 +22,7 @@ unnamed - + groupBox1 @@ -33,7 +33,7 @@ unnamed - + textLabel1_2 @@ -41,7 +41,7 @@ Auto-hide hints after: - + Do Not Auto-Hide Hints @@ -73,7 +73,7 @@ - + groupBox3 @@ -84,15 +84,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -103,7 +103,7 @@ cboxTranslation - + cboxTranslation @@ -112,15 +112,15 @@ - + - layout2 + tqlayout2 unnamed - + kcfg_useStandardFonts @@ -134,7 +134,7 @@ Uses a standard font for the chalkboard/interface. - + getFontsButton @@ -144,7 +144,7 @@ - + kcfg_useSounds @@ -165,7 +165,7 @@ Expanding - + 16 16 @@ -178,5 +178,5 @@ kcfg_hintHideTime kcfg_useSounds - + diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp index 7c72f938..d437f953 100644 --- a/kanagram/src/newstuff.cpp +++ b/kanagram/src/newstuff.cpp @@ -11,7 +11,7 @@ #include "kanagramsettings.h" #include "newstuffdialog.h" -NewStuff::NewStuff(TQWidget *parent) : NewStuffWidget(parent) +NewStuff::NewStuff(TQWidget *tqparent) : NewStuffWidget(tqparent) { connect(btnGetNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewVocabs())); } diff --git a/kanagram/src/newstuff.h b/kanagram/src/newstuff.h index cad963f7..880f5e7d 100644 --- a/kanagram/src/newstuff.h +++ b/kanagram/src/newstuff.h @@ -6,8 +6,9 @@ class NewStuff : public NewStuffWidget { Q_OBJECT + TQ_OBJECT public: - NewStuff(TQWidget *parent); + NewStuff(TQWidget *tqparent); ~NewStuff(); private slots: diff --git a/kanagram/src/newstuffwidget.ui b/kanagram/src/newstuffwidget.ui index f1b1bb23..d5670df2 100644 --- a/kanagram/src/newstuffwidget.ui +++ b/kanagram/src/newstuffwidget.ui @@ -1,10 +1,10 @@ NewStuffWidget - + NewStuffWidget - + 0 0 @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -41,14 +41,14 @@ the button to get new vocabulary files. Expanding - + 20 20 - + btnGetNew @@ -58,5 +58,5 @@ the button to get new vocabulary files. - + diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp index 46a81450..2315faa4 100644 --- a/kanagram/src/vocabedit.cpp +++ b/kanagram/src/vocabedit.cpp @@ -41,12 +41,12 @@ #include "kanagramsettings.h" -VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(parent), m_fileName("") +VocabEdit::VocabEdit(TQWidget *tqparent, TQString fileName) : VocabEditWidget(tqparent), m_fileName("") { if(fileName != "") { m_fileName = fileName; - KEduVocDocument *doc = new KEduVocDocument(this); + KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); doc->open(KURL(m_fileName), false); for(int i = 0; i < doc->numEntries(); i++) { @@ -83,7 +83,7 @@ VocabEdit::~VocabEdit() void VocabEdit::slotSave() { - KEduVocDocument *doc = new KEduVocDocument(this); + KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); doc->setTitle(txtVocabName->text()); doc->setDocRemark(txtDescription->text()); for(uint i = 0; i < m_vocabList.size(); i++) @@ -94,15 +94,15 @@ void VocabEdit::slotSave() TQString fileName; if(m_fileName == "") { - fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().replace(" ", "") + ".kvtml"; + fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().tqreplace(" ", "") + ".kvtml"; } else { fileName = m_fileName; } - doc->saveAs(this, KURL(fileName), KEduVocDocument::automatic, "kanagram"); + doc->saveAs(TQT_TQOBJECT(this), KURL(fileName), KEduVocDocument::automatic, "kanagram"); - VocabSettings *settings = (VocabSettings*)this->parentWidget(); + VocabSettings *settings = (VocabSettings*)this->tqparentWidget(); settings->refreshView(); if(m_textChanged) diff --git a/kanagram/src/vocabedit.h b/kanagram/src/vocabedit.h index d4e84238..99b0e868 100644 --- a/kanagram/src/vocabedit.h +++ b/kanagram/src/vocabedit.h @@ -32,9 +32,10 @@ class KEduVocExpression; class VocabEdit : public VocabEditWidget { Q_OBJECT + TQ_OBJECT public: - VocabEdit(TQWidget *parent); - VocabEdit(TQWidget *parent, TQString fileName); + VocabEdit(TQWidget *tqparent); + VocabEdit(TQWidget *tqparent, TQString fileName); ~VocabEdit(); public slots: diff --git a/kanagram/src/vocabeditwidget.ui b/kanagram/src/vocabeditwidget.ui index d4d1229d..c80f8ba8 100644 --- a/kanagram/src/vocabeditwidget.ui +++ b/kanagram/src/vocabeditwidget.ui @@ -1,10 +1,10 @@ VocabEditWidget - + VocabEditWidget - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout7 + tqlayout7 unnamed - + - layout6 + tqlayout6 unnamed - + btnSave @@ -43,7 +43,7 @@ Save - + btnClose @@ -53,23 +53,23 @@ - + - layout8 + tqlayout8 unnamed - + - layout5 + tqlayout5 unnamed - + textLabel2 @@ -80,15 +80,15 @@ txtDescription - The description of the vocabulary. If you're creating a new vocabulary, add a description so that users of your vocabulary will know what kinds of words it contains. + The description of the vocabulary. If you're creating a new vocabulary, add a description so that users of your vocabulary will know what kinds of words it tqcontains. - + txtVocabName - + textLabel1 @@ -102,30 +102,30 @@ The name of the vocabulary you are editing. - + txtDescription - + - layout7 + tqlayout7 unnamed - + - layout6 + tqlayout6 unnamed - + btnRemoveWord @@ -136,7 +136,7 @@ Removes the selected word. - + btnNewWord @@ -149,7 +149,7 @@ - + lboxWords @@ -159,15 +159,15 @@ - + - layout4 + tqlayout4 unnamed - + textLabel3 @@ -181,17 +181,17 @@ The selected word. This box allows you to edit the selected word. - + txtHint - + txtWord - + textLabel4 @@ -224,5 +224,5 @@ btnClose lboxWords - + diff --git a/kanagram/src/vocabsettings.cpp b/kanagram/src/vocabsettings.cpp index 730f9216..97d05162 100644 --- a/kanagram/src/vocabsettings.cpp +++ b/kanagram/src/vocabsettings.cpp @@ -16,7 +16,7 @@ #include "keduvocdocument.h" #include "kanagramsettings.h" -VocabSettings::VocabSettings(TQWidget *parent) : VocabSettingsWidget(parent) +VocabSettings::VocabSettings(TQWidget *tqparent) : VocabSettingsWidget(tqparent) { connect(btnCreateNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNew())); connect(btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit())); @@ -37,7 +37,7 @@ void VocabSettings::refreshView() m_fileList = KGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml"); for(uint i = 0; i < m_fileList.size(); i++) { - KEduVocDocument *doc = new KEduVocDocument(this); + KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); doc->open(KURL(m_fileList[i]), false); TQListViewItem *item = new TQListViewItem(lviewVocab, 0); item->setText( 0, doc->getTitle() ); diff --git a/kanagram/src/vocabsettings.h b/kanagram/src/vocabsettings.h index 7b86720f..a2e30c1d 100644 --- a/kanagram/src/vocabsettings.h +++ b/kanagram/src/vocabsettings.h @@ -6,8 +6,9 @@ class VocabSettings : public VocabSettingsWidget { Q_OBJECT + TQ_OBJECT public: - VocabSettings(TQWidget *parent); + VocabSettings(TQWidget *tqparent); ~VocabSettings(); void refreshView(); diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui index b329da4e..8a6c988e 100644 --- a/kanagram/src/vocabsettingswidget.ui +++ b/kanagram/src/vocabsettingswidget.ui @@ -1,10 +1,10 @@ VocabSettingsWidget - + VocabSettingsWidget - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout3 + tqlayout3 unnamed - + - layout1 + tqlayout1 unnamed - + btnCreateNew @@ -46,7 +46,7 @@ Creates a new vocabulary. - + btnEdit @@ -57,7 +57,7 @@ Edits the selected vocabulary. - + btnDelete @@ -70,7 +70,7 @@ - + Title @@ -110,8 +110,8 @@ - + createNew() - - + + diff --git a/kbruch/ChangeLog b/kbruch/ChangeLog index 688ef69f..be301b7b 100644 --- a/kbruch/ChangeLog +++ b/kbruch/ChangeLog @@ -1,6 +1,6 @@ 2003-04-28 Sebastian Stein - * fixed layout problem with help of Dominique Devries + * fixed tqlayout problem with help of Dominique Devries * compiler warnings () removed by Dominique Devries @@ -10,7 +10,7 @@ 2003-04-24 Sebastian Stein - * experiments with the layout problem, but found no solution + * experiments with the tqlayout problem, but found no solution * removed #define TRUE, used type bool instead diff --git a/kbruch/src/exercisebase.cpp b/kbruch/src/exercisebase.cpp index 649bb6c8..f7be0fdc 100644 --- a/kbruch/src/exercisebase.cpp +++ b/kbruch/src/exercisebase.cpp @@ -25,8 +25,8 @@ /* ----- public member functions ----- */ /* constructor */ -ExerciseBase::ExerciseBase(TQWidget * parent, const char * name): - TQWidget(parent, name) +ExerciseBase::ExerciseBase(TQWidget * tqparent, const char * name): + TQWidget(tqparent, name) { #ifdef DEBUG kdDebug() << "constructor ExerciseBase()" << endl; diff --git a/kbruch/src/exercisebase.h b/kbruch/src/exercisebase.h index 87fe03b5..cd0428d9 100644 --- a/kbruch/src/exercisebase.h +++ b/kbruch/src/exercisebase.h @@ -33,13 +33,14 @@ * * \author Sebastian Stein * */ -class ExerciseBase : public QWidget +class ExerciseBase : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** constructor */ - ExerciseBase(TQWidget * parent = 0, const char * name = 0); + ExerciseBase(TQWidget * tqparent = 0, const char * name = 0); /** destructor */ ~ExerciseBase(); diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp index f6652e56..295698fb 100644 --- a/kbruch/src/exercisecompare.cpp +++ b/kbruch/src/exercisecompare.cpp @@ -22,7 +22,7 @@ #include #include -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include #include #include @@ -35,8 +35,8 @@ /* ----- public member functions ----- */ /* constructor */ -ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name): - ExerciseBase(parent, name) +ExerciseCompare::ExerciseCompare(TQWidget * tqparent, const char * name): + ExerciseBase(tqparent, name) { #ifdef DEBUG kdDebug() << "constructor ExerciseCompare()" << endl; @@ -123,13 +123,13 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name): m_checkButton->setText(i18n("&Check Task")); m_checkButton->setDefault(true); // is the default button of the dialog TQToolTip::add(m_checkButton, i18n("Click on this button to check your result.")); - lowerHBox->addWidget(m_checkButton, 1, Qt::AlignRight); + lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight); TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); // that the user can start typing without moving the focus m_signButton->setFocus(); - // show the whole layout + // show the whole tqlayout baseWidget->show(); // add tooltip and qwhatsthis help to the widget @@ -144,7 +144,7 @@ ExerciseCompare::~ExerciseCompare() kdDebug() << "destructor ExerciseCompare()" << endl; #endif - /* no need to delete any child widgets, Qt does it by itself */ + /* no need to delete any child widgets, TQt does it by itself */ } /** resets the current state, creates a new task and count the last task as @@ -300,10 +300,10 @@ void ExerciseCompare::slotCheckButtonClicked() void ExerciseCompare::slotSignButtonClicked() { // in RTL desktops, we still need to allign the - // execise to the left. On Qt4, you can set the direction - // of the layout to LTR (instead of inherit), but on Qt3 + // execise to the left. On TQt4, you can set the direction + // of the tqlayout to LTR (instead of inherit), but on TQt3 // the only way of fixing it is inserting the widgets in reversed - // order to the layout. + // order to the tqlayout. // // But... as an ugly hack, we can also display the "other" operation // thats damm ugly, but will work as well :) diff --git a/kbruch/src/exercisecompare.h b/kbruch/src/exercisecompare.h index 6ae8a4e5..bb944a8c 100644 --- a/kbruch/src/exercisecompare.h +++ b/kbruch/src/exercisecompare.h @@ -45,10 +45,11 @@ class TQVBoxLayout; class ExerciseCompare : public ExerciseBase { Q_OBJECT + TQ_OBJECT public: /** constructor */ - ExerciseCompare(TQWidget * parent = 0, const char * name = 0); + ExerciseCompare(TQWidget * tqparent = 0, const char * name = 0); /** destructor */ ~ExerciseCompare(); diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp index 967c960d..6112db90 100644 --- a/kbruch/src/exerciseconvert.cpp +++ b/kbruch/src/exerciseconvert.cpp @@ -24,7 +24,7 @@ #include #include -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include #include #include @@ -41,8 +41,8 @@ /* ----- public member functions ----- */ /* constructor */ -ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): - ExerciseBase(parent, name) +ExerciseConvert::ExerciseConvert(TQWidget * tqparent, const char * name): + ExerciseBase(tqparent, name) { #ifdef DEBUG kdDebug() << "constructor ExerciseConvert()" << endl; @@ -119,10 +119,10 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): // --- that is the end of the horizontal line --- // in RTL desktops, we still need to allign the - // execise to the left. On Qt4, you can set the direction - // of the layout to LTR (instead of inherit), but on Qt3 + // execise to the left. On TQt4, you can set the direction + // of the tqlayout to LTR (instead of inherit), but on TQt3 // the only way of fixing it is inserting the widgets in reversed - // order to the layout. + // order to the tqlayout. // // if you need help with this feel free to contact me - Diego ) // This should fix parts of bug #116831 @@ -157,13 +157,13 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): m_checkButton->setText(i18n("&Check Task")); m_checkButton->setDefault(true); // is the default button of the dialog TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet.")); - lowerHBox->addWidget(m_checkButton, 1, Qt::AlignRight); + lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight); TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); // that the user can start typing without moving the focus numer_edit->setFocus(); - // show the whole layout + // show the whole tqlayout baseWidget->show(); // add tooltip and qwhatsthis help to the widget @@ -178,7 +178,7 @@ ExerciseConvert::~ExerciseConvert() kdDebug() << "destructor ExerciseConvert()" << endl; #endif - /* no need to delete any child widgets, Qt does it by itself */ + /* no need to delete any child widgets, TQt does it by itself */ } /** resets the current state, creates a new task and count the last task as diff --git a/kbruch/src/exerciseconvert.h b/kbruch/src/exerciseconvert.h index fcd733ec..9d7413cd 100644 --- a/kbruch/src/exerciseconvert.h +++ b/kbruch/src/exerciseconvert.h @@ -43,10 +43,11 @@ class TQVBoxLayout; class ExerciseConvert : public ExerciseBase { Q_OBJECT + TQ_OBJECT public: /** constructor */ - ExerciseConvert(TQWidget * parent = 0, const char * name = 0); + ExerciseConvert(TQWidget * tqparent = 0, const char * name = 0); /** destructor */ ~ExerciseConvert(); diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp index 3a2d64dd..30c09de7 100644 --- a/kbruch/src/exercisefactorize.cpp +++ b/kbruch/src/exercisefactorize.cpp @@ -24,7 +24,7 @@ #include #include -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include #include #include @@ -44,8 +44,8 @@ /* ----- public member functions ----- */ /* constructor */ -ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name): - ExerciseBase(parent, name) +ExerciseFactorize::ExerciseFactorize(TQWidget * tqparent, const char * name): + ExerciseBase(tqparent, name) { TQPalette pal; TQColorGroup cg; @@ -64,40 +64,40 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name): Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout"); - layout9 = new TQVBoxLayout( 0, 0, 6, "layout9"); + tqlayout9 = new TQVBoxLayout( 0, 0, 6, "tqlayout9"); // The following method fix the problem in // bug #116831, reverse order in RTL desktops. // Amit Ramon amit.ramon@kdemail.net - layout4 = createFactorsLayout(); - layout9->addLayout(layout4); + tqlayout4 = createFactorsLayout(); + tqlayout9->addLayout(tqlayout4); spacer2 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - layout9->addItem( spacer2 ); + tqlayout9->addItem( spacer2 ); - layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); + tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); // The following method fix the problem in // bug #116831, reverse order in RTL desktops. // Amit Ramon amit.ramon@kdemail.net - layout1 = createButtonsLayout(); - layout2->addLayout(layout1); + tqlayout1 = createButtonsLayout(); + tqlayout2->addLayout(tqlayout1); m_removeLastFactorButton = new TQPushButton( this, "m_removeLastFactorButton" ); - layout2->addWidget( m_removeLastFactorButton ); - layout9->addLayout( layout2 ); + tqlayout2->addWidget( m_removeLastFactorButton ); + tqlayout9->addLayout( tqlayout2 ); spacer4 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - layout9->addItem( spacer4 ); + tqlayout9->addItem( spacer4 ); - layout7 = new TQHBoxLayout( 0, 0, 6, "layout7"); + tqlayout7 = new TQHBoxLayout( 0, 0, 6, "tqlayout7"); spacer3 = new TQSpacerItem( 361, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - layout7->addItem( spacer3 ); + tqlayout7->addItem( spacer3 ); m_checkButton = new TQPushButton( this, "m_checkButton" ); - layout7->addWidget( m_checkButton ); - layout9->addLayout( layout7 ); - Form1Layout->addLayout( layout9 ); + tqlayout7->addWidget( m_checkButton ); + tqlayout9->addLayout( tqlayout7 ); + Form1Layout->addLayout( tqlayout9 ); // the current task TQString tmp_str; @@ -181,7 +181,7 @@ ExerciseFactorize::~ExerciseFactorize() kdDebug() << "destructor ExerciseFactorize()" << endl; #endif - /* no need to delete any child widgets, Qt does it by itself */ + /* no need to delete any child widgets, TQt does it by itself */ } /** resets the current state, creates a new task and count the last task as @@ -228,16 +228,16 @@ void ExerciseFactorize::update() // // The following method was added to fix -// bug #116831 (reverse layout in RTL desktops) +// bug #116831 (reverse tqlayout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // -/** Create the layout that hold the exercise widgets +/** Create the tqlayout that hold the exercise widgets */ TQHBoxLayout* ExerciseFactorize::createFactorsLayout() { // first create all widgets - TQHBoxLayout* layout = new TQHBoxLayout( 0, 0, 6, "layout4"); + TQHBoxLayout* tqlayout = new TQHBoxLayout( 0, 0, 6, "tqlayout4"); m_taskLabel = new TQLabel( this, "m_taskLabel" ); @@ -258,46 +258,46 @@ TQHBoxLayout* ExerciseFactorize::createFactorsLayout() spacer1 = new TQSpacerItem( 25, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - // now add the widgets to the layout. + // now add the widgets to the tqlayout. // if we are in a RTL desktop, add them // in a reverse order if (TQApplication::reverseLayout()) { - layout->addItem( spacer1 ); - layout->addWidget( result_label ); - layout->addWidget( m_factorsWidget ); - layout->addWidget( m_factorsEnteredEdit ); - layout->addWidget( m_equalSignLabel ); - layout->addWidget( m_taskLabel ); + tqlayout->addItem( spacer1 ); + tqlayout->addWidget( result_label ); + tqlayout->addWidget( m_factorsWidget ); + tqlayout->addWidget( m_factorsEnteredEdit ); + tqlayout->addWidget( m_equalSignLabel ); + tqlayout->addWidget( m_taskLabel ); } else { - layout->addWidget( m_taskLabel ); - layout->addWidget( m_equalSignLabel ); - layout->addWidget( m_factorsEnteredEdit ); - layout->addWidget( m_factorsWidget ); - layout->addWidget( result_label ); - layout->addItem( spacer1 ); + tqlayout->addWidget( m_taskLabel ); + tqlayout->addWidget( m_equalSignLabel ); + tqlayout->addWidget( m_factorsEnteredEdit ); + tqlayout->addWidget( m_factorsWidget ); + tqlayout->addWidget( result_label ); + tqlayout->addItem( spacer1 ); } - return layout; + return tqlayout; } // // The following method was added to fix -// bug #116831 (reverse layout in RTL desktops) +// bug #116831 (reverse tqlayout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // -/** Create the layout that hold the exercise widgets +/** Create the tqlayout that hold the exercise widgets */ TQGridLayout* ExerciseFactorize::createButtonsLayout() { const int _COLS = 4; // number of buttons in each row const int _ROWS = 2; // number of rows - TQGridLayout* layout = new TQGridLayout( 0, 1, 1, 0, 6, "layout1"); + TQGridLayout* tqlayout = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout1"); // first row buttons m_factor2Button = new TQPushButton( this, "m_factor2Button" ); @@ -348,12 +348,12 @@ TQGridLayout* ExerciseFactorize::createButtonsLayout() for (int col = 0; col < _COLS; col++) { - layout->addWidget(buttons[row][buttonIdx], row, col ); + tqlayout->addWidget(buttons[row][buttonIdx], row, col ); buttonIdx += step; } } - return layout; + return tqlayout; } diff --git a/kbruch/src/exercisefactorize.h b/kbruch/src/exercisefactorize.h index 41a89066..0e36d016 100644 --- a/kbruch/src/exercisefactorize.h +++ b/kbruch/src/exercisefactorize.h @@ -60,10 +60,11 @@ const uint possibleTasks[numberPossibleTasks] = {4, 6, 8, 9, 10, 12, 14, 15, 16, class ExerciseFactorize : public ExerciseBase { Q_OBJECT + TQ_OBJECT public: /** constructor */ - ExerciseFactorize(TQWidget * parent = 0, const char * name = 0); + ExerciseFactorize(TQWidget * tqparent = 0, const char * name = 0); /** destructor */ ~ExerciseFactorize(); @@ -115,14 +116,14 @@ private: // // the following two methods were added to fix - // bug #116831 (reverse layout in RTL desktops) + // bug #116831 (reverse tqlayout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // - /** create the factor widgets layout */ + /** create the factor widgets tqlayout */ TQHBoxLayout* createFactorsLayout(); - /** create the (answer) buttons layout */ + /** create the (answer) buttons tqlayout */ TQGridLayout* createButtonsLayout(); @@ -135,14 +136,14 @@ private: protected: TQVBoxLayout* Form1Layout; - TQVBoxLayout* layout9; + TQVBoxLayout* tqlayout9; TQSpacerItem* spacer4; - TQHBoxLayout* layout4; + TQHBoxLayout* tqlayout4; TQSpacerItem* spacer1; TQSpacerItem* spacer2; - TQVBoxLayout* layout2; - TQGridLayout* layout1; - TQHBoxLayout* layout7; + TQVBoxLayout* tqlayout2; + TQGridLayout* tqlayout1; + TQHBoxLayout* tqlayout7; TQSpacerItem* spacer3; private slots: diff --git a/kbruch/src/factorizedwidget.cpp b/kbruch/src/factorizedwidget.cpp index c6501d4e..4a106a0f 100644 --- a/kbruch/src/factorizedwidget.cpp +++ b/kbruch/src/factorizedwidget.cpp @@ -18,11 +18,11 @@ #include "factorizedwidget.h" #include "factorizedwidget.moc" -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include -FactorizedWidget::FactorizedWidget(TQWidget * parent, const char * name, const uintList para_factors) : - FractionBaseWidget(parent, name), m_factors(para_factors) +FactorizedWidget::FactorizedWidget(TQWidget * tqparent, const char * name, const uintList para_factors) : + FractionBaseWidget(tqparent, name), m_factors(para_factors) { #ifdef DEBUG kdDebug() << "constructor FactorizedWidget" << endl; @@ -57,7 +57,7 @@ void FactorizedWidget::paintEvent(TQPaintEvent* /* p_paintEvent */) paint.setFont(m_font); // set the pen for painting - TQPen pen(Qt::SolidLine); + TQPen pen(TQt::SolidLine); pen.setWidth(0); paint.setPen(pen); diff --git a/kbruch/src/factorizedwidget.h b/kbruch/src/factorizedwidget.h index 0ed79511..6c9f7bdf 100644 --- a/kbruch/src/factorizedwidget.h +++ b/kbruch/src/factorizedwidget.h @@ -35,10 +35,11 @@ typedef TQValueList uintList; class FactorizedWidget : public FractionBaseWidget { Q_OBJECT + TQ_OBJECT public: /** constructor */ - FactorizedWidget(TQWidget * parent, const char * name, const uintList para_factors); + FactorizedWidget(TQWidget * tqparent, const char * name, const uintList para_factors); /** destructor */ ~FactorizedWidget(); diff --git a/kbruch/src/fractionbasewidget.cpp b/kbruch/src/fractionbasewidget.cpp index 07f60c84..0e1d4d0b 100644 --- a/kbruch/src/fractionbasewidget.cpp +++ b/kbruch/src/fractionbasewidget.cpp @@ -21,13 +21,13 @@ /* these includes are needed for KDE support */ #include -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include #include "settingsclass.h" -FractionBaseWidget::FractionBaseWidget(TQWidget * parent = 0, const char * name = 0) : - TQWidget(parent, name) +FractionBaseWidget::FractionBaseWidget(TQWidget * tqparent = 0, const char * name = 0) : + TQWidget(tqparent, name) { #ifdef DEBUG kdDebug() << "constructor FractionBaseWidget" << endl; @@ -68,14 +68,14 @@ void FractionBaseWidget::paintRatio(TQPainter & paint, ratio tmp_ratio, int & x_ // 5 5 int_numerator = tmp_ratio.numerator(); int_denominator = tmp_ratio.denominator(); - if (show_mixed == true && QABS(int_numerator) >= QABS(int_denominator)) + if (show_mixed == true && TQABS(int_numerator) >= TQABS(int_denominator)) { // calculate the mixed number int_mixed = int(int_numerator / int_denominator); // the negative sign is in front of the mixed number - int_numerator = QABS(int_numerator); - int_denominator = QABS(int_denominator); + int_numerator = TQABS(int_numerator); + int_denominator = TQABS(int_denominator); // we have to reduce the numerator by the mixed number * denominator int_numerator = int_numerator % int_denominator; @@ -92,7 +92,7 @@ void FractionBaseWidget::paintRatio(TQPainter & paint, ratio tmp_ratio, int & x_ // don't show the ratio as mixed number str_numerator.setNum(int_numerator); str_denominator.setNum(int_denominator); - } // if (show_mixed == true && QABS(int_numerator) > QABS(int_denominator)) + } // if (show_mixed == true && TQABS(int_numerator) > TQABS(int_denominator)) // get the text width of the current ratio fontWidth = fm.width(str_numerator); @@ -161,7 +161,7 @@ void FractionBaseWidget::setColorAndFont() /* set font */ m_font = SettingsClass::taskFont(); - // repaint + // tqrepaint update(); return; diff --git a/kbruch/src/fractionbasewidget.h b/kbruch/src/fractionbasewidget.h index 21b2fdc8..942c2780 100644 --- a/kbruch/src/fractionbasewidget.h +++ b/kbruch/src/fractionbasewidget.h @@ -33,18 +33,19 @@ /*! base class for painting fractions * * \author Sebastian Stein */ -class FractionBaseWidget : public QWidget +class FractionBaseWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** constructor */ - FractionBaseWidget(TQWidget * parent, const char * name); + FractionBaseWidget(TQWidget * tqparent, const char * name); /** destructor */ ~FractionBaseWidget(); - /** updates the widget by first getting the settings and then repainting */ + /** updates the widget by first getting the settings and then tqrepainting */ void updateAndRepaint(); protected: diff --git a/kbruch/src/kbruch.cpp b/kbruch/src/kbruch.cpp index df74101e..aaca2b02 100644 --- a/kbruch/src/kbruch.cpp +++ b/kbruch/src/kbruch.cpp @@ -23,7 +23,7 @@ #include #include -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include #include #include @@ -48,10 +48,10 @@ int main(int argc, char * argv[]) KApplication kbruch; - MainQtWidget * kbruchApp = new MainQtWidget(); + MainTQtWidget * kbruchApp = new MainTQtWidget(); kbruch.setMainWidget(kbruchApp); kbruchApp->show(); - /* lets execute the Qt GUI; it will handle all cmd options which are left */ + /* lets execute the TQt GUI; it will handle all cmd options which are left */ return kbruch.exec(); } diff --git a/kbruch/src/kbruch.h b/kbruch/src/kbruch.h index e0f5ca0e..a79dccb5 100644 --- a/kbruch/src/kbruch.h +++ b/kbruch/src/kbruch.h @@ -31,7 +31,7 @@ static const char description[] = I18N_NOOP("KBruch"); -class MainQtWidget; +class MainTQtWidget; class task; class ratio; class primzahl; diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index 3ac59d46..7212f56a 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - mainqtwidget.cpp - The main Qt/KDE window + mainqtwidget.cpp - The main TQt/KDE window ------------------- begin : Tue Mar 16 00:00:00 CET 2003 copyright : (C) 2003-2004 by Sebastian Stein @@ -46,10 +46,10 @@ /* ------ public member functions ------ */ -MainQtWidget::MainQtWidget() +MainTQtWidget::MainTQtWidget() { #ifdef DEBUG - kdDebug() << "constructor MainQtWidget" << endl; + kdDebug() << "constructor MainTQtWidget" << endl; #endif // get the settings @@ -62,7 +62,7 @@ MainQtWidget::MainQtWidget() // we split the main view into 2 parts, one for the tasks, one for the // statistics - TQSplitter* splitter = new TQSplitter(TQSplitter::Horizontal, this,"TQSplitter"); + TQSplitter* splitter = new TQSplitter(Qt::Horizontal, this,TQSPLITTER_OBJECT_NAME_STRING); setCentralWidget(splitter); // the iconlist, where the user can choose the different exercises @@ -109,21 +109,21 @@ MainQtWidget::MainQtWidget() #if (KDE_VERSION_MINOR>=3) && (KDE_VERSION_MAJOR>=3) #else - resize(TQSize(QMAX(toolBar()->sizeHint().width(), sizeHint().width()), sizeHint().height())); + resize(TQSize(TQMAX(toolBar()->tqsizeHint().width(), tqsizeHint().width()), tqsizeHint().height())); #endif // now show the last exercise m_exercises->showPage(SettingsClass::activeExercise()); slotAboutToShowPage(m_exercises->pageWidget(m_exercises->activePageIndex())); } -MainQtWidget::~MainQtWidget() +MainTQtWidget::~MainTQtWidget() { } /* ------ private member functions ------ */ -void MainQtWidget::readOptions() +void MainTQtWidget::readOptions() { m_addSub = SettingsClass::addsub(); m_mulDiv = SettingsClass::muldiv(); @@ -138,7 +138,7 @@ void MainQtWidget::readOptions() } } -void MainQtWidget::writeOptions() +void MainTQtWidget::writeOptions() { SettingsClass::setActiveExercise(m_exercises->activePageIndex()); @@ -151,23 +151,23 @@ void MainQtWidget::writeOptions() SettingsClass::writeConfig(); } -void MainQtWidget::setupActions() +void MainTQtWidget::setupActions() { // new task action m_NewTaskAction = new KAction(i18n("&New"), "filenew", KStdAccel::shortcut(KStdAccel::New), - this, TQT_SLOT(NewTask()), + TQT_TQOBJECT(this), TQT_SLOT(NewTask()), actionCollection(), "NewTask"); // quit action - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); // - KStdAction::preferences(this, TQT_SLOT( slotPrefs() ), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPrefs() ), actionCollection()); // a label just describing the Number of terms ComboBox m_NrOfTermsLabel = new TQLabel(i18n("Terms:"), 0, "kde toolbar widget"); m_NrOfTermsLabelAction = new KWidgetAction(m_NrOfTermsLabel, i18n("Terms:"), ALT+Key_E, - this, TQT_SLOT(NrOfTermsBoxSlot()), + TQT_TQOBJECT(this), TQT_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsLabelAction"); // the ComboBox holding possible values for term number @@ -179,15 +179,15 @@ void MainQtWidget::setupActions() m_NrOfTermsBox->setCurrentItem(m_nrRatios - 2); TQToolTip::add( m_NrOfTermsBox, i18n( "The number of terms you want" ) ); TQWhatsThis::add( m_NrOfTermsBox, i18n( "Choose the number of terms (2, 3, 4 or 5) you want for calculating fractions." ) ); - m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, this, TQT_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction"); + m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, TQT_TQOBJECT(this), TQT_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction"); // now connect the ComboBox's signal textChanged() to the slot function - TQObject::connect(m_NrOfTermsBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(NrOfTermsBoxSlot())); + TQObject::connect(m_NrOfTermsBox, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(NrOfTermsBoxSlot())); // a label just describing the max. main denominator ComboBox m_MaxMainDenominatorLabel = new TQLabel(i18n("Max. main denominator:"), 0, "kde toolbar widget"); m_MaxMainDenominatorLabelAction = new KWidgetAction(m_MaxMainDenominatorLabel, i18n("Max. main denominator:"), ALT+Key_D, - this, TQT_SLOT(MaxMainDenominatorBoxSlot()), + TQT_TQOBJECT(this), TQT_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorLabelAction"); // the ComboBox holding possible values for the max. main denominator @@ -209,7 +209,7 @@ void MainQtWidget::setupActions() case 50 : m_MaxMainDenominatorBox->setCurrentItem(3); break; } - m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, this, TQT_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction"); + m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, TQT_TQOBJECT(this), TQT_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction"); // now connect the ComboBox's signal textChanged() to the slot function TQObject::connect(m_MaxMainDenominatorBox, TQT_SIGNAL(activated(int)), @@ -218,7 +218,7 @@ void MainQtWidget::setupActions() // a label just describing the operation ComboBox m_OperationLabel = new TQLabel(i18n("Operations:"), 0, "kde toolbar widget"); m_OperationLabelAction = new KWidgetAction(m_OperationLabel, i18n("Operations:"), ALT+Key_O, - this, TQT_SLOT(OperationBoxSlot()), + TQT_TQOBJECT(this), TQT_SLOT(OperationBoxSlot()), actionCollection(), "OperationLabelAction"); // the ComboBox holding possible combinations for operations @@ -236,14 +236,14 @@ void MainQtWidget::setupActions() } TQToolTip::add( m_OperationBox, i18n( "The operations you want" ) ); TQWhatsThis::add( m_OperationBox, i18n( "Choose the type of operations you want for calculating fractions: Addition/Substraction, Multiplication/Division or All Operations Mixed. If you choose All Operations Mixed, the program will randomly choose addition, substraction, multiplication and/or division." ) ); - m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, this, TQT_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction"); + m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, TQT_TQOBJECT(this), TQT_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction"); // now connect the ComboBox's signal textChanged() to the slot function TQObject::connect(m_OperationBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OperationBoxSlot())); #if (KDE_VERSION_MINOR>=3) && (KDE_VERSION_MAJOR>=3) if (!initialGeometrySet()) - resize( TQSize(725, 330).expandedTo(minimumSizeHint())); + resize( TQSize(725, 330).expandedTo(tqminimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); #endif @@ -252,10 +252,10 @@ void MainQtWidget::setupActions() /* ------ private slots ------ */ -void MainQtWidget::NewTask() +void MainTQtWidget::NewTask() { #ifdef DEBUG - kdDebug() << "NewTask MainQtWidget" << endl; + kdDebug() << "NewTask MainTQtWidget" << endl; kdDebug() << "pageIndex(m_taskview): " << m_exercises->pageIndex(m_taskview) << endl; kdDebug() << "pageIndex(m_exerciseCompare): " << m_exercises->pageIndex(m_exerciseCompare) << endl; kdDebug() << "pageIndex(m_exerciseConvert): " << m_exercises->pageIndex(m_exerciseConvert) << endl; @@ -307,10 +307,10 @@ void MainQtWidget::NewTask() return; } -void MainQtWidget::NrOfTermsBoxSlot() +void MainTQtWidget::NrOfTermsBoxSlot() { #ifdef DEBUG - kdDebug() << "MainQtWidget::NrOfTermsBoxSlot()" << endl; + kdDebug() << "MainTQtWidget::NrOfTermsBoxSlot()" << endl; #endif TQString curr_nr = m_NrOfTermsBox->currentText(); m_MaxMainDenominatorBox->clear(); @@ -363,10 +363,10 @@ void MainQtWidget::NrOfTermsBoxSlot() (void) m_taskview->setTaskParameters(m_addSub, m_mulDiv, m_nrRatios, m_maxMainDenominator); } -void MainQtWidget::MaxMainDenominatorBoxSlot() +void MainTQtWidget::MaxMainDenominatorBoxSlot() { #ifdef DEBUG - kdDebug() << "MainQtWidget::MaxMainDenominatorBoxSlot()" << endl; + kdDebug() << "MainTQtWidget::MaxMainDenominatorBoxSlot()" << endl; #endif // get the max. size from the ComboBox, convert it to a number and store @@ -378,10 +378,10 @@ void MainQtWidget::MaxMainDenominatorBoxSlot() (void) m_taskview->setTaskParameters(m_addSub, m_mulDiv, m_nrRatios, m_maxMainDenominator); } -void MainQtWidget::OperationBoxSlot() +void MainTQtWidget::OperationBoxSlot() { #ifdef DEBUG - kdDebug() << "MainQtWidget::OperationBoxSlot()" << endl; + kdDebug() << "MainTQtWidget::OperationBoxSlot()" << endl; #endif int index = m_OperationBox->currentItem(); // get selected item @@ -413,7 +413,7 @@ void MainQtWidget::OperationBoxSlot() (void) m_taskview->setTaskParameters(m_addSub, m_mulDiv, m_nrRatios, m_maxMainDenominator); } -void MainQtWidget::slotPrefs() +void MainTQtWidget::slotPrefs() { // do not show dialog twice if (KConfigDialog::showDialog("settings")) @@ -444,7 +444,7 @@ void MainQtWidget::slotPrefs() return; } -void MainQtWidget::slotApplySettings() +void MainTQtWidget::slotApplySettings() { // update the task view m_taskview->update(); @@ -455,10 +455,10 @@ void MainQtWidget::slotApplySettings() return; } -void MainQtWidget::slotAboutToShowPage(TQWidget * page) +void MainTQtWidget::slotAboutToShowPage(TQWidget * page) { #ifdef DEBUG - kdDebug() << "slotAboutToShowPage MainQtWidget" << endl; + kdDebug() << "slotAboutToShowPage MainTQtWidget" << endl; kdDebug() << "pageIndex(m_taskview): " << m_exercises->pageIndex(m_taskview) << endl; kdDebug() << "pageIndex(m_exerciseCompare): " << m_exercises->pageIndex(m_exerciseCompare) << endl; kdDebug() << "pageIndex(m_exerciseConvert): " << m_exercises->pageIndex(m_exerciseConvert) << endl; @@ -480,7 +480,7 @@ void MainQtWidget::slotAboutToShowPage(TQWidget * page) return; } -bool MainQtWidget::queryExit() +bool MainTQtWidget::queryExit() { writeOptions(); return true; diff --git a/kbruch/src/mainqtwidget.h b/kbruch/src/mainqtwidget.h index 2ecb96f4..989a998e 100644 --- a/kbruch/src/mainqtwidget.h +++ b/kbruch/src/mainqtwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - mainqtwidget.h - The main Qt/KDE window + mainqtwidget.h - The main TQt/KDE window ------------------- begin : Tue Mar 16 00:00:00 CET 2003 copyright : (C) 2003-2004 by Sebastian Stein @@ -14,8 +14,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef MAINQTWIDGET_H -#define MAINQTWIDGET_H +#ifndef MAINTQTWIDGET_H +#define MAINTQTWIDGET_H #include @@ -37,16 +37,17 @@ class TaskView; * \author Sebastian Stein * \author Eva Brucherseifer **/ -class MainQtWidget : public KMainWindow +class MainTQtWidget : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** constructor */ - MainQtWidget(); + MainTQtWidget(); /** destructor */ - ~MainQtWidget(); + ~MainTQtWidget(); private: /** read the config file */ @@ -142,4 +143,4 @@ class MainQtWidget : public KMainWindow bool queryExit(); }; -#endif // MainQtWidget +#endif // MainTQtWidget diff --git a/kbruch/src/ratio.cpp b/kbruch/src/ratio.cpp index e3a79a36..0ba1e1c4 100644 --- a/kbruch/src/ratio.cpp +++ b/kbruch/src/ratio.cpp @@ -192,9 +192,9 @@ bool ratio::operator==(ratio right) signed short orig_sign = 1, right_sign = 1; /* we do not check the presign at this point */ - if (QABS(m_numerator) != QABS(right.numerator())) + if (TQABS(m_numerator) != TQABS(right.numerator())) return false; - if (QABS(m_denominator) != QABS(right.denominator())) + if (TQABS(m_denominator) != TQABS(right.denominator())) return false; /* check if the signs of the ratios are equivalent */ diff --git a/kbruch/src/rationalwidget.cpp b/kbruch/src/rationalwidget.cpp index f930d882..d0d0d546 100644 --- a/kbruch/src/rationalwidget.cpp +++ b/kbruch/src/rationalwidget.cpp @@ -18,12 +18,12 @@ #include "rationalwidget.h" #include "rationalwidget.moc" -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include #include -RationalWidget::RationalWidget(TQWidget * parent, const char * name, const TQString pnumber, const uint pperiodStart, const uint pperiodLength): - FractionBaseWidget(parent, name), m_number(pnumber), +RationalWidget::RationalWidget(TQWidget * tqparent, const char * name, const TQString pnumber, const uint pperiodStart, const uint pperiodLength): + FractionBaseWidget(tqparent, name), m_number(pnumber), m_periodStart(pperiodStart), m_periodLength(pperiodLength) { #ifdef DEBUG @@ -64,7 +64,7 @@ void RationalWidget::paintEvent(TQPaintEvent* /* p_paintEvent */) paint.setFont(m_font); // set the pen for painting - TQPen pen(Qt::SolidLine); + TQPen pen(TQt::SolidLine); pen.setWidth(0); paint.setPen(pen); diff --git a/kbruch/src/rationalwidget.h b/kbruch/src/rationalwidget.h index f03598ba..cccae714 100644 --- a/kbruch/src/rationalwidget.h +++ b/kbruch/src/rationalwidget.h @@ -34,10 +34,11 @@ class TQString; class RationalWidget : public FractionBaseWidget { Q_OBJECT + TQ_OBJECT public: /** constructor */ - RationalWidget(TQWidget * parent, const char * name, const TQString pnumber, const uint pperiodStart = 1, const uint pperiodLength = 0); + RationalWidget(TQWidget * tqparent, const char * name, const TQString pnumber, const uint pperiodStart = 1, const uint pperiodLength = 0); /** destructor */ ~RationalWidget(); diff --git a/kbruch/src/ratiowidget.cpp b/kbruch/src/ratiowidget.cpp index 17f1cf04..ae92f09c 100644 --- a/kbruch/src/ratiowidget.cpp +++ b/kbruch/src/ratiowidget.cpp @@ -18,12 +18,12 @@ #include "ratiowidget.h" #include "ratiowidget.moc" -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include -RatioWidget::RatioWidget(TQWidget * parent = 0, const char * name = 0, +RatioWidget::RatioWidget(TQWidget * tqparent = 0, const char * name = 0, const ratio para_ratio = *new ratio()) : - FractionBaseWidget(parent, name), m_ratio(para_ratio) + FractionBaseWidget(tqparent, name), m_ratio(para_ratio) { #ifdef DEBUG kdDebug() << "constructor RatioWidget" << endl; @@ -56,7 +56,7 @@ void RatioWidget::paintEvent(TQPaintEvent* /* p_paintEvent */) paint.setFont(m_font); // set the pen for painting - TQPen pen(Qt::SolidLine); + TQPen pen(TQt::SolidLine); pen.setWidth(0); paint.setPen(pen); diff --git a/kbruch/src/ratiowidget.h b/kbruch/src/ratiowidget.h index 8a64d3d4..c861741d 100644 --- a/kbruch/src/ratiowidget.h +++ b/kbruch/src/ratiowidget.h @@ -33,10 +33,11 @@ class RatioWidget : public FractionBaseWidget { Q_OBJECT + TQ_OBJECT public: /** constructor */ - RatioWidget(TQWidget * parent, const char * name, const ratio para_ratio); + RatioWidget(TQWidget * tqparent, const char * name, const ratio para_ratio); /** destructor */ ~RatioWidget(); diff --git a/kbruch/src/resultwidget.cpp b/kbruch/src/resultwidget.cpp index 7f493408..853e73da 100644 --- a/kbruch/src/resultwidget.cpp +++ b/kbruch/src/resultwidget.cpp @@ -18,14 +18,14 @@ #include "resultwidget.h" #include "resultwidget.moc" -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include #include "settingsclass.h" -ResultWidget::ResultWidget(TQWidget * parent = 0, const char * name = 0, +ResultWidget::ResultWidget(TQWidget * tqparent = 0, const char * name = 0, const ratio para_result = *new ratio()) : - FractionBaseWidget(parent, name), m_result(para_result) + FractionBaseWidget(tqparent, name), m_result(para_result) { #ifdef DEBUG kdDebug() << "constructor ResultWidget" << endl; @@ -58,7 +58,7 @@ void ResultWidget::paintEvent(TQPaintEvent* /* p_paintEvent */) paint.setFont(m_font); // set the pen for painting - TQPen pen(Qt::SolidLine); + TQPen pen(TQt::SolidLine); pen.setWidth(0); paint.setPen(pen); @@ -73,7 +73,7 @@ void ResultWidget::paintEvent(TQPaintEvent* /* p_paintEvent */) paintMiddle(paint, TQString("="), old_x, fm, m_colorOperation); paintRatio(paint, m_result, old_x, fm, false); - if (SettingsClass::showSpecialRatioNotation() == true && QABS(m_result.numerator()) >= QABS(m_result.denominator())) + if (SettingsClass::showSpecialRatioNotation() == true && TQABS(m_result.numerator()) >= TQABS(m_result.denominator())) { // result as mixed number paintMiddle(paint, TQString("="), old_x, fm, m_colorOperation); diff --git a/kbruch/src/resultwidget.h b/kbruch/src/resultwidget.h index b42c3776..c742d1be 100644 --- a/kbruch/src/resultwidget.h +++ b/kbruch/src/resultwidget.h @@ -33,10 +33,11 @@ class ResultWidget : public FractionBaseWidget { Q_OBJECT + TQ_OBJECT public: /** constructor */ - ResultWidget(TQWidget * parent, const char * name, const ratio para_result); + ResultWidget(TQWidget * tqparent, const char * name, const ratio para_result); /** destructor */ ~ResultWidget(); diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp index d6b8ff37..b3fee887 100644 --- a/kbruch/src/statisticsview.cpp +++ b/kbruch/src/statisticsview.cpp @@ -18,7 +18,7 @@ #include "statisticsview.h" #include "statisticsview.moc" -/* the includes are needed for Qt support */ +/* the includes are needed for TQt support */ #include #include #include @@ -31,8 +31,8 @@ #include "settingsclass.h" /* constructor */ -StatisticsView::StatisticsView(TQWidget * parent, const char * name): - TQWidget(parent, name), m_count(0), m_correct(0) +StatisticsView::StatisticsView(TQWidget * tqparent, const char * name): + TQWidget(tqparent, name), m_count(0), m_correct(0) { #ifdef DEBUG kdDebug() << "constructor StatisticsView()" << endl; @@ -48,17 +48,17 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name): /* set the caption of the window */ // setCaption(i18n("Statistics")); - /* add a layout as a base */ - layout1 = new TQVBoxLayout(this); - layout1->setSpacing(6); - layout1->setMargin(6); + /* add a tqlayout as a base */ + tqlayout1 = new TQVBoxLayout(this); + tqlayout1->setSpacing(6); + tqlayout1->setMargin(6); /* now add a v-spacer */ TQSpacerItem * v_spacer = new TQSpacerItem(1, 1); - layout1->addItem(v_spacer); + tqlayout1->addItem(v_spacer); /* create a grid to show the labels */ - labelGrid = new TQGridLayout(layout1, 3, 2); + labelGrid = new TQGridLayout(tqlayout1, 3, 2); /* add 6 labels to the grid */ info1Label = new TQLabel(this); @@ -112,10 +112,10 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name): /* now add a v-spacer */ v_spacer = new TQSpacerItem(1, 1); - layout1->addItem(v_spacer); + tqlayout1->addItem(v_spacer); /* the Reset button */ - buttonLayout = new TQHBoxLayout(layout1); + buttonLayout = new TQHBoxLayout(tqlayout1); resetBtn = new TQPushButton(i18n("&Reset"), this); TQObject::connect(resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetStatistics())); buttonLayout->addWidget(resetBtn); @@ -142,7 +142,7 @@ StatisticsView::~StatisticsView() SettingsClass::setCorrect(m_correct); SettingsClass::writeConfig(); - /* no need to delete any child widgets, Qt does it by itself */ + /* no need to delete any child widgets, TQt does it by itself */ } /* called, if a task solved correctly */ @@ -150,14 +150,14 @@ void StatisticsView::addCorrect() { ++m_count; ++m_correct; - (void) calc(); /* repaint the statistics */ + (void) calc(); /* tqrepaint the statistics */ } /* called, if a task was solved wrong */ void StatisticsView::addWrong() { ++m_count; - (void) calc(); /* repaint the statistics */ + (void) calc(); /* tqrepaint the statistics */ } @@ -169,7 +169,7 @@ void StatisticsView::calc() TQString new_text; TQString number; - new_text = TQString("%1").arg(m_count); + new_text = TQString("%1").tqarg(m_count); result1Label->setText(new_text); /* we have to be careful with division by 0 */ @@ -179,11 +179,11 @@ void StatisticsView::calc() result3Label->setText("- (- %)"); } else { /* set the correct label */ - new_text = TQString("%1 (%2 %)").arg(m_correct).arg(int(double(m_correct) / m_count * 100)); + new_text = TQString("%1 (%2 %)").tqarg(m_correct).tqarg(int(double(m_correct) / m_count * 100)); result2Label->setText(new_text); /* set the incorrect label */ - new_text = TQString("%1 (%2 %)").arg(m_count - m_correct).arg(int(double(m_count - m_correct) / m_count * 100)); + new_text = TQString("%1 (%2 %)").tqarg(m_count - m_correct).tqarg(int(double(m_count - m_correct) / m_count * 100)); result3Label->setText(new_text); } } diff --git a/kbruch/src/statisticsview.h b/kbruch/src/statisticsview.h index b7948761..60ea147c 100644 --- a/kbruch/src/statisticsview.h +++ b/kbruch/src/statisticsview.h @@ -34,13 +34,14 @@ class TQGridLayout; * \author Eva Brucherseifer */ -class StatisticsView : public QWidget +class StatisticsView : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** constructor */ - StatisticsView(TQWidget * parent = 0, const char * name = 0); + StatisticsView(TQWidget * tqparent = 0, const char * name = 0); /** destructor */ ~StatisticsView(); @@ -65,7 +66,7 @@ private: TQPushButton * resetBtn; TQHBoxLayout * buttonLayout; - TQVBoxLayout * layout1; + TQVBoxLayout * tqlayout1; TQGridLayout * labelGrid; TQLabel * result1Label; TQLabel * result2Label; diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp index a15520a8..6318c7bf 100644 --- a/kbruch/src/taskview.cpp +++ b/kbruch/src/taskview.cpp @@ -24,7 +24,7 @@ #include #include -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include #include #include @@ -38,9 +38,9 @@ /* ----- public member functions ----- */ /* constructor */ -TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, +TaskView::TaskView(TQWidget * tqparent, const char * name, bool padd_sub, bool pmul_div, unsigned int pnr_ratios, unsigned int pmax_md): - ExerciseBase(parent, name), add_sub(padd_sub), mul_div(pmul_div), + ExerciseBase(tqparent, name), add_sub(padd_sub), mul_div(pmul_div), nr_ratios(pnr_ratios), max_md(pmax_md) { #ifdef DEBUG @@ -113,10 +113,10 @@ TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, // --- that is the end of the horizontal line --- // in RTL desktops, we still need to allign the - // execise to the left. On Qt4, you can set the direction - // of the layout to LTR (instead of inherit), but on Qt3 + // execise to the left. On TQt4, you can set the direction + // of the tqlayout to LTR (instead of inherit), but on TQt3 // the only way of fixing it is inserting the widgets in reversed - // order to the layout. + // order to the tqlayout. // // if you need help with this feel free to contact me - Diego ) // This should fix parts of bug #116831 @@ -152,16 +152,16 @@ TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, m_checkButton->setText(i18n("&Check Task")); m_checkButton->setDefault(true); // is the default button of the dialog TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet.")); - lowerHBox->addWidget(m_checkButton, 1, Qt::AlignRight); + lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight); TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); // that the user can start typing without moving the focus numer_edit->setFocus(); - // show the whole layout + // show the whole tqlayout baseWidget->show(); - // show the whole layout + // show the whole tqlayout m_taskWidget->show(); m_resultWidget->hide(); @@ -177,7 +177,7 @@ TaskView::~TaskView() kdDebug() << "destructor TaskView()" << endl; #endif - /* no need to delete any child widgets, Qt does it by itself */ + /* no need to delete any child widgets, TQt does it by itself */ } /** the parameters of task generation can be set with this function */ diff --git a/kbruch/src/taskview.h b/kbruch/src/taskview.h index 961adce2..91e650b2 100644 --- a/kbruch/src/taskview.h +++ b/kbruch/src/taskview.h @@ -51,10 +51,11 @@ class TQFrame; class TaskView : public ExerciseBase { Q_OBJECT + TQ_OBJECT public: /** constructor */ - TaskView(TQWidget * parent = 0, const char * name = 0, + TaskView(TQWidget * tqparent = 0, const char * name = 0, bool padd_sub = true, bool pmul_div = false, unsigned int pnr_ratios = 2, unsigned int pmax_md = 10); diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui index 97cba6ed..92775120 100644 --- a/kbruch/src/taskvieweroptionsbase.ui +++ b/kbruch/src/taskvieweroptionsbase.ui @@ -1,10 +1,10 @@ TaskViewerOptionsBase - + TaskViewerOptionsBase - + 0 0 @@ -16,9 +16,9 @@ unnamed - + - layout2 + tqlayout2 @@ -40,9 +40,9 @@ Change the font of the numbers - + - colorGroupBox + tqcolorGroupBox @@ -55,11 +55,11 @@ Colors - + - layout7 + tqlayout7 - + 10 20 @@ -115,7 +115,7 @@ Change the color of the fraction bar - + fractionBarLabel @@ -131,7 +131,7 @@ Fraction bar: - + operationLabel @@ -165,7 +165,7 @@ Change the color of the numbers - + numberLabel @@ -184,7 +184,7 @@ - + groupBox2 @@ -195,7 +195,7 @@ unnamed - + kcfg_showSpecialRatioNotation @@ -214,7 +214,7 @@ - + kfontdialog.h kcolorbutton.h diff --git a/kbruch/src/taskwidget.cpp b/kbruch/src/taskwidget.cpp index 1807283e..795bc4cb 100644 --- a/kbruch/src/taskwidget.cpp +++ b/kbruch/src/taskwidget.cpp @@ -21,12 +21,12 @@ /* these includes are needed for KDE support */ #include -/* these includes are needed for Qt support */ +/* these includes are needed for TQt support */ #include -TaskWidget::TaskWidget(TQWidget * parent = 0, const char * name = 0, +TaskWidget::TaskWidget(TQWidget * tqparent = 0, const char * name = 0, const task para_task = *new task()) : - FractionBaseWidget(parent, name), m_task(para_task) + FractionBaseWidget(tqparent, name), m_task(para_task) { #ifdef DEBUG kdDebug() << "constructor TaskWidget" << endl; @@ -65,7 +65,7 @@ void TaskWidget::paintEvent(TQPaintEvent* /* p_paintEvent */) paint.setFont(m_font); // set the pen for painting - TQPen pen(Qt::SolidLine); + TQPen pen(TQt::SolidLine); pen.setWidth(0); paint.setPen(pen); diff --git a/kbruch/src/taskwidget.h b/kbruch/src/taskwidget.h index 2d7238ae..b2bd6f59 100644 --- a/kbruch/src/taskwidget.h +++ b/kbruch/src/taskwidget.h @@ -43,10 +43,11 @@ class TaskWidget : public FractionBaseWidget { Q_OBJECT + TQ_OBJECT public: /** constructor */ - TaskWidget(TQWidget * parent, const char * name, const task para_task); + TaskWidget(TQWidget * tqparent, const char * name, const task para_task); /** destructor */ ~TaskWidget(); diff --git a/kbruch/testcases/primenumber_test.cpp b/kbruch/testcases/primenumber_test.cpp index c0e322fb..0a5ee2b6 100644 --- a/kbruch/testcases/primenumber_test.cpp +++ b/kbruch/testcases/primenumber_test.cpp @@ -36,52 +36,52 @@ class primenumber_test /** test the prime number algorithm */ void test_isPrimeNumber() { - BOOST_REQUIRE(m_primenumber.isPrimeNumber(0) == 0); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(2) == 1); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(3) == 1); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(4) == 0); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(5) == 1); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(6) == 0); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(7) == 1); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(8) == 0); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(9) == 0); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(23) == 1); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(9) == 0); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(9) == 0); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(6) == 0); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(101) == 1); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(323) == 0); // 17 * 19 - BOOST_REQUIRE(m_primenumber.isPrimeNumber(1001) == 0); // 7 * 143 - BOOST_REQUIRE(m_primenumber.isPrimeNumber(1002) == 0); // 2 * 501 - BOOST_REQUIRE(m_primenumber.isPrimeNumber(3) == 1); - BOOST_REQUIRE(m_primenumber.isPrimeNumber(2) == 1); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(0) == 0); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(2) == 1); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(3) == 1); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(4) == 0); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(5) == 1); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(6) == 0); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(7) == 1); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(8) == 0); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(9) == 0); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(23) == 1); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(9) == 0); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(9) == 0); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(6) == 0); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(101) == 1); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(323) == 0); // 17 * 19 + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(1001) == 0); // 7 * 143 + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(1002) == 0); // 2 * 501 + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(3) == 1); + BOOST_RETQUIRE(m_primenumber.isPrimeNumber(2) == 1); } /** test the get_first() function */ void test_get_first() { - BOOST_REQUIRE(m_primenumber.get_first() == 2); + BOOST_RETQUIRE(m_primenumber.get_first() == 2); } /** test the move and get functions */ void test_move_get_func() { m_primenumber.move_first(); - BOOST_REQUIRE(m_primenumber.get_current() == 2); - BOOST_REQUIRE(m_primenumber.get_next() == 3); + BOOST_RETQUIRE(m_primenumber.get_current() == 2); + BOOST_RETQUIRE(m_primenumber.get_next() == 3); m_primenumber.move_forward(); - BOOST_REQUIRE(m_primenumber.get_current() == 5); + BOOST_RETQUIRE(m_primenumber.get_current() == 5); m_primenumber.move_back(); - BOOST_REQUIRE(m_primenumber.get_current() == 3); + BOOST_RETQUIRE(m_primenumber.get_current() == 3); unsigned int tmp = m_primenumber.get_last(); m_primenumber.move_last(); - BOOST_REQUIRE(m_primenumber.get_current() == tmp); + BOOST_RETQUIRE(m_primenumber.get_current() == tmp); m_primenumber.move_forward(); - BOOST_REQUIRE(m_primenumber.get_last() != tmp); + BOOST_RETQUIRE(m_primenumber.get_last() != tmp); } private: diff --git a/kbruch/testcases/ratio_test.cpp b/kbruch/testcases/ratio_test.cpp index bdc4419b..0dac9dfe 100644 --- a/kbruch/testcases/ratio_test.cpp +++ b/kbruch/testcases/ratio_test.cpp @@ -38,29 +38,29 @@ class ratio_test { // check basic initialisation ratio * ratio_a = new ratio(); - BOOST_REQUIRE(ratio_a->numerator() == 0); - BOOST_REQUIRE(ratio_a->denominator() == 1); + BOOST_RETQUIRE(ratio_a->numerator() == 0); + BOOST_RETQUIRE(ratio_a->denominator() == 1); // a denominator with value 0 is never allowed ratio * ratio_b = new ratio(2, 0); - BOOST_REQUIRE(ratio_b->numerator() == 2); - BOOST_REQUIRE(ratio_b->denominator() == 1); // division by zero not allowed + BOOST_RETQUIRE(ratio_b->numerator() == 2); + BOOST_RETQUIRE(ratio_b->denominator() == 1); // division by zero not allowed // a new ratio should always be reduced ratio * ratio_c = new ratio(2, 4); - BOOST_REQUIRE(ratio_c->numerator() == 1); - BOOST_REQUIRE(ratio_c->denominator() == 2); + BOOST_RETQUIRE(ratio_c->numerator() == 1); + BOOST_RETQUIRE(ratio_c->denominator() == 2); // check copy constructor ratio * ratio_d = new ratio(*ratio_c); - BOOST_REQUIRE(ratio_d->numerator() == 1); - BOOST_REQUIRE(ratio_d->denominator() == 2); + BOOST_RETQUIRE(ratio_d->numerator() == 1); + BOOST_RETQUIRE(ratio_d->denominator() == 2); // the copy constructor is not allowed to reduce the new ratio ratio_d->setNumerator(4, false); ratio * ratio_e = new ratio(*ratio_d); - BOOST_REQUIRE(ratio_e->numerator() == 4); - BOOST_REQUIRE(ratio_e->denominator() == 2); + BOOST_RETQUIRE(ratio_e->numerator() == 4); + BOOST_RETQUIRE(ratio_e->denominator() == 2); delete(ratio_a); delete(ratio_b); @@ -77,33 +77,33 @@ class ratio_test // check setNumerator() and numerator() (get) ratio * ratio_a = new ratio(); ratio_a->setNumerator(10); - BOOST_REQUIRE(ratio_a->numerator() == 10); - BOOST_REQUIRE(ratio_a->denominator() == 1); + BOOST_RETQUIRE(ratio_a->numerator() == 10); + BOOST_RETQUIRE(ratio_a->denominator() == 1); // check setDenominator() and denominator() (get) ratio_a->setDenominator(7); - BOOST_REQUIRE(ratio_a->numerator() == 10); - BOOST_REQUIRE(ratio_a->denominator() == 7); + BOOST_RETQUIRE(ratio_a->numerator() == 10); + BOOST_RETQUIRE(ratio_a->denominator() == 7); // now check if the ratio gets reduced ratio_a->setNumerator(14); - BOOST_REQUIRE(ratio_a->numerator() == 2); - BOOST_REQUIRE(ratio_a->denominator() == 1); + BOOST_RETQUIRE(ratio_a->numerator() == 2); + BOOST_RETQUIRE(ratio_a->denominator() == 1); // lets do the same, but with out reducing ratio_a->setNumerator(14, false); ratio_a->setDenominator(7, false); - BOOST_REQUIRE(ratio_a->numerator() == 14); - BOOST_REQUIRE(ratio_a->denominator() == 7); + BOOST_RETQUIRE(ratio_a->numerator() == 14); + BOOST_RETQUIRE(ratio_a->denominator() == 7); // now the = operator ratio * ratio_b = new ratio(); *ratio_b = *ratio_a; - BOOST_REQUIRE(ratio_b->numerator() == 14); - BOOST_REQUIRE(ratio_b->denominator() == 7); + BOOST_RETQUIRE(ratio_b->numerator() == 14); + BOOST_RETQUIRE(ratio_b->denominator() == 7); // make sure we didn't just copied the pointers - BOOST_REQUIRE(ratio_a != ratio_b); + BOOST_RETQUIRE(ratio_a != ratio_b); delete(ratio_a); delete(ratio_b); @@ -116,13 +116,13 @@ class ratio_test { ratio ratio_a; ratio_a = 8; - BOOST_REQUIRE(ratio_a.numerator() == 8); - BOOST_REQUIRE(ratio_a.denominator() == 1); + BOOST_RETQUIRE(ratio_a.numerator() == 8); + BOOST_RETQUIRE(ratio_a.denominator() == 1); ratio ratio_b(2, 3); ratio_a = ratio_b; - BOOST_REQUIRE(ratio_a.numerator() == 2); - BOOST_REQUIRE(ratio_a.denominator() == 3); + BOOST_RETQUIRE(ratio_a.numerator() == 2); + BOOST_RETQUIRE(ratio_a.denominator() == 3); return; } @@ -140,29 +140,29 @@ class ratio_test // check + operator ratio ratio_c = *ratio_a + *ratio_b; - BOOST_REQUIRE(ratio_c.numerator() == 5); - BOOST_REQUIRE(ratio_c.denominator() == 2); + BOOST_RETQUIRE(ratio_c.numerator() == 5); + BOOST_RETQUIRE(ratio_c.denominator() == 2); // it should be the same if we change the addends ratio_c = *ratio_b + *ratio_a; - BOOST_REQUIRE(ratio_c.numerator() == 5); - BOOST_REQUIRE(ratio_c.denominator() == 2); + BOOST_RETQUIRE(ratio_c.numerator() == 5); + BOOST_RETQUIRE(ratio_c.denominator() == 2); // check - operator ratio_c = *ratio_b - *ratio_a; - BOOST_REQUIRE(ratio_c.numerator() == -3); - BOOST_REQUIRE(ratio_c.denominator() == 2); + BOOST_RETQUIRE(ratio_c.numerator() == -3); + BOOST_RETQUIRE(ratio_c.denominator() == 2); // it should not be the same if we change the subtrahends ratio_c = *ratio_a - *ratio_b; - BOOST_REQUIRE(ratio_c.numerator() == 3); - BOOST_REQUIRE(ratio_c.denominator() == 2); + BOOST_RETQUIRE(ratio_c.numerator() == 3); + BOOST_RETQUIRE(ratio_c.denominator() == 2); // now check if we can get 0/1 *ratio_a = *ratio_b; ratio_c = *ratio_a - *ratio_b; - BOOST_REQUIRE(ratio_c.numerator() == 0); - BOOST_REQUIRE(ratio_c.denominator() == 1); + BOOST_RETQUIRE(ratio_c.numerator() == 0); + BOOST_RETQUIRE(ratio_c.denominator() == 1); delete(ratio_a); delete(ratio_b); @@ -183,32 +183,32 @@ class ratio_test // check * operator ratio ratio_c = *ratio_a * *ratio_b; - BOOST_REQUIRE(ratio_c.numerator() == 1); - BOOST_REQUIRE(ratio_c.denominator() == 2); + BOOST_RETQUIRE(ratio_c.numerator() == 1); + BOOST_RETQUIRE(ratio_c.denominator() == 2); // it should be the same if we change the addends ratio_c = *ratio_b * *ratio_a; - BOOST_REQUIRE(ratio_c.numerator() == 1); - BOOST_REQUIRE(ratio_c.denominator() == 2); + BOOST_RETQUIRE(ratio_c.numerator() == 1); + BOOST_RETQUIRE(ratio_c.denominator() == 2); // check / operator ratio_c = *ratio_b / *ratio_a; - BOOST_REQUIRE(ratio_c.numerator() == 1); - BOOST_REQUIRE(ratio_c.denominator() == 8); + BOOST_RETQUIRE(ratio_c.numerator() == 1); + BOOST_RETQUIRE(ratio_c.denominator() == 8); // it should not be the same if we change the subtrahends ratio_c = *ratio_a / *ratio_b; - BOOST_REQUIRE(ratio_c.numerator() == 8); - BOOST_REQUIRE(ratio_c.denominator() == 1); + BOOST_RETQUIRE(ratio_c.numerator() == 8); + BOOST_RETQUIRE(ratio_c.denominator() == 1); // now check if we can get 0/1 *ratio_a = 0; ratio_c = *ratio_a * *ratio_b; - BOOST_REQUIRE(ratio_c.numerator() == 0); - BOOST_REQUIRE(ratio_c.denominator() == 1); + BOOST_RETQUIRE(ratio_c.numerator() == 0); + BOOST_RETQUIRE(ratio_c.denominator() == 1); ratio_c = *ratio_a / *ratio_b; - BOOST_REQUIRE(ratio_c.numerator() == 0); - BOOST_REQUIRE(ratio_c.denominator() == 1); + BOOST_RETQUIRE(ratio_c.numerator() == 0); + BOOST_RETQUIRE(ratio_c.denominator() == 1); delete(ratio_a); delete(ratio_b); @@ -221,8 +221,8 @@ class ratio_test { ratio ratio_a(2, 3); ratio_a.reziproc(); - BOOST_REQUIRE(ratio_a.numerator() == 3); - BOOST_REQUIRE(ratio_a.denominator() == 2); + BOOST_RETQUIRE(ratio_a.numerator() == 3); + BOOST_RETQUIRE(ratio_a.denominator() == 2); return; } @@ -234,8 +234,8 @@ class ratio_test ratio_a.setNumerator(51, false); ratio_a.setDenominator(17, false); ratio_a.reduce(); - BOOST_REQUIRE(ratio_a.numerator() == 3); - BOOST_REQUIRE(ratio_a.denominator() == 1); + BOOST_RETQUIRE(ratio_a.numerator() == 3); + BOOST_RETQUIRE(ratio_a.denominator() == 1); return; } @@ -249,11 +249,11 @@ class ratio_test ratio ratio_d(2, -3); ratio ratio_e(-2, 3); - BOOST_REQUIRE((ratio_a == ratio_a) == true); - BOOST_REQUIRE((ratio_a == ratio_b) == true); - BOOST_REQUIRE((ratio_a == ratio_c) == true); - BOOST_REQUIRE((ratio_a == ratio_d) == false); - BOOST_REQUIRE((ratio_a == ratio_e) == false); + BOOST_RETQUIRE((ratio_a == ratio_a) == true); + BOOST_RETQUIRE((ratio_a == ratio_b) == true); + BOOST_RETQUIRE((ratio_a == ratio_c) == true); + BOOST_RETQUIRE((ratio_a == ratio_d) == false); + BOOST_RETQUIRE((ratio_a == ratio_e) == false); return; } @@ -267,21 +267,21 @@ class ratio_test ratio ratio_d(2, -3); ratio ratio_e(-2, 3); - BOOST_REQUIRE((ratio_a < ratio_a) == false); - BOOST_REQUIRE((ratio_a < ratio_b) == false); - BOOST_REQUIRE((ratio_a < ratio_c) == false); - BOOST_REQUIRE((ratio_a < ratio_d) == false); - BOOST_REQUIRE((ratio_a < ratio_e) == false); + BOOST_RETQUIRE((ratio_a < ratio_a) == false); + BOOST_RETQUIRE((ratio_a < ratio_b) == false); + BOOST_RETQUIRE((ratio_a < ratio_c) == false); + BOOST_RETQUIRE((ratio_a < ratio_d) == false); + BOOST_RETQUIRE((ratio_a < ratio_e) == false); ratio_a = ratio(-2, 3); - BOOST_REQUIRE((ratio_a < ratio_a) == false); - BOOST_REQUIRE((ratio_a < ratio_b) == true); - BOOST_REQUIRE((ratio_a < ratio_c) == true); - BOOST_REQUIRE((ratio_a < ratio_d) == false); - BOOST_REQUIRE((ratio_a < ratio_e) == false); + BOOST_RETQUIRE((ratio_a < ratio_a) == false); + BOOST_RETQUIRE((ratio_a < ratio_b) == true); + BOOST_RETQUIRE((ratio_a < ratio_c) == true); + BOOST_RETQUIRE((ratio_a < ratio_d) == false); + BOOST_RETQUIRE((ratio_a < ratio_e) == false); - BOOST_REQUIRE((ratio(5, 8) < ratio(2, 1)) == true); + BOOST_RETQUIRE((ratio(5, 8) < ratio(2, 1)) == true); return; } @@ -296,21 +296,21 @@ class ratio_test ratio ratio_e(-2, 3); ratio ratio_f(-4, 3); - BOOST_REQUIRE((ratio_a > ratio_a) == false); - BOOST_REQUIRE((ratio_a > ratio_b) == false); - BOOST_REQUIRE((ratio_a > ratio_c) == false); - BOOST_REQUIRE((ratio_a > ratio_d) == true); - BOOST_REQUIRE((ratio_a > ratio_e) == true); - BOOST_REQUIRE((ratio_a > ratio_f) == true); + BOOST_RETQUIRE((ratio_a > ratio_a) == false); + BOOST_RETQUIRE((ratio_a > ratio_b) == false); + BOOST_RETQUIRE((ratio_a > ratio_c) == false); + BOOST_RETQUIRE((ratio_a > ratio_d) == true); + BOOST_RETQUIRE((ratio_a > ratio_e) == true); + BOOST_RETQUIRE((ratio_a > ratio_f) == true); ratio_a = ratio(-2, 3); - BOOST_REQUIRE((ratio_a > ratio_a) == false); - BOOST_REQUIRE((ratio_a > ratio_b) == false); - BOOST_REQUIRE((ratio_a > ratio_c) == false); - BOOST_REQUIRE((ratio_a > ratio_d) == false); - BOOST_REQUIRE((ratio_a > ratio_e) == false); - BOOST_REQUIRE((ratio_a > ratio_f) == true); + BOOST_RETQUIRE((ratio_a > ratio_a) == false); + BOOST_RETQUIRE((ratio_a > ratio_b) == false); + BOOST_RETQUIRE((ratio_a > ratio_c) == false); + BOOST_RETQUIRE((ratio_a > ratio_d) == false); + BOOST_RETQUIRE((ratio_a > ratio_e) == false); + BOOST_RETQUIRE((ratio_a > ratio_f) == true); return; } diff --git a/keduca/keduca/Makefile.am b/keduca/keduca/Makefile.am index fb713daf..a1199e17 100644 --- a/keduca/keduca/Makefile.am +++ b/keduca/keduca/Makefile.am @@ -4,7 +4,7 @@ INCLUDES= -I../libkeduca $(all_includes) # The binary program keduca bin_PROGRAMS = keduca keduca_LDFLAGS = $(all_libraries) -keduca_LDADD = $(LIB_KFILE) $(LIB_KPARTS) ../libkeduca/libkeduca.la +keduca_LDADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) ../libkeduca/libkeduca.la keduca_SOURCES = main.cpp keduca.cpp # Convenience library @@ -17,7 +17,7 @@ keduca_SOURCES = main.cpp keduca.cpp # The KParts Component kde_module_LTLIBRARIES = libkeducapart.la -libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) +libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) libkeducapart_la_LIBADD = ../libkeduca/libkeduca.la $(LIB_KPARTS) libkeducapart_la_SOURCES = keduca_part.cpp kradioeduca.cpp kquestion.cpp \ kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \ diff --git a/keduca/keduca/configdialogbase.ui b/keduca/keduca/configdialogbase.ui index bb526841..18446407 100644 --- a/keduca/keduca/configdialogbase.ui +++ b/keduca/keduca/configdialogbase.ui @@ -1,10 +1,10 @@ ConfigDialogBase - + ConfigDialogBase - + 0 0 @@ -19,7 +19,7 @@ unnamed - + kcfg_ResultFinish @@ -30,7 +30,7 @@ unnamed - + testEnd @@ -38,7 +38,7 @@ At the end of the test - + afterEachQuestion @@ -48,7 +48,7 @@ - + orderingButtonGroup @@ -59,7 +59,7 @@ unnamed - + kcfg_RandomQuestions @@ -67,7 +67,7 @@ Show questions in random order - + kcfg_RandomAnswers @@ -87,7 +87,7 @@ Expanding - + 41 51 @@ -96,5 +96,5 @@ - + diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp index a75c8478..996bbe04 100644 --- a/keduca/keduca/kcheckeduca.cpp +++ b/keduca/keduca/kcheckeduca.cpp @@ -21,7 +21,7 @@ #include #include -KCheckEduca::KCheckEduca(TQWidget *parent, const char *name ) : TQCheckBox(parent,name) +KCheckEduca::KCheckEduca(TQWidget *tqparent, const char *name ) : TQCheckBox(tqparent,name) { _doc = 0; KAcceleratorManager::setNoAccel( this ); @@ -38,7 +38,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ int extra_width, indicator_width; extra_width = 8; - indicator_width = style().pixelMetric(TQStyle::PM_IndicatorWidth, 0); + indicator_width = tqstyle().tqpixelMetric(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 = colorGroup(); + TQColorGroup cg = tqcolorGroup(); 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, colorGroup(), 0); + _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0); if ( hasFocus() ) { -// TQRect br = style().itemRect( p, x, y, rw, rh+yo, +// TQRect br = tqstyle().tqitemRect( 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 ) ); - style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup()); } } diff --git a/keduca/keduca/kcheckeduca.h b/keduca/keduca/kcheckeduca.h index 32ff3b81..ba854242 100644 --- a/keduca/keduca/kcheckeduca.h +++ b/keduca/keduca/kcheckeduca.h @@ -28,9 +28,10 @@ class KCheckEduca : public TQCheckBox { Q_OBJECT + TQ_OBJECT public: - KCheckEduca(TQWidget *parent=0, const char *name=0); + KCheckEduca(TQWidget *tqparent=0, const char *name=0); ~KCheckEduca(); protected: diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 2ab99ea0..a09c1b3a 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -1,7 +1,7 @@ /*************************************************************************** keduca.cpp - description ------------------- - begin : mié may 23 20:36:15 CEST 2001 + begin : mi� may 23 20:36:15 CEST 2001 copyright : (C) 2001 by Javier Campos email : javi@asyris.org ***************************************************************************/ @@ -30,13 +30,13 @@ #include -Keduca::Keduca( TQWidget* parent, const char *name, WFlags f ) - : KParts::MainWindow( parent, name, f ), _part( 0 ) +Keduca::Keduca( TQWidget* tqparent, const char *name, WFlags f ) + : KParts::MainWindow( tqparent, name, f ), _part( 0 ) { setXMLFile( "keducaui.rc" ); _part = KParts::ComponentFactory::createPartInstanceFromLibrary< KParts::ReadOnlyPart > - ( "libkeducapart", this, name, this, "KEducaPart" ); + ( "libkeducapart", this, name, TQT_TQOBJECT(this), "KEducaPart" ); if ( _part ) { @@ -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(minimumSizeHint())); + resize( TQSize(550, 450).expandedTo(tqminimumSizeHint())); } Keduca::~Keduca() @@ -63,17 +63,17 @@ Keduca::~Keduca() void Keduca::setupActions() { - KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() ); - (void)new KAction( i18n( "Open &Gallery..." ), 0, 0, this, TQT_SLOT( slotGallery() ), + KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() ); + (void)new KAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery" ); - _recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &) ), + _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &) ), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT( quit() ), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection()); } void Keduca::slotFileOpen() { - KURL url = KFileDialog::getOpenURL( TQString::null, "application/x-edu", this, i18n("Open Educa File") ); + KURL url = KFileDialog::getOpenURL( TQString(), "application/x-edu", this, i18n("Open Educa File") ); if( !url.isEmpty() ) slotFileOpenURL( url ); } diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h index a997d36e..ad2d8f58 100644 --- a/keduca/keduca/keduca.h +++ b/keduca/keduca/keduca.h @@ -34,10 +34,11 @@ class Keduca : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: /** construtor */ - Keduca(TQWidget* parent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose); + Keduca(TQWidget* tqparent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose); /** destructor */ ~Keduca(); /** Open gallery window */ diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index bc9e5485..6b0e17aa 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -34,14 +34,14 @@ typedef KParts::GenericFactory KEducaPartFactory; K_EXPORT_COMPONENT_FACTORY( libkeducapart, KEducaPartFactory ) -KEducaPart::KEducaPart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, +KEducaPart::KEducaPart( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) - : KParts::ReadOnlyPart( parent, name ) + : KParts::ReadOnlyPart( tqparent, name ) { setInstance( KEducaPartFactory::instance() ); - m_view = new KEducaView( parentWidget, widgetName ); + m_view = new KEducaView( tqparentWidget, widgetName ); m_view->show(); setWidget( m_view ); diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h index 418209a8..d19d597c 100644 --- a/keduca/keduca/keduca_part.h +++ b/keduca/keduca/keduca_part.h @@ -36,11 +36,12 @@ class KAboutData; class KEducaPart : public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: /* * Constructor. */ - KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, + KEducaPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &args ); /* diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index bdd07677..1546e9ce 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -27,7 +27,7 @@ #include -KEducaPrefs::KEducaPrefs(TQWidget *parent, const char *name, bool modal ) : KDialogBase(IconList, i18n("Configure"), Ok|Cancel, Ok, parent, name, modal, true) +KEducaPrefs::KEducaPrefs(TQWidget *tqparent, const char *name, bool modal ) : KDialogBase(IconList, i18n("Configure"), Ok|Cancel, Ok, tqparent, name, modal, true) { setPageGeneral(); configRead(); @@ -45,10 +45,10 @@ void KEducaPrefs::setPageGeneral() TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" ); buttonGroup1->setTitle( i18n( "General" ) ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->layout()->setSpacing( 0 ); - buttonGroup1->layout()->setMargin( 0 ); - TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() ); - buttonGroup1Layout->setAlignment( Qt::AlignTop ); + buttonGroup1->tqlayout()->setSpacing( 0 ); + buttonGroup1->tqlayout()->setMargin( 0 ); + TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() ); + buttonGroup1Layout->tqsetAlignment( TQt::AlignTop ); buttonGroup1Layout->setSpacing( 6 ); buttonGroup1Layout->setMargin( 11 ); @@ -63,10 +63,10 @@ void KEducaPrefs::setPageGeneral() TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" ); GroupBox1->setTitle( i18n( "Order" ) ); GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->layout()->setSpacing( 0 ); - GroupBox1->layout()->setMargin( 0 ); - TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); + GroupBox1->tqlayout()->setSpacing( 0 ); + GroupBox1->tqlayout()->setMargin( 0 ); + TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() ); + GroupBox1Layout->tqsetAlignment( TQt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); diff --git a/keduca/keduca/keducaprefs.h b/keduca/keduca/keducaprefs.h index 39efb2e2..5693489d 100644 --- a/keduca/keduca/keducaprefs.h +++ b/keduca/keduca/keducaprefs.h @@ -29,9 +29,10 @@ class KEducaPrefs : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KEducaPrefs(TQWidget *parent=0, const char *name=0, bool modal=true); + KEducaPrefs(TQWidget *tqparent=0, const char *name=0, bool modal=true); ~KEducaPrefs(); private: diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index 5c07c9c3..6207760f 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -37,8 +37,8 @@ #include #include -KEducaView::KEducaView( TQWidget *parent, const char *name ) - : TQWidgetStack( parent, name ), _keducaFile( 0 ), _timeoutTimer( 0 ) +KEducaView::KEducaView( TQWidget *tqparent, const char *name ) + : TQWidgetStack( tqparent, name ), _keducaFile( 0 ), _timeoutTimer( 0 ) { init(); } @@ -59,8 +59,8 @@ void KEducaView::init() { // Intro Screen _introWidget = new TQLabel( this, "introScreen" ); - _introWidget->setBackgroundColor( Qt::white ); - _introWidget->setAlignment( AlignCenter ); + _introWidget->setBackgroundColor( TQt::white ); + _introWidget->tqsetAlignment( AlignCenter ); _introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) ); addWidget( _introWidget, 0 ); @@ -74,7 +74,7 @@ void KEducaView::init() // Question Widget _questionWidget = new TQVBox( this, "questionWidget" ); - _split = new TQSplitter( TQSplitter::Vertical, _questionWidget ); + _split = new TQSplitter( Qt::Vertical, _questionWidget ); _questionText = new KQuestion( _split, "kquestion" ); _buttonGroup = new KGroupEduca( _split, "ButtonGroup" ); _buttonGroup->setRadioButtonExclusive( true ); @@ -121,7 +121,7 @@ void KEducaView::slotButtonNext() _questionText->countdown(0); } - if( ( visibleWidget() == _questionWidget ) && !_isInitStatus ) + if( ( visibleWidget() == _questionWidget ) && !_isInittqStatus ) setResults(); _buttonGroup->clearAnswers(); @@ -147,7 +147,7 @@ void KEducaView::slotButtonNext() /** Button Save action */ void KEducaView::slotButtonSave() { - KFileDialog *dialog=new KFileDialog(TQString::null, TQString::null, this, "file dialog", true); + KFileDialog *dialog=new KFileDialog(TQString(), TQString(), this, "file dialog", true); dialog->setCaption( i18n("Save Results As") ); dialog->setKeepLocation( true ); dialog->setOperationMode( KFileDialog::Saving ); @@ -209,16 +209,16 @@ void KEducaView::showRecord() // SHOW QUESTION ******************************************************************* _questionText->setPixmap( _keducaFile->getPicturePixmap() ); questionTextTemp = "
\"icon\"/" ); - html.append( "" + i18n( "Electronic configuration: %1" ).arg( m_element->parsedOrbits() ) + "" ); + html.append( "" + i18n( "Electronic configuration: %1" ).tqarg( m_element->parsedOrbits() ) + "" ); html.append( "
\"icon\"/" ); - html.append( "" + i18n( "Density: %1" ).arg( m_element->adjustUnits( Element::DENSITY ) ) + "" ); + html.append( "" + i18n( "Density: %1" ).tqarg( m_element->adjustUnits( Element::DENSITY ) ) + "" ); html.append( "
\"icon\"/" ); - html.append( "" + i18n( "Covalent Radius: %1" ).arg( m_element->adjustRadius( Element::COVALENT ) ) + "" ); + html.append( "" + i18n( "Covalent Radius: %1" ).tqarg( m_element->adjustRadius( Element::COVALENT ) ) + "" ); html.append( "
\"icon\"/" ); - html.append( i18n( "Ionic Radius (Charge): %1 (%2)" ).arg( m_element->adjustRadius(Element::IONIC) ).arg( m_element->ioncharge() ) ); + html.append( i18n( "Ionic Radius (Charge): %1 (%2)" ).tqarg( m_element->adjustRadius(Element::IONIC) ).tqarg( m_element->ioncharge() ) ); html.append( "
\"icon\"/" ); - html.append( "" + i18n( "van der Waals Radius: %1" ).arg( m_element->adjustRadius(Element::VDW) ) + "" ); + html.append( "" + i18n( "van der Waals Radius: %1" ).tqarg( m_element->adjustRadius(Element::VDW) ) + "" ); html.append( "
\"icon\"/" ); - html.append( "" + i18n( "Atomic Radius: %1" ).arg( m_element->adjustRadius(Element::ATOMIC) ) + "" ); + html.append( "" + i18n( "Atomic Radius: %1" ).tqarg( m_element->adjustRadius(Element::ATOMIC) ) + "" ); html.append( "
\"icon\"/" ); - html.append( "" + i18n( "Mass: %1" ).arg( m_element->adjustUnits( Element::MASS ) ) + "" ); + html.append( "" + i18n( "Mass: %1" ).tqarg( m_element->adjustUnits( Element::MASS ) ) + "" ); html.append( "
\"icon\"/" ); html.append( m_element->adjustUnits( Element::DATE ) ); if ( !m_element->scientist( ).isEmpty() ) - html += "
" + i18n("It was discovered by %1").arg(m_element->scientist() ); + html += "
" + i18n("It was discovered by %1").tqarg(m_element->scientist() ); html.append( "
\"icon\"/" ); - html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).arg( KGlobal::locale()->formatLong( m_element->abundance() ) ) ); + html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).tqarg( KGlobal::locale()->formatLong( m_element->abundance() ) ) ); html.append( "
\"icon\"/" ); - html.append( i18n( "Mean mass: %1 u" ).arg( KalziumUtils::localizedValue( m_element->meanmass(), 6 ) ) ); + html.append( i18n( "Mean mass: %1 u" ).tqarg( KalziumUtils::localizedValue( m_element->meanmass(), 6 ) ) ); html.append( "
\"icon\"/" ); - html.append( i18n( "Origin of the name: %1" ).arg( m_element->nameOrigin() ) ); + html.append( i18n( "Origin of the name: %1" ).tqarg( m_element->nameOrigin() ) ); html.append( "
\"icon\"/" ); - html.append( i18n( "Melting Point: %1" ).arg( m_element->adjustUnits( Element::MELTINGPOINT ) ) ); + html.append( i18n( "Melting Point: %1" ).tqarg( m_element->adjustUnits( Element::MELTINGPOINT ) ) ); html.append( "
\"icon\"/" ); - html.append( i18n( "Boiling Point: %1" ).arg( m_element->adjustUnits( Element::BOILINGPOINT ) ) ); + html.append( i18n( "Boiling Point: %1" ).tqarg( m_element->adjustUnits( Element::BOILINGPOINT ) ) ); html.append( "
\"icon\"/" ); - html.append( i18n( "Electronegativity: %1" ).arg( m_element->adjustUnits( Element::EN ) ) ); + html.append( i18n( "Electronegativity: %1" ).tqarg( m_element->adjustUnits( Element::EN ) ) ); html.append( "
\"icon\"/" ); - html.append( i18n( "Electron affinity: %1 " ).arg( m_element->adjustUnits(Element::EA) ) ); + html.append( i18n( "Electron affinity: %1 " ).tqarg( m_element->adjustUnits(Element::EA) ) ); html.append( "
\"icon\"/" ); html.append( i18n("the first variable is a number. The result is for example '1.' or '5.', the second is the value of the ionisation energy", - "%1. Ionization energy: %2" ).arg( TQString::number( i+1 ), m_element->adjustUnits( Element::IE, ionlist[i] ) ) ); + "%1. Ionization energy: %2" ).tqarg( TQString::number( i+1 ), m_element->adjustUnits( Element::IE, ionlist[i] ) ) ); html.append( "
" ); if ( ( *it )->weight() > 0.0 ) - html.append( i18n( "%1 u" ).arg( KalziumUtils::localizedValue( ( *it )->weight(), 6 ) ) ); - // html.append( i18n( "%1 u" ).arg( TQString::number( ( *it )->weight() ) )); + html.append( i18n( "%1 u" ).tqarg( KalziumUtils::localizedValue( ( *it )->weight(), 6 ) ) ); + // html.append( i18n( "%1 u" ).tqarg( TQString::number( ( *it )->weight() ) )); html.append( "" ); html.append( TQString::number( ( *it )->neutrons() ) ); html.append( "" ); if ( ( *it )->percentage() > 0.0 ) - html.append( i18n( "this can for example be '24%'", "%1%" ).arg( KalziumUtils::localizedValue( ( *it )->percentage(), 6 ) ) ); + html.append( i18n( "this can for example be '24%'", "%1%" ).tqarg( KalziumUtils::localizedValue( ( *it )->percentage(), 6 ) ) ); html.append( "" ); if ( ( *it )->halflife() > 0.0 ) { html.append( ( *it )->halflifeAsString() ); @@ -278,49 +278,49 @@ TQString DetailedInfoDlg::isotopeTable() html.append( "" ); if ( ( *it )->alphapercentage() > 0.0 ){ if ( ( *it )->alphadecay() > 0.0 ) - html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->alphadecay(), 6 ) ) ); - html.append( i18n( " %1" ).arg( TQChar( 945 ) ) ); + html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->alphadecay(), 6 ) ) ); + html.append( i18n( " %1" ).tqarg( TQChar( 945 ) ) ); if ( ( *it )->alphapercentage() < 100.0) - html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( (*it )->alphapercentage(), 6 ) ) ); + html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( (*it )->alphapercentage(), 6 ) ) ); if ( ( *it )->betaminuspercentage() > 0.0 || ( *it )->betapluspercentage() > 0.0 || ( *it )->ecpercentage() > 0.0) html.append( i18n( ", " ) ); } if ( ( *it )->betaminuspercentage() > 0.0 ){ if ( ( *it )->betaminusdecay() > 0.0 ) - html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->betaminusdecay(), 6 ) ) ); - html.append( i18n( " %1-" ).arg( TQChar( 946 ) ) ); + html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaminusdecay(), 6 ) ) ); + html.append( i18n( " %1-" ).tqarg( TQChar( 946 ) ) ); if ( ( *it )->betaminuspercentage() < 100.0) - html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->betaminuspercentage(), 6 ) )); + html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaminuspercentage(), 6 ) )); if ( ( *it )->betapluspercentage() > 0.0 || ( *it )->ecpercentage() > 0.0 ) html.append( i18n( ", " ) ); } if ( ( *it )->betapluspercentage() > 0.0 ){ if ( ( *it )->betaplusdecay() > 0.0 ) - html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->betaplusdecay(), 6 ) ) ); - html.append( i18n( " %1+" ).arg(TQChar( 946 ) ) ); + html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaplusdecay(), 6 ) ) ); + html.append( i18n( " %1+" ).tqarg(TQChar( 946 ) ) ); if ( ( *it )->betapluspercentage() == ( *it )->ecpercentage() ) { if ( ( *it )->ecdecay() > 0.0 ) { - html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) ); + html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) ); } html.append( i18n( "Acronym of Electron Capture"," EC" ) ); } if ( ( *it )->betapluspercentage() < 100.0) - html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->betapluspercentage(), 6 ) ) ); + html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( ( *it )->betapluspercentage(), 6 ) ) ); html += " "; } if ( ( *it )->ecpercentage() > 0.0 && ( *it )->ecpercentage()!=( *it )->betapluspercentage()){ if ( ( *it )->ecdecay() > 0.0 ) - html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) ); + html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) ); html.append( i18n( "Acronym of Electron Capture"," EC" ) ); if ( ( *it )->ecpercentage() < 100.0 ) - html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->ecpercentage(), 6 ) ) ); + html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecpercentage(), 6 ) ) ); } html.append( "" ); html.append( ( *it )->spin() ); html.append( "" ); if ( !( *it )->magmoment().isEmpty() ) { TQString v = KGlobal::locale()->formatNumber( ( *it )->magmoment(), false, 6 ); - html.append( i18n( "%1 %2n" ).arg( v ).arg( TQChar( 956 ) ) ); + html.append( i18n( "%1 %2n" ).tqarg( v ).tqarg( TQChar( 956 ) ) ); } html.append( "
" + i18n( "Wavelength: %1 nm" ).arg( ( *it ).wavelength ) + "" + i18n( "Intensity: %1" ).arg( ( *it ).intensity ) + "" + i18n( "Probability: %1 108s-1" ).arg( ( *it ).aki ) + "" + i18n( "Energy 1: %1" ).arg( ( *it ).energy1 ) + "" + i18n( "Energy 2: %1" ).arg( ( *it ).energy2 ) + "" + i18n( "Electron Configuration 1: %1" ).arg( ( *it ).electronconfig1 ) + "" + i18n( "Electron Configuration 2: %1" ).arg( ( *it ).electronconfig2 ) + "" + i18n( "Term 1: %1" ).arg( ( *it ).term1 ) + "" + i18n( "Term 2: %1" ).arg( ( *it ).term2 ) + "" + i18n( "J 1: %1" ).arg( ( *it ).J1 ) + "" + i18n( "J 2: %1" ).arg( ( *it ).J2 ) + "" + i18n( "Wavelength: %1 nm" ).tqarg( ( *it ).wavelength ) + "" + i18n( "Intensity: %1" ).tqarg( ( *it ).intensity ) + "" + i18n( "Probability: %1 108s-1" ).tqarg( ( *it ).aki ) + "" + i18n( "Energy 1: %1" ).tqarg( ( *it ).energy1 ) + "" + i18n( "Energy 2: %1" ).tqarg( ( *it ).energy2 ) + "" + i18n( "Electron Configuration 1: %1" ).tqarg( ( *it ).electronconfig1 ) + "" + i18n( "Electron Configuration 2: %1" ).tqarg( ( *it ).electronconfig2 ) + "" + i18n( "Term 1: %1" ).tqarg( ( *it ).term1 ) + "" + i18n( "Term 2: %1" ).tqarg( ( *it ).term2 ) + "" + i18n( "J 1: %1" ).tqarg( ( *it ).J1 ) + "" + i18n( "J 2: %1" ).tqarg( ( *it ).J2 ) + "
" - + i18n("Question %1").arg(_keducaFileIndex) + ""; + + i18n("Question %1").tqarg(_keducaFileIndex) + ""; if( _keducaFile->getTotalPoints() > 0 ) questionTextTemp += "" - + _keducaFile->getQuestion( FileRead::QF_POINTS ) + + _keducaFile->getQuestion( FileRead::TQF_POINTS ) + " " + i18n("Points") + ""; questionTextTemp += "
" - + _keducaFile->getQuestion( FileRead::QF_TEXT ) + + _keducaFile->getQuestion( FileRead::TQF_TEXT ) + "
"; _questionText->setText( questionTextTemp ); @@ -261,15 +261,15 @@ void KEducaView::showRecord() // START THE TIMER ***************************************************************** - if( _keducaFile->getQuestionInt(FileRead::QF_TIME) > 0 ) + if( _keducaFile->getQuestionInt(FileRead::TQF_TIME) > 0 ) { KMessageBox::information( this, i18n( "You have %1 seconds to complete this question.\n\n" "Press OK when you are ready." ) - .arg( _keducaFile->getQuestion(FileRead::QF_TIME) ) ); + .tqarg( _keducaFile->getQuestion(FileRead::TQF_TIME) ) ); } - int timeout = _keducaFile->getQuestionInt(FileRead::QF_TIME); + int timeout = _keducaFile->getQuestionInt(FileRead::TQF_TIME); if (timeout > 0) { if (!_timeoutTimer) @@ -290,7 +290,7 @@ void KEducaView::showRecord() void KEducaView::questionTimedOut() { - _currentTime += _keducaFile->getQuestionInt(FileRead::QF_TIME); + _currentTime += _keducaFile->getQuestionInt(FileRead::TQF_TIME); slotButtonNext(); } @@ -353,13 +353,13 @@ void KEducaView::setResults() { _correctAnswer++; if( _keducaFile->getTotalPoints() > 0 ) - _correctPoints += _keducaFile->getQuestionInt(FileRead::QF_POINTS); + _correctPoints += _keducaFile->getQuestionInt(FileRead::TQF_POINTS); } else { _incorrectAnswer++; if( _keducaFile->getTotalPoints() > 0 ) - _incorrectPoints += _keducaFile->getQuestionInt(FileRead::QF_POINTS); + _incorrectPoints += _keducaFile->getQuestionInt(FileRead::TQF_POINTS); } _results += getTableQuestion( isCorrect, correctAnswer, yourAnswer ); @@ -404,7 +404,7 @@ bool KEducaView::openURL( const KURL &url) if ( !_keducaFile->openFile( url ) ) return false; - _isInitStatus = true; + _isInittqStatus = true; _results = ""; _correctAnswer = 0; _correctPoints = 0; @@ -436,12 +436,12 @@ void KEducaView::configWrite() Settings::writeConfig(); } -/** current Status Points */ +/** current tqStatus Points */ TQString KEducaView::currentStatusPoints() { - TQString tempStatus; + TQString temptqStatus; - tempStatus = insertTable() + temptqStatus = 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 ) - tempStatus += insertRow( i18n("Total points"), true, 4 ) + temptqStatus += insertRow( i18n("Total points"), true, 4 ) + insertRow( i18n("Correct points"), TQString().setNum( _correctPoints ), i18n("Incorrect points"), TQString().setNum( _incorrectPoints ), true ); if( _keducaFile->getTotalTime() > 0 ) - tempStatus += insertRow( i18n("Time"), true, 4 ) + temptqStatus += insertRow( i18n("Time"), true, 4 ) + insertRow( i18n("Total time"), TQString().setNum( _keducaFile->getTotalTime() ), i18n("Time in tests"), TQString().setNum( _currentTime ), true ); - tempStatus += insertTableClose(); - return tempStatus; + temptqStatus += insertTableClose(); + return temptqStatus; } /** Set HTML table view with correct and incorrect answers */ @@ -476,10 +476,10 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct, _currentResults += ">"; - _currentResults += "" + _keducaFile->getQuestion( FileRead::QF_TEXT ) + ""; + _currentResults += "" + _keducaFile->getQuestion( FileRead::TQF_TEXT ) + ""; - if( _keducaFile->getQuestionInt(FileRead::QF_POINTS) > 0 ) - _currentResults += " ( " + _keducaFile->getQuestion(FileRead::QF_POINTS) + " " + i18n("Points") + " )"; + if( _keducaFile->getQuestionInt(FileRead::TQF_POINTS) > 0 ) + _currentResults += " ( " + _keducaFile->getQuestion(FileRead::TQF_POINTS) + " " + i18n("Points") + " )"; _currentResults += "
"; @@ -503,15 +503,15 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct, /** Define the next questions (random, secuencial) */ bool KEducaView::questionNext() { - if( !Settings::randomQuestions() && !_isInitStatus ) + if( !Settings::randomQuestions() && !_isInittqStatus ) { _keducaFile->recordNext(); return _keducaFile->recordEOF() ? false : true; } - if( _isInitStatus ) + if( _isInittqStatus ) { - _isInitStatus = false; + _isInittqStatus = false; if( !Settings::randomQuestions() ) return true; } diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h index aa04df5e..0e70edd3 100644 --- a/keduca/keduca/keducaview.h +++ b/keduca/keduca/keducaview.h @@ -40,12 +40,13 @@ class KGroupEduca; *@author Javier Campos */ -class KEducaView : public QWidgetStack +class KEducaView : public TQWidgetStack { Q_OBJECT + TQ_OBJECT public: - KEducaView(TQWidget *parent=0, const char *name=0); + KEducaView(TQWidget *tqparent=0, const char *name=0); ~KEducaView(); /** Open url */ bool openURL( const KURL &url); @@ -114,7 +115,7 @@ private: /** Current results */ TQString _currentResults; /** If is init window */ - bool _isInitStatus; + bool _isInittqStatus; TQTimer *_timeoutTimer; /** Num of correct answers */ int _correctAnswer; diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp index 9f7a2413..958134e2 100644 --- a/keduca/keduca/kgroupeduca.cpp +++ b/keduca/keduca/kgroupeduca.cpp @@ -22,7 +22,7 @@ #include -KGroupEduca::KGroupEduca(TQWidget *parent, const char *name ) : TQVButtonGroup(i18n("Answers"), parent, name) +KGroupEduca::KGroupEduca(TQWidget *tqparent, const char *name ) : TQVButtonGroup(i18n("Answers"), tqparent, name) { _sv = new TQScrollView(this); _sv->setVScrollBarMode(TQScrollView::Auto); @@ -54,7 +54,7 @@ void KGroupEduca::insertAnswer( const TQString& text) answer = new KCheckEduca( _vbox2 ); break; } - answer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) ); + answer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) ); answer->setText( text ); answer->show(); insert(answer); @@ -73,7 +73,7 @@ void KGroupEduca::clearAnswers() for( unsigned int i=0 ; iisChecked(); } break; case Check: { - KCheckEduca *tmpCheckButton = (KCheckEduca*) find(id); + KCheckEduca *tmpCheckButton = (KCheckEduca*) tqfind(id); if(tmpCheckButton != 0) return tmpCheckButton->isChecked(); } break; diff --git a/keduca/keduca/kgroupeduca.h b/keduca/keduca/kgroupeduca.h index 532bb890..c7e574ca 100644 --- a/keduca/keduca/kgroupeduca.h +++ b/keduca/keduca/kgroupeduca.h @@ -27,11 +27,12 @@ */ class KGroupEduca : public TQVButtonGroup { Q_OBJECT + TQ_OBJECT public: enum ButtonType { Radio, Check }; - KGroupEduca(TQWidget *parent=0, const char *name=0); + KGroupEduca(TQWidget *tqparent=0, const char *name=0); ~KGroupEduca(); /** Insert a check or radio button */ void insertAnswer( const TQString& text); diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp index 69a90fdd..d3473275 100644 --- a/keduca/keduca/kquestion.cpp +++ b/keduca/keduca/kquestion.cpp @@ -27,8 +27,8 @@ #include #include -KQuestion::KQuestion( TQWidget *parent, const char *name ) - : TQHBox( parent, name ), _countdownTimer( 0 ) +KQuestion::KQuestion( TQWidget *tqparent, const char *name ) + : TQHBox( tqparent, name ), _countdownTimer( 0 ) { initGUI(); } @@ -42,16 +42,16 @@ void KQuestion::initGUI() { setFrameShape( TQFrame::Box ); setFrameShadow( TQFrame::Plain ); - setPalette( TQPalette( Qt::white ) ); + setPalette( TQPalette( TQt::white ) ); TQVBox *picBox = new TQVBox( this ); _picture = new TQLabel( picBox, "PixmapLabel1" ); _picture->setScaledContents( FALSE ); - _picture->setPalette( TQPalette( Qt::white ) ); + _picture->setPalette( TQPalette( TQt::white ) ); _countdownWidget = new KProgress( picBox ); - _countdownWidget->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, + _countdownWidget->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) ); + _view->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) ); } /** Set text */ diff --git a/keduca/keduca/kquestion.h b/keduca/keduca/kquestion.h index 0f349580..b3368e5c 100644 --- a/keduca/keduca/kquestion.h +++ b/keduca/keduca/kquestion.h @@ -30,12 +30,13 @@ class KProgress; * The Widget that is used to display the Question. *@author Javier Campos Morales */ -class KQuestion : public QHBox +class KQuestion : public TQHBox { Q_OBJECT + TQ_OBJECT public: - KQuestion(TQWidget *parent=0, const char *name=0); + KQuestion(TQWidget *tqparent=0, const char *name=0); ~KQuestion(); /** Set pixmap */ void setPixmap( const TQPixmap pixmap); diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp index 89b3e830..80c9cf89 100644 --- a/keduca/keduca/kradioeduca.cpp +++ b/keduca/keduca/kradioeduca.cpp @@ -20,7 +20,7 @@ #include #include -KRadioEduca::KRadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name) +KRadioEduca::KRadioEduca(TQWidget *tqparent, const char *name) : TQRadioButton(tqparent,name) { _doc=0; KAcceleratorManager::setNoAccel(this); @@ -37,7 +37,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) int x, y, w, h; int extra_width, indicator_width; extra_width = 8; - indicator_width = style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); + indicator_width = tqstyle().tqpixelMetric(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 = colorGroup(); + TQColorGroup cg = tqcolorGroup(); 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, colorGroup(), 0); + _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0); if ( hasFocus() ) { -// TQRect br = style().itemRect( p, x, y, rw, rh+yo, +// TQRect br = tqstyle().tqitemRect( 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 ) ); - style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup()); } } diff --git a/keduca/keduca/kradioeduca.h b/keduca/keduca/kradioeduca.h index f23c74a1..cf1a0b56 100644 --- a/keduca/keduca/kradioeduca.h +++ b/keduca/keduca/kradioeduca.h @@ -27,9 +27,10 @@ */ class KRadioEduca : public TQRadioButton { Q_OBJECT + TQ_OBJECT public: - KRadioEduca(TQWidget *parent=0, const char *name=0); + KRadioEduca(TQWidget *tqparent=0, const char *name=0); ~KRadioEduca(); protected: diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp index f8b60562..c6182e8d 100644 --- a/keduca/keducabuilder/kcontroladdedit.cpp +++ b/keduca/keducabuilder/kcontroladdedit.cpp @@ -27,12 +27,12 @@ #include //#include <.h> -// Qt includes +// TQt includes #include #include -KControlAddEdit::KControlAddEdit(TQWidget *parent, const char *name, bool modal, WFlags f) - : KControlAddEditBase(parent, name, modal, f), +KControlAddEdit::KControlAddEdit(TQWidget *tqparent, const char *name, bool modal, WFlags f) + : KControlAddEditBase(tqparent, name, modal, f), _currentAnswerItem(0) { configRead(); @@ -72,19 +72,19 @@ void KControlAddEdit::init(FileRead *keducaFile, bool edit) /** Fill page of current record */ void KControlAddEdit::fillPage() { - _questionText->setText( _keducaFile->getQuestion( FileRead::QF_TEXT ) ); - if( !_keducaFile->getQuestion( FileRead::QF_PICTURE ).isEmpty() ) + _questionText->setText( _keducaFile->getQuestion( FileRead::TQF_TEXT ) ); + if( !_keducaFile->getQuestion( FileRead::TQF_PICTURE ).isEmpty() ) { - _questionPreview->setPixmap(_keducaFile->getQuestion(FileRead::QF_PICTURE)); - _answerPreview->setPixmap(_keducaFile->getQuestion(FileRead::QF_PICTURE)); - _questionPicture->setURL( _keducaFile->getQuestion( FileRead::QF_PICTURE ) ); + _questionPreview->setPixmap(_keducaFile->getQuestion(FileRead::TQF_PICTURE)); + _answerPreview->setPixmap(_keducaFile->getQuestion(FileRead::TQF_PICTURE)); + _questionPicture->setURL( _keducaFile->getQuestion( FileRead::TQF_PICTURE ) ); } - _questionType->setCurrentItem( _keducaFile->getQuestionInt( FileRead::QF_TYPE )-1 ); + _questionType->setCurrentItem( _keducaFile->getQuestionInt( FileRead::TQF_TYPE )-1 ); slotQuestionTypeChanged( _questionType->currentItem() ); - _questionPoint->setValue( _keducaFile->getQuestionInt( FileRead::QF_POINTS ) ); - _questionTip->setText( _keducaFile->getQuestion( FileRead::QF_TIP ) ); - _questionExplain->setText( _keducaFile->getQuestion( FileRead::QF_EXPLAIN ) ); - _questionTime->setValue( _keducaFile->getQuestionInt( FileRead::QF_TIME ) ); + _questionPoint->setValue( _keducaFile->getQuestionInt( FileRead::TQF_POINTS ) ); + _questionTip->setText( _keducaFile->getQuestion( FileRead::TQF_TIP ) ); + _questionExplain->setText( _keducaFile->getQuestion( FileRead::TQF_EXPLAIN ) ); + _questionTime->setValue( _keducaFile->getQuestionInt( FileRead::TQF_TIME ) ); _listAnswers->clear(); _keducaFile->recordAnswerFirst(); @@ -204,13 +204,13 @@ void KControlAddEdit::accept() /** Add question with form data */ void KControlAddEdit::addQuestion() { - _keducaFile->setQuestion( FileRead::QF_TEXT, _questionText->text() ); - _keducaFile->setQuestion( FileRead::QF_TYPE, _questionType->currentItem()+1 ); - _keducaFile->setQuestion( FileRead::QF_PICTURE, _questionPicture->url() ); - _keducaFile->setQuestion( FileRead::QF_POINTS, _questionPoint->value() ); - _keducaFile->setQuestion( FileRead::QF_TIME, _questionTime->value() ); - _keducaFile->setQuestion( FileRead::QF_TIP, _questionTip->text() ); - _keducaFile->setQuestion( FileRead::QF_EXPLAIN, _questionExplain->text() ); + _keducaFile->setQuestion( FileRead::TQF_TEXT, _questionText->text() ); + _keducaFile->setQuestion( FileRead::TQF_TYPE, _questionType->currentItem()+1 ); + _keducaFile->setQuestion( FileRead::TQF_PICTURE, _questionPicture->url() ); + _keducaFile->setQuestion( FileRead::TQF_POINTS, _questionPoint->value() ); + _keducaFile->setQuestion( FileRead::TQF_TIME, _questionTime->value() ); + _keducaFile->setQuestion( FileRead::TQF_TIP, _questionTip->text() ); + _keducaFile->setQuestion( FileRead::TQF_EXPLAIN, _questionExplain->text() ); _keducaFile->clearAnswers(); TQListViewItem *item = _listAnswers->firstChild(); diff --git a/keduca/keducabuilder/kcontroladdedit.h b/keduca/keducabuilder/kcontroladdedit.h index cb93329e..fb867c23 100644 --- a/keduca/keducabuilder/kcontroladdedit.h +++ b/keduca/keducabuilder/kcontroladdedit.h @@ -21,7 +21,7 @@ #include "../libkeduca/fileread.h" #include "kcontroladdeditbase.h" -// Qt forward declarations +// TQt forward declarations class TQListViewItem; /**Add or edit questions @@ -35,9 +35,10 @@ class TQListViewItem; class KControlAddEdit : public KControlAddEditBase { Q_OBJECT + TQ_OBJECT public: - KControlAddEdit(TQWidget *parent = 0, const char *name = 0, bool modal = true, WFlags f = 0); + KControlAddEdit(TQWidget *tqparent = 0, const char *name = 0, bool modal = true, WFlags f = 0); ~KControlAddEdit(); /** Init keducaFile pointer and EditMode */ void init(FileRead *keducaFile, bool editMode); diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui index 0292edf2..af9df10a 100644 --- a/keduca/keducabuilder/kcontroladdeditbase.ui +++ b/keduca/keducabuilder/kcontroladdeditbase.ui @@ -1,10 +1,10 @@ KControlAddEditBase - + KControlAddEditBase - + 0 0 @@ -12,7 +12,7 @@ 480 - + _pageQuestion @@ -26,17 +26,17 @@ 0 - + frame3 - + 125 0 - + 125 32767 @@ -55,17 +55,17 @@ unnamed - + _questionPreview - + 100 100 - + 100 100 @@ -101,14 +101,14 @@ Expanding - + 20 21 - + textLabel1 @@ -130,7 +130,7 @@ Expanding - + 20 41 @@ -139,7 +139,7 @@ - + frame5 @@ -153,42 +153,42 @@ unnamed - + textLabel2 &Question: - + AlignTop|AlignRight _questionText - + textLabel4 &Type: - + AlignVCenter|AlignRight _questionType - + textLabel3 &Picture: - + AlignVCenter|AlignRight @@ -220,80 +220,80 @@ _questionType - + textLabel5 P&oint: - + AlignVCenter|AlignRight _questionPoint - + textLabel6 Ti&me: - + AlignVCenter|AlignRight _questionTime - + textLabel7 T&ip: - + AlignVCenter|AlignRight _questionTip - + _questionTip - + textLabel8 &Explain: - + AlignTop|AlignRight _questionExplain - + _questionText - + _questionExplain - + - layout1 + tqlayout1 @@ -314,7 +314,7 @@ Expanding - + 81 20 @@ -323,9 +323,9 @@ - + - layout2 + tqlayout2 @@ -346,7 +346,7 @@ Expanding - + 131 20 @@ -359,7 +359,7 @@ - + _pageAnswer @@ -373,17 +373,17 @@ 0 - + frame3_2 - + 125 0 - + 125 32767 @@ -402,17 +402,17 @@ unnamed - + _answerPreview - + 100 100 - + 100 100 @@ -448,14 +448,14 @@ Expanding - + 20 21 - + textLabel2_2 @@ -477,7 +477,7 @@ Expanding - + 20 41 @@ -486,7 +486,7 @@ - + frame6 @@ -500,17 +500,17 @@ unnamed - + - layout11 + tqlayout11 unnamed - + - layout3 + tqlayout3 @@ -531,7 +531,7 @@ Expanding - + 31 20 @@ -540,48 +540,48 @@ - + _answerText - + textLabel1_2 &Answer: - + AlignTop|AlignRight _answerText - + textLabel2_3 &Value: - + AlignVCenter|AlignRight _answerValue - + - layout7 + tqlayout7 unnamed - + False @@ -598,14 +598,14 @@ - + textLabel3_2 &Points: - + AlignVCenter|AlignRight @@ -628,9 +628,9 @@ Horizontal - + - layout17 + tqlayout17 @@ -677,15 +677,15 @@ true - + - layout16 + tqlayout16 unnamed - + _buttonInsert @@ -696,7 +696,7 @@ &Add - + _buttonRemove @@ -717,14 +717,14 @@ Fixed - + 20 10 - + _buttonUp @@ -735,7 +735,7 @@ Move &Up - + _buttonDown @@ -756,7 +756,7 @@ Expanding - + 20 21 @@ -786,9 +786,9 @@ _questionPicture - urlSelected(const QString&) + urlSelected(const TQString&) KControlAddEditBase - slotPreviewImage(const QString&) + slotPreviewImage(const TQString&) _questionType @@ -822,9 +822,9 @@ _listAnswers - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) KControlAddEditBase - slotAnswerSelected(QListViewItem*) + slotAnswerSelected(TQListViewItem*) _answerText @@ -850,17 +850,17 @@ _questionTip _questionExplain - + slotAddAnswer() slotRemoveAnswer() slotMoveUpAnswer() slotMoveDownAnswer() - slotPreviewImage(const QString &) + slotPreviewImage(const TQString &) slotQuestionTypeChanged(int index) slotDataChanged() - slotAnswerSelected(QListViewItem *) - - + slotAnswerSelected(TQListViewItem *) + + kurlrequester.h klineedit.h diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index e46bfdc4..4c1081a2 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -27,7 +27,7 @@ #include #include -KControlHeader::KControlHeader(FileRead *keducaFile, TQWidget *parent, const char *name ) : KDialogBase(Swallow, i18n("Document Information"), Ok|Cancel, Ok, parent, name, true, true) +KControlHeader::KControlHeader(FileRead *keducaFile, TQWidget *tqparent, const char *name ) : KDialogBase(Swallow, i18n("Document Information"), Ok|Cancel, Ok, tqparent, name, true, true) { _keducaFile = keducaFile; init(); @@ -82,10 +82,10 @@ void KControlHeader::init() TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" ); GroupBox7->setTitle( i18n( "Description" ) ); GroupBox7->setColumnLayout(0, Qt::Vertical ); - GroupBox7->layout()->setSpacing( 0 ); - GroupBox7->layout()->setMargin( 0 ); - TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() ); - GroupBox7Layout->setAlignment( Qt::AlignTop ); + GroupBox7->tqlayout()->setSpacing( 0 ); + GroupBox7->tqlayout()->setMargin( 0 ); + TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() ); + GroupBox7Layout->tqsetAlignment( 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->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel10->tqsetAlignment( 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->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel11->tqsetAlignment( 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->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel12->tqsetAlignment( 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->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel9->tqsetAlignment( 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->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel8->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout13->addWidget( TextLabel8, 0, 0 ); GroupBox7Layout->addLayout( Layout13 ); @@ -147,10 +147,10 @@ void KControlHeader::init() TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" ); GroupBox8->setTitle( i18n( "Picture" ) ); GroupBox8->setColumnLayout(0, Qt::Vertical ); - GroupBox8->layout()->setSpacing( 0 ); - GroupBox8->layout()->setMargin( 0 ); - TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() ); - GroupBox8Layout->setAlignment( Qt::AlignTop ); + GroupBox8->tqlayout()->setSpacing( 0 ); + GroupBox8->tqlayout()->setMargin( 0 ); + TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() ); + GroupBox8Layout->tqsetAlignment( TQt::AlignTop ); GroupBox8Layout->setSpacing( 6 ); GroupBox8Layout->setMargin( 11 ); @@ -165,10 +165,10 @@ void KControlHeader::init() TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" ); GroupBox6->setTitle( i18n( "Author" ) ); GroupBox6->setColumnLayout(0, Qt::Vertical ); - GroupBox6->layout()->setSpacing( 0 ); - GroupBox6->layout()->setMargin( 0 ); - TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() ); - GroupBox6Layout->setAlignment( Qt::AlignTop ); + GroupBox6->tqlayout()->setSpacing( 0 ); + GroupBox6->tqlayout()->setMargin( 0 ); + TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() ); + GroupBox6Layout->tqsetAlignment( 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->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel7->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); GroupBox6Layout->addWidget( TextLabel7, 2, 0 ); TQLabel *TextLabel6 = new TQLabel( GroupBox6, "TextLabel6" ); TextLabel6->setText( i18n( "Email:" )); - TextLabel6->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel6->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); GroupBox6Layout->addWidget( TextLabel6, 1, 0 ); TQLabel *TextLabel5 = new TQLabel( GroupBox6, "TextLabel5" ); TextLabel5->setText( i18n( "Name:" )); - TextLabel5->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel5->tqsetAlignment( 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::fromLatin1("l10n/"); + TQString sub = TQString::tqfromLatin1("l10n/"); // clear the list combo->clear(); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); + TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop")); regionlist.sort(); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -261,35 +261,35 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) TQString tag = *it; int index; - index = tag.findRev('/'); + index = tag.tqfindRev('/'); if (index != -1) tag = tag.mid(index + 1); - index = tag.findRev('.'); + index = tag.tqfindRev('.'); if (index != -1) tag.truncate(index); KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name")); combo->insertSubmenu( name, '-' + tag, sub ); } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); + TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop")); countrylist.sort(); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name")); - TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name")); + TQString submenu = '-' + entry.readEntry(TQString::tqfromLatin1("Region")); TQString tag = *it; - int index = tag.findRev('/'); + int index = tag.tqfindRev('/'); tag.truncate(index); - index = tag.findRev('/'); + index = tag.tqfindRev('/'); tag = tag.mid(index+1); combo->insertLanguage(tag, name, sub, submenu); } @@ -312,12 +312,12 @@ void KControlHeader::configRead() config->setGroup("UserInfo"); if( _keducaFile->getHeader( "name" ).isEmpty() ) - _headerName->setText(config->readEntry("FullName", TQString::null )); + _headerName->setText(config->readEntry("FullName", TQString() )); else _headerName->setText( _keducaFile->getHeader("name") ); if( _keducaFile->getHeader( "email" ).isEmpty() ) - _headerEmail->setText(config->readEntry("EmailAddress", TQString::null )); + _headerEmail->setText(config->readEntry("EmailAddress", TQString() )); else _headerEmail->setText( _keducaFile->getHeader("email") ); diff --git a/keduca/keducabuilder/kcontrolheader.h b/keduca/keducabuilder/kcontrolheader.h index ff1e64ff..8370758d 100644 --- a/keduca/keducabuilder/kcontrolheader.h +++ b/keduca/keducabuilder/kcontrolheader.h @@ -33,9 +33,10 @@ class KControlHeader : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KControlHeader(FileRead *keducaFile, TQWidget *parent=0, const char *name=0); + KControlHeader(FileRead *keducaFile, TQWidget *tqparent=0, const char *name=0); ~KControlHeader(); private: diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui index 04f2411b..86fedce7 100644 --- a/keduca/keducabuilder/kcontrolheaderbase.ui +++ b/keduca/keducabuilder/kcontrolheaderbase.ui @@ -1,10 +1,10 @@ MyDialog - + MyDialog - + 0 0 @@ -19,17 +19,17 @@ unnamed - + frame3 - + 0 50 - + 32767 50 @@ -55,17 +55,17 @@ 2 - + frame4 - + 125 0 - + 125 32767 @@ -84,7 +84,7 @@ unnamed - + textLabel1 @@ -104,14 +104,14 @@ Expanding - + 60 21 - + textLabel6 @@ -121,7 +121,7 @@ - + groupBox1 @@ -132,47 +132,47 @@ unnamed - + textLabel11 Title: - + AlignVCenter|AlignRight - + textLabel9 Language: - + AlignVCenter|AlignRight - + textLabel10 Category: - + AlignVCenter|AlignRight - + textLabel7 Type: - + AlignVCenter|AlignRight @@ -186,9 +186,9 @@ _headerTitle - + - layout2 + tqlayout2 @@ -209,21 +209,21 @@ Expanding - + 61 21 - + textLabel8 Level: - + AlignVCenter|AlignRight @@ -244,7 +244,7 @@ - + groupBox2 @@ -255,14 +255,14 @@ unnamed - + textLabel2 Default picture: - + AlignJustify|AlignVCenter @@ -273,7 +273,7 @@ - + groupBox3 @@ -284,14 +284,14 @@ unnamed - + textLabel3 Name: - + AlignVCenter|AlignRight @@ -310,25 +310,25 @@ _headerEmail - + textLabel5 Web page: - + AlignVCenter|AlignRight - + textLabel4 Email: - + AlignVCenter|AlignRight @@ -344,7 +344,7 @@ Expanding - + 31 40 @@ -365,7 +365,7 @@ Horizontal - + Layout1 @@ -389,14 +389,14 @@ Expanding - + 20 20 - + buttonOk @@ -410,7 +410,7 @@ true - + buttonCancel @@ -459,7 +459,7 @@ buttonOk buttonCancel - + klineedit.h klineedit.h diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index fa7da986..93dbb334 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -60,8 +60,8 @@ static const char* const keducabuilder_data[] = { ".#############.", "..............."}; -KEducaBuilder::KEducaBuilder(TQWidget* parent, const char *name, WFlags f ) - : KMainWindow(parent,name,f), +KEducaBuilder::KEducaBuilder(TQWidget* tqparent, const char *name, WFlags f ) + : KMainWindow(tqparent,name,f), _nativeFormat("application/x-edu") { _keducaFile = new FileRead(); @@ -88,12 +88,12 @@ void KEducaBuilder::init() form2Layout->setMargin( 0 ); _split = new TQSplitter( mainView ); - _split->setOrientation( TQSplitter::Vertical ); + _split->setOrientation( Qt::Vertical ); _listAnswer = new KListBox( _split, "_listAnswer" ); - _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) ); - connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), this, TQT_SLOT( slotPreview(TQListBoxItem *) ) ); - connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), this, TQT_SLOT( slotEditbyList(TQListBoxItem *) ) ); + _listAnswer->tqsetSizePolicy( 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 *) ) ); _preview = new TQTextView( _split, "_preview" ); _preview->setFrameShape( TQTextView::NoFrame ); @@ -103,7 +103,7 @@ void KEducaBuilder::init() setCentralWidget( mainView ); if (!initialGeometrySet()) - resize( TQSize(500, 400).expandedTo(minimumSizeHint())); + resize( TQSize(500, 400).expandedTo(tqminimumSizeHint())); setupGUI( ToolBar | Keys | StatusBar | Create, "keducabuilderui.rc" ); setAutoSaveSettings(); } @@ -111,21 +111,21 @@ void KEducaBuilder::init() /** Init menu bar settings */ void KEducaBuilder::initMenuBar() { - KStdAction::openNew(this, TQT_SLOT( slotFileOpenNew() ), actionCollection()); - KStdAction::open (this, TQT_SLOT( slotFileOpen() ), actionCollection()); - (void)new KAction(i18n("Open &Gallery..."), 0, 0, this, TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery"); - _recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection()); - KStdAction::save (this, TQT_SLOT( slotFileSave() ), actionCollection()); - KStdAction::saveAs (this, TQT_SLOT( slotFileSaveAs() ), actionCollection()); - KStdAction::print (this, TQT_SLOT( slotFilePrint() ), actionCollection()); - (void)new KAction(i18n("Document Info"), "info", 0, this, TQT_SLOT( slotHeader() ), actionCollection(), "info_doc"); - KStdAction::quit(this, TQT_SLOT( close() ), actionCollection()); - - (void)new KAction(i18n("&Add..."), "addquestion", 0, this, TQT_SLOT( slotAdd() ), actionCollection(), "question_add"); - (void)new KAction(i18n("&Edit..."), "editquestion", 0, this, TQT_SLOT( slotEdit() ), actionCollection(), "question_edit"); - (void)new KAction(i18n("&Remove"), "delquestion", 0, this, TQT_SLOT( slotRemove() ), actionCollection(), "question_remove"); - (void)new KAction(i18n("&Up"), "up", 0, this, TQT_SLOT( slotUp() ), actionCollection(), "question_up"); - (void)new KAction(i18n("&Down"), "down", 0, this, TQT_SLOT( slotDown() ), actionCollection(), "question_down"); + KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenNew() ), actionCollection()); + KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection()); + (void)new KAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery"); + _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection()); + KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), actionCollection()); + KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection()); + KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint() ), actionCollection()); + (void)new KAction(i18n("Document Info"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc"); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); + + (void)new KAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add"); + (void)new KAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit"); + (void)new KAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove"); + (void)new KAction(i18n("&Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up"); + (void)new KAction(i18n("&Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down"); } /** Delete current document and start new */ @@ -148,7 +148,7 @@ void KEducaBuilder::slotFileOpenNew() /** Open new document. */ void KEducaBuilder::slotFileOpen() { - KURL url = KFileDialog::getOpenURL( TQString::null, _nativeFormat, this, i18n("Open Educa File") ); + KURL url = KFileDialog::getOpenURL( TQString(), _nativeFormat, this, i18n("Open Educa File") ); if( !url.isEmpty() ) slotFileOpenURL( url ); @@ -171,7 +171,7 @@ void KEducaBuilder::slotFileOpenURL( const KURL &url ) _keducaFile->recordFirst(); while( !_keducaFile->recordEOF() ) { - _listAnswer->insertItem( image0, _keducaFile->getQuestion( FileRead::QF_TEXT ) ); + _listAnswer->insertItem( image0, _keducaFile->getQuestion( FileRead::TQF_TEXT ) ); _keducaFile->recordNext(); } } @@ -199,7 +199,7 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item ) tmpListanswer += ""; tmpListanswer += "" : tmpListanswer += "#b84747>"; - if( _keducaFile->getQuestionInt( FileRead::QF_TYPE ) == 3 ) + if( _keducaFile->getQuestionInt( FileRead::TQF_TYPE ) == 3 ) { tmpListanswer += "" + _keducaFile->getAnswer( FileRead::AF_POINT ) @@ -214,40 +214,40 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item ) }; tmpListanswer += ""; - if( !_keducaFile->getQuestion( FileRead::QF_PICTURE ).isEmpty() ) + if( !_keducaFile->getQuestion( FileRead::TQF_PICTURE ).isEmpty() ) { tmpListanswer += ""; tmpListanswer += "
" + i18n("Question Image") + "
"; - tmpListanswer += _keducaFile->getQuestion( FileRead::QF_PICTURE ) + "
"; + tmpListanswer += _keducaFile->getQuestion( FileRead::TQF_PICTURE ) + ""; }; - if( _keducaFile->getQuestionInt( FileRead::QF_POINTS ) > 0 ) + if( _keducaFile->getQuestionInt( FileRead::TQF_POINTS ) > 0 ) { tmpListanswer += "

" + i18n("Question point") + ": "; - tmpListanswer += _keducaFile->getQuestion( FileRead::QF_POINTS ); + tmpListanswer += _keducaFile->getQuestion( FileRead::TQF_POINTS ); } - if( _keducaFile->getQuestionInt( FileRead::QF_TIME ) > 0 ) + if( _keducaFile->getQuestionInt( FileRead::TQF_TIME ) > 0 ) { tmpListanswer += "

"+i18n("Time")+": "; - tmpListanswer += _keducaFile->getQuestion( FileRead::QF_TIME ); + tmpListanswer += _keducaFile->getQuestion( FileRead::TQF_TIME ); tmpListanswer += i18n(" seconds

"); } - if( !_keducaFile->getQuestion( FileRead::QF_TIP ).isEmpty() ) + if( !_keducaFile->getQuestion( FileRead::TQF_TIP ).isEmpty() ) { tmpListanswer += "

" + i18n("Tip") +": "; - tmpListanswer += _keducaFile->getQuestion( FileRead::QF_TIP ); + tmpListanswer += _keducaFile->getQuestion( FileRead::TQF_TIP ); tmpListanswer += "

"; } - if( !_keducaFile->getQuestion( FileRead::QF_EXPLAIN ).isEmpty() ) + if( !_keducaFile->getQuestion( FileRead::TQF_EXPLAIN ).isEmpty() ) { tmpListanswer += "

" + i18n("Explain") + ":" - + _keducaFile->getQuestion( FileRead::QF_EXPLAIN ) + + _keducaFile->getQuestion( FileRead::TQF_EXPLAIN ) + "

"; } @@ -284,7 +284,7 @@ bool KEducaBuilder::currentFileMayBeReplaced() int res = KMessageBox::warningYesNoCancel( widget(), // ask the user to save i18n( "The document \"%1\" has been modified.\n" - "Do you want to save it?" ).arg( _keducaFile->getCurrentURL().fileName() ), + "Do you want to save it?" ).tqarg( _keducaFile->getCurrentURL().fileName() ), i18n( "Save Document?" ), KStdGuiItem::save(), KStdGuiItem::discard() ); switch (res) { @@ -324,7 +324,7 @@ void KEducaBuilder::slotAdd() edit.init( _keducaFile, false ); if( !edit.exec() ) return; - _listAnswer->insertItem( image0, _keducaFile->getQuestion( FileRead::QF_TEXT ) ); + _listAnswer->insertItem( image0, _keducaFile->getQuestion( FileRead::TQF_TEXT ) ); _listAnswer->setCurrentItem( _listAnswer->count()-1 ); slotPreview( _listAnswer->item(_listAnswer->currentItem()) ); } @@ -340,7 +340,7 @@ void KEducaBuilder::slotEdit() edit.init( _keducaFile, true ); if( edit.exec() ) { - _listAnswer->changeItem( image0, _keducaFile->getQuestion( FileRead::QF_TEXT ), _listAnswer->currentItem() ); + _listAnswer->changeItem( image0, _keducaFile->getQuestion( FileRead::TQF_TEXT ), _listAnswer->currentItem() ); slotPreview( _listAnswer->item(_listAnswer->currentItem()) ); } } @@ -409,7 +409,7 @@ bool KEducaBuilder::fileSaveAs() TQCheckBox *saveCompressedCheckBox = new TQCheckBox( i18n( "Compress the file" ), 0 ); saveCompressedCheckBox->setChecked( true ); - KFileDialog *dialog=new KFileDialog(TQString::null, TQString::null, this, "file dialog", true, saveCompressedCheckBox); + KFileDialog *dialog=new KFileDialog(TQString(), TQString(), this, "file dialog", true, saveCompressedCheckBox); dialog->setCaption( i18n("Save Document As") ); dialog->setKeepLocation( true ); dialog->setOperationMode( KFileDialog::Saving ); @@ -485,7 +485,7 @@ void KEducaBuilder::slotFilePrint() TQString file = _keducaFile->getCurrentURL().fileName(); if (file.isEmpty()) file = i18n("Test"); - if(printer->setup(this, i18n("Print %1").arg(file))) + if(printer->setup(this, i18n("Print %1").tqarg(file))) { TQPaintDeviceMetrics metrics(printer); TQPainter p; @@ -502,7 +502,7 @@ void KEducaBuilder::slotFilePrint() while(!_keducaFile->recordEOF()) { p.drawText( 10, yPos+margin, metrics.width(), fm.lineSpacing(), - ExpandTabs | DontClip, _keducaFile->getQuestion(FileRead::QF_TEXT) ); + ExpandTabs | DontClip, _keducaFile->getQuestion(FileRead::TQF_TEXT) ); yPos += fm.lineSpacing(); p.drawLine(10, yPos+margin, metrics.width(), yPos+margin); @@ -533,7 +533,7 @@ bool KEducaBuilder::checkSave() _keducaFile->getHeader("level").isEmpty() || _keducaFile->getHeader("language").isEmpty() ) { - if (KMessageBox::warningContinueCancel(this, i18n("Unable to save file.\n\nYou must complete the Document Info\n(Only the description is necessary)"), TQString::null, i18n("Complete Document Info...")) + if (KMessageBox::warningContinueCancel(this, i18n("Unable to save file.\n\nYou must complete the Document Info\n(Only the description is necessary)"), TQString(), i18n("Complete Document Info...")) == KMessageBox::Continue) { if (slotHeader()!=KControlHeader::Accepted) return false; @@ -544,7 +544,7 @@ bool KEducaBuilder::checkSave() if( _listAnswer->count() < 1 ) { if (KMessageBox::warningContinueCancel(this, i18n("Unable to save file.\n\nYou must insert a question."), - TQString::null, i18n("Insert Question"))==KMessageBox::Continue) + TQString(), i18n("Insert Question"))==KMessageBox::Continue) slotAdd(); else return false; diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h index c3a736a7..93d9cce1 100644 --- a/keduca/keducabuilder/keducabuilder.h +++ b/keduca/keducabuilder/keducabuilder.h @@ -36,9 +36,10 @@ class KEducaBuilder : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KEducaBuilder(TQWidget* parent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose); + KEducaBuilder(TQWidget* tqparent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose); ~KEducaBuilder(); /** start a dialog that asks the user what he wants to do to start*/ bool startChooser(); diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index 8528b6ba..a8fd5aaa 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -29,8 +29,8 @@ /** */ -KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const char* name, bool modal, WFlags fl) - :KEducaEditorStartDialogBase(parent, name, modal, fl), +KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * tqparent, const char* name, bool modal, WFlags fl) + :KEducaEditorStartDialogBase(tqparent, name, modal, fl), _choice(NewDoc), _maxRecentDocumentItems(20) { @@ -62,8 +62,8 @@ void KEducaEditorStartDialog::buildRecentFilesList() // read file list for( unsigned int i = 1 ; i <= _maxRecentDocumentItems ; i++ ) { - key = TQString( "File%1" ).arg( i ); - value = config->readEntry( key, TQString::null ); + key = TQString( "File%1" ).tqarg( i ); + value = config->readEntry( key, TQString() ); if (!value.isNull()) recentDocumentCB->insertURL( KURL(value) ); diff --git a/keduca/keducabuilder/keducaeditorstartdialog.h b/keduca/keducabuilder/keducaeditorstartdialog.h index dd163848..1823c3d7 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.h +++ b/keduca/keducabuilder/keducaeditorstartdialog.h @@ -31,11 +31,12 @@ class KEducaBuilder; */ class KEducaEditorStartDialog : public KEducaEditorStartDialogBase{ Q_OBJECT + TQ_OBJECT public: enum {Rejected=0, OpenDoc=1, OpenRecentDoc=2, Gallery=3, NewDoc=4}StartChoice; /** Constructor. */ - KEducaEditorStartDialog(KEducaBuilder * parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KEducaEditorStartDialog(KEducaBuilder * tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); /** Destructor. */ virtual ~KEducaEditorStartDialog(); diff --git a/keduca/keducabuilder/keducaeditorstartdialogbase.ui b/keduca/keducabuilder/keducaeditorstartdialogbase.ui index 0cb69e39..65ad01f3 100644 --- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui +++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui @@ -1,10 +1,10 @@ KEducaEditorStartDialogBase - + KEducaEditorStartDialogBase - + 0 0 @@ -28,7 +28,7 @@ 6 - + startChoiceBtnGrp @@ -51,7 +51,7 @@ 6 - + Layout13 @@ -65,7 +65,7 @@ 6 - + openDocumentRB @@ -76,7 +76,7 @@ Open an &existing document: - + Layout4 @@ -100,7 +100,7 @@ Fixed - + 20 20 @@ -116,7 +116,7 @@ - + openRecentDocumentRB @@ -130,7 +130,7 @@ false - + Layout15 @@ -154,7 +154,7 @@ Fixed - + 20 21 @@ -168,7 +168,7 @@ - + radioButton4 @@ -176,7 +176,7 @@ Open with Internet gallery browser - + newDocumentRB @@ -203,7 +203,7 @@ Horizontal - + Layout1 @@ -217,7 +217,7 @@ 6 - + buttonHelp @@ -238,14 +238,14 @@ Expanding - + 20 20 - + buttonOk @@ -259,7 +259,7 @@ true - + buttonCancel @@ -312,7 +312,7 @@ openDocumentRB openRecentDocumentRB - + klineedit.h kpushbutton.h diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp index 1d86c09e..0371b7af 100644 --- a/keduca/keducabuilder/klangcombo.cpp +++ b/keduca/keducabuilder/klangcombo.cpp @@ -3,7 +3,7 @@ * * Copyright (c) 1999-2000 Hans Petter Bieker * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -31,21 +31,21 @@ KLanguageCombo::~KLanguageCombo () { } -KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name) - : KTagComboBox(parent, name) +KLanguageCombo::KLanguageCombo (TQWidget * tqparent, const char *name) + : KTagComboBox(tqparent, name) { } void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu) { - TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")"); - TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png"))); + TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")"); + TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/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::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")"); + TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")"); changeItem(output, i); } diff --git a/keduca/keducabuilder/klangcombo.h b/keduca/keducabuilder/klangcombo.h index 2aca5753..0dc13d01 100644 --- a/keduca/keducabuilder/klangcombo.h +++ b/keduca/keducabuilder/klangcombo.h @@ -3,7 +3,7 @@ * * Copyright (c) 1999-2000 Hans Petter Bieker * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -35,12 +35,13 @@ class KLanguageCombo : public KTagComboBox { Q_OBJECT + TQ_OBJECT public: - KLanguageCombo(TQWidget *parent=0, const char *name=0); + KLanguageCombo(TQWidget *tqparent=0, const char *name=0); ~KLanguageCombo(); - void insertLanguage(const TQString& path, const TQString& name, const TQString& sub = TQString::null, const TQString &submenu = TQString::null); + void insertLanguage(const TQString& path, const TQString& name, const TQString& sub = TQString(), const TQString &submenu = TQString()); void changeLanguage(const TQString& name, int i); }; diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp index 5a84574c..f89f14df 100644 --- a/keduca/keducabuilder/ktagcombobox.cpp +++ b/keduca/keducabuilder/ktagcombobox.cpp @@ -3,7 +3,7 @@ * * Copyright (c) 1999-2000 Hans Petter Bieker * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -36,8 +36,8 @@ KTagComboBox::~KTagComboBox () delete _tags; } -KTagComboBox::KTagComboBox (TQWidget * parent, const char *name) - : TQComboBox(parent, name) +KTagComboBox::KTagComboBox (TQWidget * tqparent, const char *name) + : TQComboBox(tqparent, name) { _popup = new TQPopupMenu(this); _tags = new TQStringList; @@ -84,7 +84,7 @@ void KTagComboBox::internalActivate( int index ) if (_current == index) return; _current = index; emit activated( index ); - repaint(); + tqrepaint(); } void KTagComboBox::internalHighlight( int index ) @@ -105,12 +105,12 @@ int KTagComboBox::count() const static inline TQPopupMenu *checkInsertIndex(TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu, int *index) { - int pos = tags->findIndex(submenu); + int pos = tags->tqfindIndex(submenu); TQPopupMenu *pi = 0; if (pos != -1) { - TQMenuItem *p = popup->findItem(popup->idAt(pos)); + TQMenuItem *p = popup->tqfindItem(popup->idAt(pos)); pi = p?p->popup():0; } if (!pi) pi = popup; @@ -139,7 +139,7 @@ void KTagComboBox::insertSeparator(const TQString &submenu, int index) { TQPopupMenu *pi = checkInsertIndex(_popup, _tags, submenu, &index); pi->insertSeparator(index); - _tags->append(TQString::null); + _tags->append(TQString()); } void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu, int index) @@ -158,7 +158,7 @@ void KTagComboBox::changeItem( const TQString &text, int index ) { _popup->changeItem( text, index); if (index == _current) - repaint(); + tqrepaint(); } void KTagComboBox::paintEvent( TQPaintEvent * ev) @@ -170,7 +170,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) // Text TQRect clip(2, 2, width() - 4, height() - 4); if ( hasFocus()) - p.setPen( colorGroup().highlightedText() ); + p.setPen( tqcolorGroup().highlightedText() ); p.drawText(clip, AlignCenter | SingleLine, _popup->text( _current )); // Icon @@ -183,7 +183,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) bool KTagComboBox::containsTag( const TQString &str ) const { - return _tags->contains(str) > 0; + return _tags->tqcontains(str) > 0; } TQString KTagComboBox::currentTag() const @@ -196,7 +196,7 @@ TQString KTagComboBox::tag(int i) const if (i < 0 || i >= count()) { kdDebug() << "KTagComboBox::tag(), unknown tag " << i << endl; - return TQString::null; + return TQString(); } return *_tags->at(i); } @@ -210,12 +210,12 @@ void KTagComboBox::setCurrentItem(int i) { if (i < 0 || i >= count()) return; _current = i; - repaint(); + tqrepaint(); } void KTagComboBox::setCurrentItem(const TQString &code) { - int i = _tags->findIndex(code); + int i = _tags->tqfindIndex(code); if (code.isNull()) i = 0; if (i != -1) diff --git a/keduca/keducabuilder/ktagcombobox.h b/keduca/keducabuilder/ktagcombobox.h index ffeb2cda..ef0042ec 100644 --- a/keduca/keducabuilder/ktagcombobox.h +++ b/keduca/keducabuilder/ktagcombobox.h @@ -3,7 +3,7 @@ * * Copyright (c) 1999-2000 Hans Petter Bieker * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -36,18 +36,19 @@ class TQStringList; * * It has also support for sub menues. */ -class KTagComboBox : public QComboBox +class KTagComboBox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - KTagComboBox(TQWidget *parent=0, const char *name=0); + KTagComboBox(TQWidget *tqparent=0, const char *name=0); ~KTagComboBox(); - void insertItem(const TQIconSet& icon, const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1 ); - void insertItem(const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1 ); - void insertSeparator(const TQString &submenu = TQString::null, int index=-1 ); - void insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1); + void insertItem(const TQIconSet& icon, const TQString &text, const TQString &tag, const TQString &submenu = TQString(), int index=-1 ); + void insertItem(const TQString &text, const TQString &tag, const TQString &submenu = TQString(), int index=-1 ); + void insertSeparator(const TQString &submenu = TQString(), int index=-1 ); + void insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu = TQString(), int index=-1); void changeItem( const TQString &text, int index ); int count() const; diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 7632b6fd..1fb03518 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -29,8 +29,8 @@ #include #include -FileRead::FileRead( TQObject *parent, const char *name ) - :TQObject(parent, name), +FileRead::FileRead( TQObject *tqparent, const char *name ) + :TQObject(tqparent, name), _changed(false), _tmpfile(0) { @@ -79,7 +79,7 @@ bool FileRead::loadFile(const TQString &filename) } else { - doc.setContent(qUncompress(file.readAll())); + doc.setContent(tqUncompress(file.readAll())); } TQDomElement docElem = doc.documentElement(); @@ -118,21 +118,21 @@ bool FileRead::loadFile(const TQString &filename) insertQuestion(); // --------------------- QUESTION ATTRIBUTE------------------------ TQDomElement elementNODE = dnList.item(i).toElement(); - setQuestion( QF_TYPE, elementNODE.attribute( "type", "1" ).toInt() ); - setQuestion( QF_PICTURE, elementNODE.attribute( "image", "" ) ); - setQuestion( QF_TIME, elementNODE.attribute( "time", "0" ).toInt() ); - setQuestion( QF_POINTS, elementNODE.attribute( "points", "0" ).toInt() ); + setQuestion( TQF_TYPE, elementNODE.attribute( "type", "1" ).toInt() ); + setQuestion( TQF_PICTURE, elementNODE.attribute( "image", "" ) ); + setQuestion( TQF_TIME, elementNODE.attribute( "time", "0" ).toInt() ); + setQuestion( TQF_POINTS, elementNODE.attribute( "points", "0" ).toInt() ); TQDomNodeList quList = elementNODE.childNodes(); for( unsigned int x = 0; x < quList.count(); ++x) { // --------------------- QUESTION AND RESPONSES------------------ TQDomElement element = quList.item(x).toElement(); - if( element.tagName() == "text" ) setQuestion( QF_TEXT, element.text() ); + if( element.tagName() == "text" ) setQuestion( TQF_TEXT, element.text() ); if( element.tagName() == "true" ) setAnswer( element.text(), true, element.attribute( "points", "0" ).toInt() ); if( element.tagName() == "false" ) setAnswer( element.text(), false,element.attribute( "points", "0" ).toInt() ); - if( element.tagName() == "tip" ) setQuestion( QF_TIP, element.text() ); - if( element.tagName() == "explain" ) setQuestion( QF_EXPLAIN, element.text() ); + if( element.tagName() == "tip" ) setQuestion( TQF_TIP, element.text() ); + if( element.tagName() == "explain" ) setQuestion( TQF_EXPLAIN, element.text() ); } } @@ -164,19 +164,19 @@ bool FileRead::loadFile(const TQString &filename) void FileRead::setQuestion( QuestionField field, const TQString& text) { -// QF_text, QF_picture, QF_type, QF_time, QF_tip, QF_explain +// TQF_text, TQF_picture, TQF_type, TQF_time, TQF_tip, TQF_explain switch( field ) { - case QF_TEXT: + case TQF_TEXT: (*_recordQuestions).text = text; break; - case QF_PICTURE: + case TQF_PICTURE: (*_recordQuestions).picture = text; break; - case QF_TIP: + case TQF_TIP: (*_recordQuestions).tip = text; break; - case QF_EXPLAIN: + case TQF_EXPLAIN: (*_recordQuestions).explain = text; break; default: @@ -190,13 +190,13 @@ void FileRead::setQuestion( QuestionField field, int value ) { switch( field ) { - case QF_TYPE: + case TQF_TYPE: (*_recordQuestions).type = value; break; - case QF_TIME: + case TQF_TIME: (*_recordQuestions).time = value; break; - case QF_POINTS: + case TQF_POINTS: (*_recordQuestions).points = value; break; default: @@ -208,7 +208,7 @@ void FileRead::setQuestion( QuestionField field, int value ) void FileRead::setResult( ResultField field, const TQString& text) { -// RS_text, QF_picture +// RS_text, TQF_picture switch( field ) { case RS_TEXT: @@ -407,26 +407,26 @@ unsigned int FileRead::recordAnswerCount() TQString FileRead::getQuestion( QuestionField field ) { -// QF_text, QF_picture, QF_type, QF_time, QF_tip, QF_explain +// TQF_text, TQF_picture, TQF_type, TQF_time, TQF_tip, TQF_explain switch( field ) { - case QF_TEXT: + case TQF_TEXT: return (*_recordQuestions).text; break; - case QF_PICTURE: + case TQF_PICTURE: // return getPictureLocal( (*_recordQuestions).picture ); return( (*_recordQuestions).picture ); break; - case QF_POINTS: + case TQF_POINTS: return TQString().setNum( (*_recordQuestions).points ); break; - case QF_TIME: + case TQF_TIME: return TQString().setNum( (*_recordQuestions).time ); break; - case QF_TIP: + case TQF_TIP: return (*_recordQuestions).tip; break; - case QF_EXPLAIN: + case TQF_EXPLAIN: return (*_recordQuestions).explain; break; default: @@ -440,13 +440,13 @@ int FileRead::getQuestionInt( QuestionField field ) { switch( field ) { - case QF_TYPE: + case TQF_TYPE: return (*_recordQuestions).type; break; - case QF_TIME: + case TQF_TIME: return (*_recordQuestions).time; break; - case QF_POINTS: + case TQF_POINTS: return (*_recordQuestions).points; break; default: @@ -559,8 +559,8 @@ TQString FileRead::getPicture() { TQString picture; - if( !getQuestion(QF_PICTURE).isEmpty() ) - picture = getQuestion(QF_PICTURE); + if( !getQuestion(TQF_PICTURE).isEmpty() ) + picture = getQuestion(TQF_PICTURE); else if( !(_header["image"]).isEmpty() ) picture = _header["image"]; else @@ -689,7 +689,7 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom TQFile file(filename); TQStringList copyJOB; - stream.setDevice(&buffer); + stream.setDevice(TQT_TQIODEVICE(&buffer)); if ( (!file.open(IO_WriteOnly)) || (!buffer.open(IO_WriteOnly)) ) { @@ -750,20 +750,20 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom while ( !recordEOF() ) { TQDomElement question = doc.createElement("question"); - if( !getQuestion( QF_PICTURE ).isEmpty() ) + if( !getQuestion( TQF_PICTURE ).isEmpty() ) { if( copyimages ) { - copyJOB.append( getQuestion( QF_PICTURE ) ); - question.setAttribute("image", TQFileInfo( getQuestion( QF_PICTURE ) ).fileName() ); + copyJOB.append( getQuestion( TQF_PICTURE ) ); + question.setAttribute("image", TQFileInfo( getQuestion( TQF_PICTURE ) ).fileName() ); } else { - question.setAttribute("image", getQuestion( QF_PICTURE ) ); + question.setAttribute("image", getQuestion( TQF_PICTURE ) ); } } - question.setAttribute( "type", getQuestionInt( QF_TYPE ) ); - if( getQuestionInt( QF_POINTS ) > 0 ) question.setAttribute( "points", getQuestion( QF_POINTS ) ); - if( getQuestionInt( QF_TIME ) > 0 ) question.setAttribute( "time", getQuestion( QF_TIME ) ); - insertXML( doc, question, "text", getQuestion( QF_TEXT ) ); + question.setAttribute( "type", getQuestionInt( TQF_TYPE ) ); + if( getQuestionInt( TQF_POINTS ) > 0 ) question.setAttribute( "points", getQuestion( TQF_POINTS ) ); + if( getQuestionInt( TQF_TIME ) > 0 ) question.setAttribute( "time", getQuestion( TQF_TIME ) ); + insertXML( doc, question, "text", getQuestion( TQF_TEXT ) ); recordAnswerFirst(); while( !recordAnswerEOF() ) @@ -786,8 +786,8 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom recordAnswerNext(); }; - if( !getQuestion( QF_TIP ).isEmpty() ) insertXML( doc, question, "tip", getQuestion( QF_TIP ) ); - if( !getQuestion( QF_EXPLAIN ).isEmpty() ) insertXML( doc, question, "explain", getQuestion( QF_EXPLAIN ) ); + if( !getQuestion( TQF_TIP ).isEmpty() ) insertXML( doc, question, "tip", getQuestion( TQF_TIP ) ); + if( !getQuestion( TQF_EXPLAIN ).isEmpty() ) insertXML( doc, question, "explain", getQuestion( TQF_EXPLAIN ) ); NodeData.appendChild( question ); recordNext(); @@ -796,7 +796,7 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom doc.save( stream, 4); buffer.close(); if ( saveCompressed ) - file.writeBlock(qCompress(data)); + file.writeBlock(tqCompress(data)); else file.writeBlock(data); file.close(); @@ -862,7 +862,7 @@ bool FileRead::saveResults( const TQString &filename, const TQString &results ) TQFile file(filename); TQStringList copyJOB; - stream.setDevice(&file); + stream.setDevice(TQT_TQIODEVICE(&file)); if(!file.open(IO_WriteOnly)) { @@ -875,20 +875,20 @@ bool FileRead::saveResults( const TQString &filename, const TQString &results ) } /** Insert xml format data */ -void FileRead::insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &tagName, const TQString &data) +void FileRead::insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &tagName, const TQString &data) { TQDomElement domELEMENT = doc.createElement( tagName ); TQDomText DATAelement = doc.createTextNode( data ); - parent.appendChild( domELEMENT ); + tqparent.appendChild( domELEMENT ); domELEMENT.appendChild( DATAelement ); } /** Insert xml data format */ -void FileRead::insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &data) +void FileRead::insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &data) { TQDomText DATAelement = doc.createTextNode( data ); - parent.appendChild( DATAelement ); + tqparent.appendChild( DATAelement ); } /** Get Header */ @@ -905,7 +905,7 @@ void FileRead::setHeader( const TQString field, const TQString value) if( (_header[field]).isEmpty() ) _header.insert( field, value ); else - _header.replace( field, value ); + _header.tqreplace( field, value ); } /** is Multi Answer */ diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h index cbc89449..9240f938 100644 --- a/keduca/libkeduca/fileread.h +++ b/keduca/libkeduca/fileread.h @@ -34,11 +34,12 @@ class TQFile; class FileRead : public TQObject { Q_OBJECT + TQ_OBJECT public: - FileRead( TQObject *parent=0, const char *name=0 ); + FileRead( TQObject *tqparent=0, const char *name=0 ); virtual ~FileRead(); - enum QuestionField { QF_TEXT, QF_PICTURE, QF_POINTS, QF_TYPE, QF_TIME, QF_TIP, QF_EXPLAIN }; + enum QuestionField { TQF_TEXT, TQF_PICTURE, TQF_POINTS, TQF_TYPE, TQF_TIME, TQF_TIP, TQF_EXPLAIN }; enum AnswerField { AF_TEXT, AF_VALUE, AF_POINT }; enum ResultField { RS_TEXT, RS_MIN, RS_MAX, RS_PICTURE }; @@ -218,9 +219,9 @@ private: // Private methods /** Insert xml format data */ - void insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &tagName, const TQString &data); + void insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &tagName, const TQString &data); /** Insert xml data format */ - void insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &data); + void insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &data); protected: /** Open keduca file. This function does the actual work and expects a local filename . */ diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp index b1ec43e2..c7d6e4c9 100644 --- a/keduca/libkeduca/kgallerydialog.cpp +++ b/keduca/libkeduca/kgallerydialog.cpp @@ -30,8 +30,8 @@ #include #include -KGalleryDialog::KGalleryDialog(TQWidget *parent, const char *name ) - :KGalleryDialogBase(parent,name) +KGalleryDialog::KGalleryDialog(TQWidget *tqparent, const char *name ) + :KGalleryDialogBase(tqparent,name) { configRead(); } diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h index 41383091..419834d3 100644 --- a/keduca/libkeduca/kgallerydialog.h +++ b/keduca/libkeduca/kgallerydialog.h @@ -35,8 +35,9 @@ namespace KIO { class Job; } class KGalleryDialog : public KGalleryDialogBase { Q_OBJECT + TQ_OBJECT public: - KGalleryDialog(TQWidget *parent=0, const char *name=0); + KGalleryDialog(TQWidget *tqparent=0, const char *name=0); ~KGalleryDialog(); /** Open keduca file. This function can open a remote or local url. */ bool openFile( const KURL &url ); diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui index ccd51e46..3adb85ee 100644 --- a/keduca/libkeduca/kgallerydialogbase.ui +++ b/keduca/libkeduca/kgallerydialogbase.ui @@ -1,10 +1,10 @@ KGalleryDialogBase - + KGalleryDialogBase - + 0 0 @@ -22,49 +22,49 @@ unnamed - + - layout13 + tqlayout13 unnamed - + - layout4 + tqlayout4 unnamed - + textLabel1_2 Name: - + AlignVCenter - + lineName - + - layout3 + tqlayout3 unnamed - + textLabel2 @@ -72,16 +72,16 @@ Address: - + lineAddress - + - layout12 + tqlayout12 @@ -97,18 +97,18 @@ Preferred - + 20 10 - + buttonAdd - + 100 0 @@ -136,7 +136,7 @@ Horizontal - + _split @@ -151,7 +151,7 @@ Horizontal - + Servers @@ -184,7 +184,7 @@ true - + Description @@ -262,19 +262,19 @@ - + - layout2 + tqlayout2 unnamed - + buttonHelp - + 100 0 @@ -294,18 +294,18 @@ Expanding - + 40 20 - + buttonOpen - + 100 0 @@ -318,11 +318,11 @@ true - + buttonCancel - + 100 0 @@ -357,14 +357,14 @@ listServers - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) KGalleryDialogBase - slotServerSelected(QListViewItem*) + slotServerSelected(TQListViewItem*) - + slotButtonAdd() - slotServerSelected(QListViewItem*) - - + slotServerSelected(TQListViewItem*) + + diff --git a/kgeography/Changelog b/kgeography/Changelog index f54c280c..c4c23b7d 100644 --- a/kgeography/Changelog +++ b/kgeography/Changelog @@ -88,7 +88,7 @@ * RightWidget is really LeftWidget ¬.¬ * There is no need to store p_rightWidget as a class member * Bump version to 0.2.1 - * Improve layouting of mapasker + * Improve tqlayouting of mapasker * Make the scrollbar work also when clicking on the arrows (sliderMoved -> valueChanged) * Fix resizing bug in mapWidget that showed a inexistant part of the diff --git a/kgeography/data/africa.kgm b/kgeography/data/africa.kgm index a5654132..718997b6 100644 --- a/kgeography/data/africa.kgm +++ b/kgeography/data/africa.kgm @@ -138,7 +138,7 @@ - Democratic Republic of the Congo + Detqmocratic Republic of the Congo congo_kinshasa.png Kinshasa diff --git a/kgeography/data/world.kgm b/kgeography/data/world.kgm index 7d1701d7..2acca4f0 100644 --- a/kgeography/data/world.kgm +++ b/kgeography/data/world.kgm @@ -111,7 +111,7 @@ - Democratic Republic of the Congo + Detqmocratic Republic of the Congo congo_kinshasa.png Kinshasa @@ -1730,7 +1730,7 @@ - Democratic People's Republic of Korea + Detqmocratic People's Republic of Korea nkorea.png Pyeongyang diff --git a/kgeography/src/answer.cpp b/kgeography/src/answer.cpp index f4931df3..428ceb20 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 -> setAlignment(Qt::AlignHCenter); + l -> tqsetAlignment(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] -> colorGroup().highlight(); - fore = widgets[0] -> colorGroup().highlightedText(); + back = widgets[0] -> tqcolorGroup().highlight(); + fore = widgets[0] -> tqcolorGroup().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 c6d9d292..fcc219dc 100644 --- a/kgeography/src/answersdialog.cpp +++ b/kgeography/src/answersdialog.cpp @@ -17,7 +17,7 @@ #include "answer.h" #include "answersdialog.h" -answersDialog::answersDialog(TQWidget *parent, const TQValueVector &userAnswers, TQString question, int correctAnswers) : KDialogBase(parent, 0, true, i18n("Your Answers Were"), Ok) +answersDialog::answersDialog(TQWidget *tqparent, const TQValueVector &userAnswers, TQString question, int correctAnswers) : KDialogBase(tqparent, 0, true, i18n("Your Answers Were"), Ok) { TQLabel *l1, *l2, *l3; TQFont boldFont, bigFont; @@ -40,7 +40,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector & bigFont.setPointSize(24); l1 = new TQLabel(question, p_container); l1 -> setFont(bigFont); - l1 -> setAlignment(Qt::AlignCenter); + l1 -> tqsetAlignment(TQt::AlignCenter); lay->addMultiCellWidget(l1, 0, 0, 0, 4); // Headers @@ -67,8 +67,8 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector & 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.").arg(correctAnswers).arg(totalAnswers), p_container); - l1 -> setAlignment(Qt::AlignCenter); + l1 = new TQLabel(i18n("You answered correctly %1 out of %2 questions.").tqarg(correctAnswers).tqarg(totalAnswers), p_container); + l1 -> tqsetAlignment(TQt::AlignCenter); lay->addMultiCellWidget(l1, totalAnswers + 4, totalAnswers + 4, 0, 4); p_sv -> addChild(p_container); diff --git a/kgeography/src/answersdialog.h b/kgeography/src/answersdialog.h index 1b3b754d..60686923 100644 --- a/kgeography/src/answersdialog.h +++ b/kgeography/src/answersdialog.h @@ -23,7 +23,7 @@ class userAnswer; class answersDialog : public KDialogBase { public: - answersDialog(TQWidget *parent, const TQValueVector &userAnswers, TQString question, int correctAnswers); + answersDialog(TQWidget *tqparent, const TQValueVector &userAnswers, TQString question, int correctAnswers); protected: void showEvent(TQShowEvent *e); diff --git a/kgeography/src/askwidget.cpp b/kgeography/src/askwidget.cpp index 87d1d09a..cd0d07a4 100644 --- a/kgeography/src/askwidget.cpp +++ b/kgeography/src/askwidget.cpp @@ -16,12 +16,12 @@ #include "askwidget.h" #include "map.h" -askWidget::askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool showLabel) : TQWidget(parent), p_map(m), p_count(count) +askWidget::askWidget(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count, bool showLabel) : TQWidget(tqparent), p_map(m), p_count(count) { if (showLabel) { p_answers = new TQLabel(w); - p_answers -> setAlignment(AlignTop | AlignHCenter); + p_answers -> tqsetAlignment(AlignTop | AlignHCenter); resetAnswers(); p_answers -> show(); } @@ -72,7 +72,7 @@ void askWidget::nextQuestion() if (p_asked.count() < p_count) { aux = p_map -> getRandomDivision(isClickOnDivision()); - while (p_asked.find(aux) != p_asked.end()) aux = p_map -> getRandomDivision(isClickOnDivision()); + while (p_asked.tqfind(aux) != p_asked.end()) aux = p_map -> getRandomDivision(isClickOnDivision()); p_asked << aux; nextQuestionHook(aux); } @@ -98,7 +98,7 @@ void askWidget::resetAnswers() void askWidget::updateLabel() { - p_answers -> setText(i18n("Correct answers: %1/%2").arg(p_correctAnswers).arg(p_correctAnswers + p_incorrectAnswers)); + p_answers -> setText(i18n("Correct answers: %1/%2").tqarg(p_correctAnswers).tqarg(p_correctAnswers + p_incorrectAnswers)); } #include "askwidget.moc" diff --git a/kgeography/src/askwidget.h b/kgeography/src/askwidget.h index 49c2ea2b..2627296c 100644 --- a/kgeography/src/askwidget.h +++ b/kgeography/src/askwidget.h @@ -20,11 +20,12 @@ class TQLabel; class KGmap; -class askWidget : public QWidget +class askWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool showLabel = true); + askWidget(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count, bool showLabel = true); virtual ~askWidget(); virtual TQString getQuestionHook() const = 0; diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp index dc6d526d..5774ba10 100644 --- a/kgeography/src/boxasker.cpp +++ b/kgeography/src/boxasker.cpp @@ -23,7 +23,7 @@ #include "boxasker.h" #include "map.h" -boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWidget(parent, m, w, count) +boxAsker::boxAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : askWidget(tqparent, m, w, count) { p_lay = new TQVBoxLayout(this); @@ -33,7 +33,7 @@ boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWid for(int i = 0; i < 4; i++) { p_rb[i] = new TQRadioButton(bg); - p_rb[i]->setFocusPolicy(TQWidget::StrongFocus); + p_rb[i]->setFocusPolicy(TQ_StrongFocus); } p_accept = new KPushButton(this); @@ -55,7 +55,7 @@ void boxAsker::setQuestion(const TQString &q) void boxAsker::keyReleaseEvent(TQKeyEvent *e) { - if (e -> key() == Qt::Key_Return || e -> key() == Qt::Key_Enter) checkAnswer(); + if (e -> key() == TQt::Key_Return || e -> key() == TQt::Key_Enter) checkAnswer(); else askWidget::keyReleaseEvent(e); } @@ -80,7 +80,7 @@ void boxAsker::nextQuestionHook(const TQString &division) { // false because boxaskers never are clickOnDivision otherDivision = p_map -> getRandomDivision(false); - while (auxList.find(otherDivision) != auxList.end()) otherDivision = p_map -> getRandomDivision(false); + while (auxList.tqfind(otherDivision) != auxList.end()) otherDivision = p_map -> getRandomDivision(false); if (i == p_position) i++; if (i < 4 && nextBoxAskerQuestionHook(otherDivision, i, false)) i++; auxList << otherDivision; diff --git a/kgeography/src/boxasker.h b/kgeography/src/boxasker.h index e6171d85..d4b2079a 100644 --- a/kgeography/src/boxasker.h +++ b/kgeography/src/boxasker.h @@ -22,8 +22,9 @@ class TQVBoxLayout; class boxAsker : public askWidget { Q_OBJECT + TQ_OBJECT public: - boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count); + boxAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count); ~boxAsker(); protected: diff --git a/kgeography/src/capitaldivisionasker.cpp b/kgeography/src/capitaldivisionasker.cpp index ffea1407..cd4c8a44 100644 --- a/kgeography/src/capitaldivisionasker.cpp +++ b/kgeography/src/capitaldivisionasker.cpp @@ -15,7 +15,7 @@ #include "capitaldivisionasker.h" #include "map.h" -capitalDivisionAsker::capitalDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count) +capitalDivisionAsker::capitalDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count) { init(); } @@ -34,11 +34,11 @@ bool capitalDivisionAsker::nextBoxAskerQuestionHook(const TQString &division, in { TQString capitalName = i18n(p_map -> getFileName().utf8(), p_capital.utf8()); TQString text = i18n("%1 is the capital of..."); - setQuestion(text.arg(capitalName)); + setQuestion(text.tqarg(capitalName)); } else { - TQString s = TQString("%1 is the capital of...").arg(p_capital); + TQString s = TQString("%1 is the capital of...").tqarg(p_capital); setQuestion(i18n(p_map -> getFileName().utf8(), s.utf8())); } p_rb[i] -> setText(i18n(p_map -> getFileName().utf8(), division.utf8())); diff --git a/kgeography/src/capitaldivisionasker.h b/kgeography/src/capitaldivisionasker.h index 3d8a5e1c..8d05b1cf 100644 --- a/kgeography/src/capitaldivisionasker.h +++ b/kgeography/src/capitaldivisionasker.h @@ -18,7 +18,7 @@ class TQLabel; class capitalDivisionAsker : public boxAsker { public: - capitalDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count); + capitalDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count); protected: bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer); diff --git a/kgeography/src/division.cpp b/kgeography/src/division.cpp index 7ef70353..c190fac5 100644 --- a/kgeography/src/division.cpp +++ b/kgeography/src/division.cpp @@ -16,7 +16,7 @@ division::division() { p_canAskAlways = true; p_canAskClickDivision = true; - p_flagFile = TQString::null; + p_flagFile = TQString(); } bool division::canAsk(bool clickDivisionMode) const @@ -30,7 +30,7 @@ TQString division::getName() const return p_name; } -QRgb division::getRGB() const +TQRgb division::getRGB() const { return p_color; } @@ -72,7 +72,7 @@ void division::setName(const TQString &name) void division::setRGB(int r, int g, int b) { - p_color = qRgb(r, g, b); + p_color = tqRgb(r, g, b); } bool division::setFlagFile(const TQString &path) diff --git a/kgeography/src/division.h b/kgeography/src/division.h index 69b347f3..7014fd0e 100644 --- a/kgeography/src/division.h +++ b/kgeography/src/division.h @@ -21,7 +21,7 @@ class division bool canAsk(bool clickDivisionMode) const; TQString getName() const; - QRgb getRGB() const; + TQRgb getRGB() const; TQString getFlagFile() const; TQString getCapital() const; @@ -33,7 +33,7 @@ class division private: TQString p_name, p_flagFile, p_capital; - QRgb p_color; + TQRgb p_color; bool p_canAskAlways, p_canAskClickDivision; }; diff --git a/kgeography/src/divisioncapitalasker.cpp b/kgeography/src/divisioncapitalasker.cpp index b87437a2..5614efa0 100644 --- a/kgeography/src/divisioncapitalasker.cpp +++ b/kgeography/src/divisioncapitalasker.cpp @@ -15,7 +15,7 @@ #include "divisioncapitalasker.h" #include "map.h" -divisionCapitalAsker::divisionCapitalAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count) +divisionCapitalAsker::divisionCapitalAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count) { init(); } @@ -30,11 +30,11 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const TQString &division, in { TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8()); TQString text = i18n("The capital of %1 is..."); - setQuestion(text.arg(divisionName)); + setQuestion(text.tqarg(divisionName)); } else { - TQString s = TQString("The capital of %1 is...").arg(division); + TQString s = TQString("The capital of %1 is...").tqarg(division); setQuestion(i18n(p_map -> getFileName().utf8(), s.utf8())); } p_currentAnswer.setQuestion(i18n(p_map -> getFileName().utf8(), division.utf8())); diff --git a/kgeography/src/divisioncapitalasker.h b/kgeography/src/divisioncapitalasker.h index e4bc5514..8ec236e9 100644 --- a/kgeography/src/divisioncapitalasker.h +++ b/kgeography/src/divisioncapitalasker.h @@ -16,7 +16,7 @@ class divisionCapitalAsker : public boxAsker { public: - divisionCapitalAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count); + divisionCapitalAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count); protected: bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer); diff --git a/kgeography/src/divisionflagasker.cpp b/kgeography/src/divisionflagasker.cpp index 79641b25..ef90033d 100644 --- a/kgeography/src/divisionflagasker.cpp +++ b/kgeography/src/divisionflagasker.cpp @@ -16,7 +16,7 @@ #include "divisionflagasker.h" #include "map.h" -divisionFlagAsker::divisionFlagAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count) +divisionFlagAsker::divisionFlagAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count) { init(); } @@ -33,11 +33,11 @@ bool divisionFlagAsker::nextBoxAskerQuestionHook(const TQString &division, int i { TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8()); TQString text = i18n("The flag of %1 is..."); - setQuestion(text.arg(divisionName)); + setQuestion(text.tqarg(divisionName)); } else { - TQString s = TQString("The flag of %1 is...").arg(division); + TQString s = TQString("The flag of %1 is...").tqarg(division); setQuestion(i18n(p_map -> getFileName().utf8(), s.utf8())); } p_currentAnswer.setCorrectAnswer(im); diff --git a/kgeography/src/divisionflagasker.h b/kgeography/src/divisionflagasker.h index 5e1eaef2..71d64149 100644 --- a/kgeography/src/divisionflagasker.h +++ b/kgeography/src/divisionflagasker.h @@ -16,7 +16,7 @@ class divisionFlagAsker : public boxAsker { public: - divisionFlagAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count); + divisionFlagAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count); protected: bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer); diff --git a/kgeography/src/flagdivisionasker.cpp b/kgeography/src/flagdivisionasker.cpp index f6c305ab..92f0b039 100644 --- a/kgeography/src/flagdivisionasker.cpp +++ b/kgeography/src/flagdivisionasker.cpp @@ -17,7 +17,7 @@ #include "flagdivisionasker.h" #include "map.h" -flagDivisionAsker::flagDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count) +flagDivisionAsker::flagDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count) { p_flag = new TQWidget(this); p_lay -> insertWidget(0, p_flag); @@ -31,7 +31,7 @@ bool flagDivisionAsker::nextBoxAskerQuestionHook(const TQString &division, int i { // we put the flag image TQImage image(p_map -> getDivisionFlagFile(division)); - p_flag -> setPaletteBackgroundPixmap(image); + p_flag -> setPaletteBackgroundPixmap(TQPixmap(image)); p_flag -> setFixedSize(image.size()); p_currentAnswer.setQuestion(image.smoothScale(image.width()/5, image.height()/5)); diff --git a/kgeography/src/flagdivisionasker.h b/kgeography/src/flagdivisionasker.h index dfd4f662..5d826835 100644 --- a/kgeography/src/flagdivisionasker.h +++ b/kgeography/src/flagdivisionasker.h @@ -16,7 +16,7 @@ class flagDivisionAsker : public boxAsker { public: - flagDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count); + flagDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count); protected: bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer); diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp index 33740e66..de850afb 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 -> setAlignment(AlignCenter); + p_currentMap -> tqsetAlignment(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); @@ -59,22 +59,22 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi p_askDivisionFlags = new KPushButton(i18n("G&uess Flag of Division..."), p_leftWidget); TQWhatsThis::add(p_askDivisionFlags, i18n("In this quiz you have to guess the flag of a division given its name")); p_underLeftWidget = new TQVBox(p_leftWidget); - p_underLeftWidget -> layout() -> setSpacing(KDialog::spacingHint()); - p_underLeftWidget -> layout() -> setMargin(KDialog::marginHint()); + p_underLeftWidget -> tqlayout() -> setSpacing(KDialog::spacingHint()); + p_underLeftWidget -> tqlayout() -> setMargin(KDialog::marginHint()); p_leftWidget -> setStretchFactor(p_underLeftWidget, 1); setCentralWidget(p_bigWidget); - connect(p_consult, TQT_SIGNAL(clicked()), this, TQT_SLOT(consult())); - connect(p_askMap, TQT_SIGNAL(clicked()), this, TQT_SLOT(askMap())); - connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askCapitalDivisions())); - connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionCapitals())); - connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askFlagDivisions())); - connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionFlags())); + connect(p_consult, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(consult())); + connect(p_askMap, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askMap())); + connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askCapitalDivisions())); + connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionCapitals())); + connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askFlagDivisions())); + connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionFlags())); - KAction *a = KStdAction::open(this, TQT_SLOT(openMap()), actionCollection(), "openMap"); + KAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap"); a -> setText(i18n("&Open Map...")); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection(), "quit"); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit"); p_zoom = new KToggleAction(i18n("&Zoom"), "viewmagfit", 0, 0, 0, actionCollection(), "zoom_select"); p_zoom -> setEnabled(false); @@ -85,7 +85,7 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi p_move = new KToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move"); p_move -> setEnabled(false); - new KAction(i18n("Disclaimer"), 0, this, TQT_SLOT(disclaimer()), actionCollection(), "disclaimer"); + new KAction(i18n("Disclaimer"), 0, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer"); setupGUI(Keys | ToolBar | Save | Create); @@ -113,7 +113,7 @@ void kgeography::showEvent(TQShowEvent *) } else { - KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").arg(file).arg(reader.getError())); + KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").tqarg(file).tqarg(reader.getError())); delete reader.getMap(); openMap(); } @@ -132,7 +132,7 @@ void kgeography::showEvent(TQShowEvent *) } // if anyone can explain why with the slot works and now without // i'll be glad to learn - TQTimer::singleShot(0, this, TQT_SLOT(resizeMainWindow())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(resizeMainWindow())); // resizeMainWindow(); p_firstShow = false; @@ -169,7 +169,7 @@ void kgeography::askCapitalDivisions() int i; bool ok; showResultsDialog(); - i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok); + i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok); if (ok) { removeOldAskWidget(); @@ -185,7 +185,7 @@ void kgeography::askDivisionCapitals() int i; bool ok; showResultsDialog(); - i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok); + i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok); if (ok) { removeOldAskWidget(); @@ -201,7 +201,7 @@ void kgeography::askMap() int i; bool ok; showResultsDialog(); - i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(true)), 1, 1, p_map -> count(true), 1, &ok); + i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(true)), 1, 1, p_map -> count(true), 1, &ok); if (ok) { removeOldAskWidget(); @@ -219,7 +219,7 @@ void kgeography::askFlagDivisions() int i; bool ok; showResultsDialog(); - i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok); + i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok); if (ok) { removeOldAskWidget(); @@ -235,7 +235,7 @@ void kgeography::askDivisionFlags() int i; bool ok; showResultsDialog(); - i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok); + i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok); if (ok) { removeOldAskWidget(); @@ -275,7 +275,7 @@ void kgeography::putAskWidget() connect(p_askWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), p_move, TQT_SLOT(setEnabled(bool))); connect(p_askWidget, TQT_SIGNAL(setMoveActionChecked(bool)), p_move, TQT_SLOT(setChecked(bool))); connect(p_move, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setMovement(bool))); - connect(p_askWidget, TQT_SIGNAL(questionsEnded()), this, TQT_SLOT(showResultsDialog())); + connect(p_askWidget, TQT_SIGNAL(questionsEnded()), TQT_TQOBJECT(this), TQT_SLOT(showResultsDialog())); } void kgeography::setMap(KGmap *m) @@ -292,11 +292,11 @@ void kgeography::setMap(KGmap *m) { TQString mapName = i18n(p_map -> getFileName().utf8(), p_map -> getName().utf8()); TQString text = i18n("Current map:
%1"); - p_currentMap -> setText(text.arg(mapName)); + p_currentMap -> setText(text.tqarg(mapName)); } else { - TQString s = TQString("Current map:
%1").arg(p_map -> getName()); + TQString s = TQString("Current map:
%1").tqarg(p_map -> getName()); p_currentMap -> setText(i18n(p_map -> getFileName().utf8(), s.utf8())); } p_consult -> setEnabled(true); diff --git a/kgeography/src/kgeography.h b/kgeography/src/kgeography.h index fb66525a..0be945b7 100644 --- a/kgeography/src/kgeography.h +++ b/kgeography/src/kgeography.h @@ -27,6 +27,7 @@ class askWidget; class kgeography : public KMainWindow { Q_OBJECT + TQ_OBJECT public: kgeography(); ~kgeography(); diff --git a/kgeography/src/map.cpp b/kgeography/src/map.cpp index 9cef054f..57d79e9b 100644 --- a/kgeography/src/map.cpp +++ b/kgeography/src/map.cpp @@ -26,7 +26,7 @@ KGmap::KGmap() KGmap::~KGmap() { - TQMap::iterator it; + TQMap::iterator it; it = p_colorMap.begin(); while (it != p_colorMap.end()) { @@ -39,8 +39,8 @@ KGmap::~KGmap() bool KGmap::addDivision(division *c) { bool b; - if (p_nameMap.find(c -> getName()) == p_nameMap.end() && - p_colorMap.find(c -> getRGB()) == p_colorMap.end()) + if (p_nameMap.tqfind(c -> getName()) == p_nameMap.end() && + p_colorMap.tqfind(c -> getRGB()) == p_colorMap.end()) { p_colorMap.insert(c -> getRGB(), c); p_nameMap.insert(c -> getName(), c); @@ -125,11 +125,11 @@ TQString KGmap::getRandomDivision(bool clickDivisionMode) const else return aux[i] -> getName(); } -TQString KGmap::getWhatIs(QRgb c, bool all) const +TQString KGmap::getWhatIs(TQRgb c, bool all) const { // this is only asked from mapasker.cpp hence the true in canAsk - TQMap::const_iterator it; - it = p_colorMap.find(c); + TQMap::const_iterator it; + it = p_colorMap.tqfind(c); if (it == p_colorMap.end()) return "nothing"; else { @@ -142,7 +142,7 @@ TQString KGmap::getWhatIs(QRgb c, bool all) const TQColor KGmap::getColor(const TQString &s) const { TQValueList divisions; - TQValueList colors; + TQValueList colors; division *d; int i; diff --git a/kgeography/src/map.h b/kgeography/src/map.h index 7f606320..d2ed065e 100644 --- a/kgeography/src/map.h +++ b/kgeography/src/map.h @@ -38,11 +38,11 @@ class KGmap TQString getMapFile() const; TQString getName() const; TQString getRandomDivision(bool clickDivisionMode) const; - TQString getWhatIs(QRgb c, bool all) const; + TQString getWhatIs(TQRgb c, bool all) const; TQColor getColor(const TQString &s) const; private: - TQMap p_colorMap; + TQMap p_colorMap; TQMap p_nameMap; TQString p_name, p_file, p_mapFile; diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp index 27c7c83d..2fb7c380 100644 --- a/kgeography/src/mapasker.cpp +++ b/kgeography/src/mapasker.cpp @@ -20,16 +20,16 @@ #include "mapasker.h" #include "mapwidget.h" -mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint count) : askWidget(parent, m, w, count, asker), p_popupManager(this), p_asker(asker), p_firstShow(true) +mapAsker::mapAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, bool asker, uint count) : askWidget(tqparent, m, w, count, asker), p_popupManager(this), p_asker(asker), p_firstShow(true) { TQGridLayout *lay = new TQGridLayout(this, 2, 2); p_mapWidget = new mapWidget(this); lay -> addWidget(p_mapWidget, 0, 0); - p_hsb = new TQScrollBar(Horizontal, this); + p_hsb = new TQScrollBar(Qt::Horizontal, this); lay -> addWidget(p_hsb, 1, 0); - p_vsb = new TQScrollBar(Vertical, this); + p_vsb = new TQScrollBar(Qt::Vertical, this); lay -> addWidget(p_vsb, 0, 1); lay -> setRowStretch(2, 1); @@ -37,7 +37,7 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou p_shouldClearPopup = false; - connect(p_mapWidget, TQT_SIGNAL(clicked(QRgb, const TQPoint&)), this, TQT_SLOT(handleMapClick(QRgb, const TQPoint&))); + connect(p_mapWidget, TQT_SIGNAL(clicked(TQRgb, const TQPoint&)), this, TQT_SLOT(handleMapClick(TQRgb, const TQPoint&))); connect(p_mapWidget, TQT_SIGNAL(setMoveActionChecked(bool)), this, TQT_SIGNAL(setMoveActionChecked(bool))); connect(p_mapWidget, TQT_SIGNAL(setZoomActionChecked(bool)), this, TQT_SIGNAL(setZoomActionChecked(bool))); connect(p_mapWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), this, TQT_SIGNAL(setMoveActionEnabled(bool))); @@ -51,9 +51,9 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou if (asker) { - TQBoxLayout *vbl = dynamic_cast(w -> layout()); + TQBoxLayout *vbl = dynamic_cast(w -> tqlayout()); p_next = new TQLabel(w); - p_next -> setAlignment(AlignTop | AlignHCenter); + p_next -> tqsetAlignment(AlignTop | AlignHCenter); p_fill = new TQWidget(w); p_fill -> show(); vbl -> setStretchFactor(p_fill, 1); @@ -100,11 +100,11 @@ void mapAsker::setOriginalZoom() p_popupManager.clear(); } -void mapAsker::handleMapClick(QRgb c, const TQPoint &p) +void mapAsker::handleMapClick(TQRgb c, const TQPoint &p) { TQString aux, cap; aux = p_map -> getWhatIs(c, !p_asker); - if (aux == "nothing") KMessageBox::error(this, i18n("You have found a bug in a map. Please contact the author and tell the %1 map has nothing associated to color %2,%3,%4.").arg(p_map -> getFile()).arg(qRed(c)).arg(qGreen(c)).arg(qBlue(c))); + if (aux == "nothing") KMessageBox::error(this, i18n("You have found a bug in a map. Please contact the author and tell the %1 map has nothing associated to color %2,%3,%4.").tqarg(p_map -> getFile()).tqarg(tqRed(c)).tqarg(tqGreen(c)).tqarg(tqBlue(c))); else if (p_shouldClearPopup) { p_popupManager.clear(); @@ -175,11 +175,11 @@ void mapAsker::nextQuestionHook(const TQString &division) { TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8()); TQString text = i18n("Please click on:\n%1"); - p_next -> setText(text.arg(divisionName)); + p_next -> setText(text.tqarg(divisionName)); } else { - TQString s = TQString("Please click on:\n%1").arg(division); + TQString s = TQString("Please click on:\n%1").tqarg(division); p_next -> setText(i18n(p_map -> getFileName().utf8(), s.utf8())); } p_currentAnswer.setQuestion(i18n(p_map -> getFileName().utf8(), division.utf8())); diff --git a/kgeography/src/mapasker.h b/kgeography/src/mapasker.h index 4843299a..2ce5d6f2 100644 --- a/kgeography/src/mapasker.h +++ b/kgeography/src/mapasker.h @@ -25,8 +25,9 @@ class mapWidget; class mapAsker : public askWidget { Q_OBJECT + TQ_OBJECT public: - mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint count = 0); + mapAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, bool asker, uint count = 0); ~mapAsker(); TQSize mapSize() const; @@ -45,7 +46,7 @@ Q_OBJECT void setOriginalZoom(); private slots: - void handleMapClick(QRgb c, const TQPoint &p); + void handleMapClick(TQRgb c, const TQPoint &p); void setScrollBarsPosition(int x, int y); void setScrollBarsVisibleSize(int w, int h); void setScrollBarsMaximumSize(int w, int h); diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp index 11410d39..1920e328 100644 --- a/kgeography/src/mapchooser.cpp +++ b/kgeography/src/mapchooser.cpp @@ -19,7 +19,7 @@ #include "mapchooser.h" -mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Choose Map to Use"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true) +mapChooser::mapChooser(TQWidget *tqparent) : KDialogBase(tqparent, 0, true, i18n("Choose Map to Use"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true) { TQHBox *mainHB; TQStringList list; @@ -36,7 +36,7 @@ mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Ch { if (!p_reader.parseMap(*it)) { - KMessageBox::error(this, i18n("Error parsing %1: %2").arg(*it).arg(p_reader.getError())); + KMessageBox::error(this, i18n("Error parsing %1: %2").tqarg(*it).tqarg(p_reader.getError())); delete p_reader.getMap(); } else @@ -85,8 +85,8 @@ void mapChooser::putImage(const TQString &mapName) KGmap *m; m = p_maps[mapName]; TQImage image(m -> getMapFile()); - image = image.smoothScale(300, 225, TQImage::ScaleMin); - p_image -> setPaletteBackgroundPixmap(image); + image = image.smoothScale(300, 225, TQ_ScaleMin); + p_image -> setPaletteBackgroundPixmap(TQPixmap(image)); p_image -> setFixedSize(image.size()); } diff --git a/kgeography/src/mapchooser.h b/kgeography/src/mapchooser.h index a95d16ba..502adc4b 100644 --- a/kgeography/src/mapchooser.h +++ b/kgeography/src/mapchooser.h @@ -21,8 +21,9 @@ class mapChooser : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - mapChooser(TQWidget *parent); + mapChooser(TQWidget *tqparent); ~mapChooser(); KGmap *getMap(); diff --git a/kgeography/src/mapparser.cpp b/kgeography/src/mapparser.cpp index 8a4cf200..bf04f0dc 100644 --- a/kgeography/src/mapparser.cpp +++ b/kgeography/src/mapparser.cpp @@ -25,19 +25,19 @@ bool mapReader::parseMap(const TQString &path) TQString aux; p_map = new KGmap(); p_map -> setFile(path); - aux = path.left(path.findRev('/') + 1); // aux = path but without the file name + aux = path.left(path.tqfindRev('/') + 1); // aux = path but without the file name mapParser handler(p_map, aux); TQFile xmlFile(path); if (xmlFile.exists()) { - TQXmlInputSource source(&xmlFile); + TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile)); setContentHandler(&handler); if (parse(source)) return true; p_error = handler.errorString(); } else { - p_error = i18n("%1 does not exist.").arg(path); + p_error = i18n("%1 does not exist.").tqarg(path); } return false; } @@ -74,19 +74,19 @@ bool mapParser::startElement(const TQString&, const TQString &name, const TQStri if (prev.isEmpty()) { b = name == "map"; - if (!b) p_error = i18n("The map description file should begin with the %1 tag").arg("map"); + if (!b) p_error = i18n("The map description file should begin with the %1 tag").tqarg("map"); } else if (prev == "map") { if (name != "mapFile" && name != "name" && name != "division") { b = false; - p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4 and %5").arg(name).arg(prev).arg("mapFile").arg("name").arg("division"); + p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4 and %5").tqarg(name).tqarg(prev).tqarg("mapFile").tqarg("name").tqarg("division"); } else if ((name == "mapFile" && p_mapFileSet) || (name == "name" && p_mapNameSet)) { b = false; - p_error = i18n("%1 tag has already been set").arg(name); + p_error = i18n("%1 tag has already been set").tqarg(name); } p_colorSet = false; if (name == "division") @@ -102,21 +102,21 @@ bool mapParser::startElement(const TQString&, const TQString &name, const TQStri prev == "ignore") { b = false; - p_error = i18n("There can not be a tag inside %1 tag").arg(prev); + p_error = i18n("There can not be a tag inside %1 tag").tqarg(prev); } else if (prev == "division") { if (name != "color" && name != "name" && name != "ignore" && name != "flag" && name != "capital") { b = false; - p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4, %5, %6 and %7").arg(name).arg(prev).arg("color").arg("name").arg("ignore").arg("capital").arg("flag"); + p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4, %5, %6 and %7").tqarg(name).tqarg(prev).tqarg("color").tqarg("name").tqarg("ignore").tqarg("capital").tqarg("flag"); } else if ((name == "name" && p_divisionNameSet) || (name == "color" && p_colorSet) || (name == "ignore" && p_divisionIgnoreSet) || (name == "flag" && p_flagFileSet) || (name == "capital" && p_capitalSet)) { b = false; - p_error = i18n("%1 tag has already been set").arg(name); + p_error = i18n("%1 tag has already been set").tqarg(name); } p_red = -1; p_green = -1; @@ -146,7 +146,7 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &) { b = p_map -> setMapFile(p_path + p_contents); p_mapFileSet = true; - if (!b) p_error = i18n("File %1 does not exist").arg(p_path + p_contents); + if (!b) p_error = i18n("File %1 does not exist").tqarg(p_path + p_contents); } else if (aux == "division") { @@ -154,9 +154,9 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &) b = p_divisionNameSet; if (!b) p_error = i18n("There is a division without name"); b = b && p_map -> addDivision(p_division); - if (!b) p_error = i18n("There is already either a division called %1 or a division with the same colors as %2").arg(p_division -> getName()).arg(p_division -> getName()); + if (!b) p_error = i18n("There is already either a division called %1 or a division with the same colors as %2").tqarg(p_division -> getName()).tqarg(p_division -> getName()); b = b && (p_capitalSet || !p_division -> canAsk(false)); - if (!b) p_error = i18n("Division %1 has no capital").arg(p_division -> getName()); + if (!b) p_error = i18n("Division %1 has no capital").tqarg(p_division -> getName()); } else if (p_previousTags == ":map:division:name") { @@ -173,17 +173,17 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &) if (p_red == -1) { b = false; - p_error = i18n("Tag %1 has not the %2 tag.").arg("").arg(""); + p_error = i18n("Tag %1 has not the %2 tag.").tqarg("").tqarg(""); } else if (p_green == -1) { b = false; - p_error = i18n("Tag %1 has not the %2 tag.").arg("").arg(""); + p_error = i18n("Tag %1 has not the %2 tag.").tqarg("").tqarg(""); } else if (p_blue == -1) { b = false; - p_error = i18n("Tag %1 has not the %2 tag.").arg("").arg(""); + p_error = i18n("Tag %1 has not the %2 tag.").tqarg("").tqarg(""); } else p_colorSet = true; } @@ -217,21 +217,21 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &) else { b = false; - p_error = i18n("Invalid value in tag %1").arg(""); + p_error = i18n("Invalid value in tag %1").tqarg(""); } } else if (aux == "flag") { b = p_division -> setFlagFile(p_path + "flags/" + p_contents); p_flagFileSet = true; - if (!b) p_error = i18n("Could not find flag file %1").arg(p_path + "flags/" + p_contents); + if (!b) p_error = i18n("Could not find flag file %1").tqarg(p_path + "flags/" + p_contents); } else if (aux == "map") { } else b = false; removeLastTag(); - p_contents = TQString::null; + p_contents = TQString(); return b; } @@ -258,7 +258,7 @@ bool mapParser::endDocument() } else if (!p_mapNameSet) aux = "name"; else if (!p_mapFileSet) aux = "mapFile"; - p_error = i18n("Tag %1 is missing.").arg(aux); + p_error = i18n("Tag %1 is missing.").tqarg(aux); return false; } @@ -270,10 +270,10 @@ TQString mapParser::errorString() TQString mapParser::getPreviousTag() const { - return p_previousTags.right(p_previousTags.length() - p_previousTags.findRev(':') - 1); + return p_previousTags.right(p_previousTags.length() - p_previousTags.tqfindRev(':') - 1); } void mapParser::removeLastTag() { - p_previousTags = p_previousTags.left(p_previousTags.findRev(':')); + p_previousTags = p_previousTags.left(p_previousTags.tqfindRev(':')); } diff --git a/kgeography/src/mapparser.h b/kgeography/src/mapparser.h index 9db844ae..4abe8e56 100644 --- a/kgeography/src/mapparser.h +++ b/kgeography/src/mapparser.h @@ -16,7 +16,7 @@ class division; class KGmap; -class mapReader : public QXmlSimpleReader +class mapReader : public TQXmlSimpleReader { public: mapReader(); @@ -30,7 +30,7 @@ class mapReader : public QXmlSimpleReader KGmap *p_map; }; -class mapParser : public QXmlDefaultHandler +class mapParser : public TQXmlDefaultHandler { public: mapParser(KGmap *m, const TQString &path); diff --git a/kgeography/src/mapsdatatranslation.cpp b/kgeography/src/mapsdatatranslation.cpp index 23fb3418..081ca98c 100644 --- a/kgeography/src/mapsdatatranslation.cpp +++ b/kgeography/src/mapsdatatranslation.cpp @@ -64,10 +64,10 @@ i18n("africa.kgm", "The flag of Côte d'Ivoire is..."); i18n("africa.kgm", "Yamoussoukro"); i18n("africa.kgm", "Yamoussoukro is the capital of..."); i18n("africa.kgm", "Cyprus"); -i18n("africa.kgm", "Democratic Republic of the Congo"); -i18n("africa.kgm", "The capital of Democratic Republic of the Congo is..."); -i18n("africa.kgm", "Please click on:\nDemocratic Republic of the Congo"); -i18n("africa.kgm", "The flag of Democratic Republic of the Congo is..."); +i18n("africa.kgm", "Detqmocratic Republic of the Congo"); +i18n("africa.kgm", "The capital of Detqmocratic Republic of the Congo is..."); +i18n("africa.kgm", "Please click on:\nDetqmocratic Republic of the Congo"); +i18n("africa.kgm", "The flag of Detqmocratic Republic of the Congo is..."); i18n("africa.kgm", "Kinshasa"); i18n("africa.kgm", "Kinshasa is the capital of..."); i18n("africa.kgm", "Djibouti"); @@ -3417,10 +3417,10 @@ i18n("world.kgm", "Please click on:\nCôte d'Ivoire"); i18n("world.kgm", "The flag of Côte d'Ivoire is..."); i18n("world.kgm", "Yamoussoukro"); i18n("world.kgm", "Yamoussoukro is the capital of..."); -i18n("world.kgm", "Democratic Republic of the Congo"); -i18n("world.kgm", "The capital of Democratic Republic of the Congo is..."); -i18n("world.kgm", "Please click on:\nDemocratic Republic of the Congo"); -i18n("world.kgm", "The flag of Democratic Republic of the Congo is..."); +i18n("world.kgm", "Detqmocratic Republic of the Congo"); +i18n("world.kgm", "The capital of Detqmocratic Republic of the Congo is..."); +i18n("world.kgm", "Please click on:\nDetqmocratic Republic of the Congo"); +i18n("world.kgm", "The flag of Detqmocratic Republic of the Congo is..."); i18n("world.kgm", "Kinshasa"); i18n("world.kgm", "Kinshasa is the capital of..."); i18n("world.kgm", "Djibouti"); @@ -4384,10 +4384,10 @@ i18n("world.kgm", "Please click on:\nSingapore"); i18n("world.kgm", "The flag of Singapore is..."); i18n("world.kgm", "Singapore"); i18n("world.kgm", "Singapore is the capital of..."); -i18n("world.kgm", "Democratic People's Republic of Korea"); -i18n("world.kgm", "The capital of Democratic People's Republic of Korea is..."); -i18n("world.kgm", "Please click on:\nDemocratic People's Republic of Korea"); -i18n("world.kgm", "The flag of Democratic People's Republic of Korea is..."); +i18n("world.kgm", "Detqmocratic People's Republic of Korea"); +i18n("world.kgm", "The capital of Detqmocratic People's Republic of Korea is..."); +i18n("world.kgm", "Please click on:\nDetqmocratic People's Republic of Korea"); +i18n("world.kgm", "The flag of Detqmocratic People's Republic of Korea is..."); i18n("world.kgm", "Pyeongyang"); i18n("world.kgm", "Pyeongyang is the capital of..."); i18n("world.kgm", "Republic of Korea"); diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp index f551940f..2560f11a 100644 --- a/kgeography/src/mapwidget.cpp +++ b/kgeography/src/mapwidget.cpp @@ -19,7 +19,7 @@ #include "mapwidget.h" -mapWidget::mapWidget(TQWidget *parent) : TQWidget(parent) +mapWidget::mapWidget(TQWidget *tqparent) : TQWidget(tqparent) { p_wantZoom = false; p_zooming = false; @@ -61,9 +61,9 @@ void mapWidget::setMapZoom(bool b) } } -TQSize mapWidget::sizeHint() const +TQSize mapWidget::tqsizeHint() const { - return maximumSize(); + return tqmaximumSize(); } void mapWidget::updateHPosition(int value) @@ -91,12 +91,12 @@ void mapWidget::mousePressEvent(TQMouseEvent *e) else if (p_wantMove) { p_initial = e -> pos(); - setCursor(Qt::SizeAllCursor); + setCursor(TQt::SizeAllCursor); p_moving = true; } else { - QRgb rgb; + TQRgb rgb; TQImage *currentImage; currentImage = getCurrentImage(); @@ -121,8 +121,8 @@ void mapWidget::mouseMoveEvent(TQMouseEvent *e) { TQPainter p(this); - p.setRasterOp(Qt::XorROP); - p.setPen(TQPen(Qt::white, 1, Qt::DotLine)); + p.setRasterOp(TQt::XorROP); + p.setPen(TQPen(TQt::white, 1, TQt::DotLine)); // remove previous rectangle p.drawRect(TQRect(p_initial, p_prev)); @@ -176,8 +176,8 @@ void mapWidget::mouseReleaseEvent(TQMouseEvent *e) TQPainter p(this); TQRect r(p_initial, e -> pos()); - p.setRasterOp(Qt::XorROP); - p.setPen(TQPen(Qt::white, 1, Qt::DotLine)); + p.setRasterOp(TQt::XorROP); + p.setPen(TQPen(TQt::white, 1, TQt::DotLine)); // remove previous rectangle p.drawRect(r); @@ -279,7 +279,7 @@ TQImage *mapWidget::getCurrentImage() void mapWidget::setOriginalImage() { - setPaletteBackgroundPixmap(p_originalImage); + setPaletteBackgroundPixmap(TQPixmap(p_originalImage)); erase(); p_zoomedImageShown = TQImage(); p_lastFactorX = 1; @@ -314,7 +314,7 @@ void mapWidget::updateShownImage() { p_zoomedImageShown = p_originalImage.copy(p_zoomX, p_zoomY, p_zoomW, p_zoomH); p_zoomedImageShown = p_zoomedImageShown.scale(size()); - setPaletteBackgroundPixmap(p_zoomedImageShown); + setPaletteBackgroundPixmap(TQPixmap(p_zoomedImageShown)); erase(); p_oldZoomX = p_zoomX; p_oldZoomY = p_zoomY; diff --git a/kgeography/src/mapwidget.h b/kgeography/src/mapwidget.h index 1bc37cb3..3f6561dc 100644 --- a/kgeography/src/mapwidget.h +++ b/kgeography/src/mapwidget.h @@ -15,18 +15,19 @@ #include #include -class mapWidget : public QWidget +class mapWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - mapWidget(TQWidget *parent); + mapWidget(TQWidget *tqparent); void init(const TQString &path, int scrollBarWidth, int scrollBarHeight); void setMapMove(bool b); void setMapZoom(bool b); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize mapSize() const; public slots: @@ -38,7 +39,7 @@ Q_OBJECT void setMoveActionChecked(bool b); void setZoomActionChecked(bool b); void setMoveActionEnabled(bool b); - void clicked(QRgb, const TQPoint&); + void clicked(TQRgb, const TQPoint&); void updatePosition(int X, int Y); void updateVisibleSize(int w, int h); void updateMaximumSize(int w, int h); diff --git a/kgeography/src/mypopup.cpp b/kgeography/src/mypopup.cpp index b9f1c78e..d68e3a7e 100644 --- a/kgeography/src/mypopup.cpp +++ b/kgeography/src/mypopup.cpp @@ -16,7 +16,7 @@ #include "mypopup.h" -myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2, const TQString &flagFile) : TQFrame(parent) +myPopup::myPopup(TQWidget *tqparent, const TQString &text, const TQString &text2, const TQString &flagFile) : TQFrame(tqparent) { TQHBoxLayout *lay = new TQHBoxLayout(this); lay -> setMargin(4); @@ -33,7 +33,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2, if (!text2.isNull()) { TQLabel *l2 = new TQLabel(text2, vbox); - l2 -> setAlignment(Qt::AlignCenter); + l2 -> tqsetAlignment(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 -> setAlignment(Qt::AlignCenter); + flag -> tqsetAlignment(TQt::AlignCenter); } - l -> setAlignment(Qt::AlignCenter); + l -> tqsetAlignment(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(sizeHint()); + setFixedSize(tqsizeHint()); } void myPopup::mousePressEvent(TQMouseEvent *) diff --git a/kgeography/src/mypopup.h b/kgeography/src/mypopup.h index c768a308..d840eb49 100644 --- a/kgeography/src/mypopup.h +++ b/kgeography/src/mypopup.h @@ -13,13 +13,14 @@ #include -class myPopup : public QFrame +class myPopup : public TQFrame { Q_OBJECT + TQ_OBJECT friend class popupManager; private: - myPopup(TQWidget *parent, const TQString &text, const TQString &text2 = TQString::null, const TQString &flagFile = TQString::null); + myPopup(TQWidget *tqparent, const TQString &text, const TQString &text2 = TQString(), const TQString &flagFile = TQString()); signals: void deleteMe(); diff --git a/kgeography/src/popupmanager.cpp b/kgeography/src/popupmanager.cpp index 1a457f81..1b19b44d 100644 --- a/kgeography/src/popupmanager.cpp +++ b/kgeography/src/popupmanager.cpp @@ -11,9 +11,9 @@ #include "mypopup.h" #include "popupmanager.h" -popupManager::popupManager(TQWidget *parent) +popupManager::popupManager(TQWidget *tqparent) { - p_parent = parent; + p_parent = tqparent; p_mp = 0; } diff --git a/kgeography/src/popupmanager.h b/kgeography/src/popupmanager.h index 8b28f56e..57dd68c8 100644 --- a/kgeography/src/popupmanager.h +++ b/kgeography/src/popupmanager.h @@ -17,11 +17,12 @@ class TQWidget; class myPopup; -class popupManager : public QObject +class popupManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - popupManager(TQWidget *parent); + popupManager(TQWidget *tqparent); // shows text at p and the flag void show(const TQString &text, const TQString &text2, const TQPoint &p, const TQString &flagFile); diff --git a/khangman/ChangeLog b/khangman/ChangeLog index 337a55d6..93419a47 100644 --- a/khangman/ChangeLog +++ b/khangman/ChangeLog @@ -1,5 +1,5 @@ June 23, 2005 -- add timers for KPassivePopup (Hint and Already Guessed) to allow young children to read (young children need more time) +- add timers for KPassivePopup (Hint and Already Guessed) to allow young tqchildren to read (young tqchildren need more time) - fixed hint position - tooltip if no Win dialog to say the game is finished (is displayed for 4 seconds) diff --git a/khangman/README.languages b/khangman/README.languages index d72a7a72..b0d2bf07 100644 --- a/khangman/README.languages +++ b/khangman/README.languages @@ -25,7 +25,7 @@ cd kdeedu/khangman ./add_language - Here you must replace with your language code. + Here you must tqreplace with your language code. The program will refuse a non-valid language code! diff --git a/khangman/khangman/advanced.ui b/khangman/khangman/advanced.ui index 02845c1a..20d03dac 100644 --- a/khangman/khangman/advanced.ui +++ b/khangman/khangman/advanced.ui @@ -1,10 +1,10 @@ advanced - + advanced - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + groupBox5 @@ -35,7 +35,7 @@ unnamed - + kcfg_Hint @@ -55,7 +55,7 @@ If this is <b>enabled</b>, then hints are available and you can get - + groupBox6 @@ -66,7 +66,7 @@ If this is <b>enabled</b>, then hints are available and you can get unnamed - + kcfg_AccentedLetters @@ -91,5 +91,5 @@ For example, in Catalan, if this is unchecked and you type "o", the o and ò wil - + diff --git a/khangman/khangman/data/en/easy.kvtml b/khangman/khangman/data/en/easy.kvtml index 8e2521aa..58338d21 100644 --- a/khangman/khangman/data/en/easy.kvtml +++ b/khangman/khangman/data/en/easy.kvtml @@ -3,7 +3,7 @@ playtime - time assigned for children to play + time assigned for tqchildren to play furniture @@ -134,7 +134,7 @@ large group of persons - children + tqchildren young humans diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 0b14829e..e478d804 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -74,30 +74,30 @@ KHangMan::~KHangMan() void KHangMan::setupActions() { // Game->New - KAction *action = new KAction(i18n("&New"), "filenew", CTRL+Key_N , m_view, TQT_SLOT(slotNewGame()), actionCollection(), "file_new"); + KAction *action = new KAction(i18n("&New"), "filenew", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new"); action->setToolTip(i18n( "Play with a new word" )); // Game->Get Words in New Language - new KAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, this, TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); + new KAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); m_levelAction = new KSelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level"); m_levelAction->setToolTip(i18n( "Choose the level" )); m_levelAction->setWhatsThis(i18n( "Choose the level of difficulty" )); - connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int))); + connect(m_levelAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLevel(int))); // Action for selecting language. m_languageAction = new KSelectAction(i18n("&Language"), 0, actionCollection(), "languages"); m_languageAction->setItems(m_languageNames); - m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage())); - connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int))); + m_languageAction->setCurrentItem(m_languages.tqfindIndex(Prefs::selectedLanguage())); + connect(m_languageAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLanguage(int))); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); // Mode. Currently hard coded into Sea and Desert themes. TQStringList modes; - m_modeAction = new KSelectAction(i18n("L&ook"), 0, this, TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode"); + m_modeAction = new KSelectAction(i18n("L&ook"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode"); modes += i18n("&Sea Theme"); modes += i18n("&Desert Theme"); m_modeAction->setItems(modes); @@ -150,7 +150,7 @@ void KHangMan::slotChangeLevel(int index) changeStatusbar("", IDS_ACCENTS); #endif Prefs::setCurrentLevel(index); - levelString.replace(0, 1, levelString.left(1).lower()); + levelString.tqreplace(0, 1, levelString.left(1).lower()); Prefs::setLevelFile(levelString +".kvtml"); Prefs::writeConfig(); m_view->slotNewGame(); @@ -159,12 +159,12 @@ void KHangMan::slotChangeLevel(int index) void KHangMan::slotChangeLanguage(int index) { //good when no in English - kdDebug() << "Change to " << m_languages[m_languageNames.findIndex(m_languageNames[index])] << endl; - Prefs::setSelectedLanguage(m_languages[m_languageNames.findIndex(m_languageNames[index])]); + kdDebug() << "Change to " << m_languages[m_languageNames.tqfindIndex(m_languageNames[index])] << endl; + Prefs::setSelectedLanguage(m_languages[m_languageNames.tqfindIndex(m_languageNames[index])]); Prefs::writeConfig(); loadLevels(); loadLangToolBar(); - changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG); + changeStatusbar(m_languageNames[m_languages.tqfindIndex(Prefs::selectedLanguage())], IDS_LANG); setAccent(); setMessages(); m_view->slotNewGame(); @@ -196,8 +196,8 @@ void KHangMan::setLanguages() for (TQStringList::Iterator it =mdirs.begin(); it !=mdirs.end(); ++it ) { TQDir dir(*it); m_languages += dir.entryList(TQDir::Dirs, TQDir::Name); - m_languages.remove(m_languages.find(".")); - m_languages.remove(m_languages.find("..")); + m_languages.remove(m_languages.tqfind(".")); + m_languages.remove(m_languages.tqfind("..")); } m_languages.sort(); @@ -209,7 +209,7 @@ void KHangMan::setLanguages() TQStringList temp_languages; for (uint i=0; i1) { + if (m_languages.tqcontains(m_languages[i])>1) { temp_languages.append(m_languages[i]); m_languages.remove(m_languages[i]); } @@ -224,11 +224,11 @@ void KHangMan::setLanguages() // Write the present languages in config so they cannot be downloaded. KConfig *config=kapp->config(); - config->setGroup("KNewStuffStatus"); + config->setGroup("KNewStufftqStatus"); for (uint i=0; ireadEntry(tmp)) - config->writeEntry(tmp, TQDate::currentDate().toString(Qt::ISODate)); + config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString(Qt::ISODate))); } // We look in $KDEDIR/share/locale/all_languages from @@ -261,7 +261,7 @@ void KHangMan::loadSettings() selectedLanguage = Prefs::selectedLanguage(); if (m_languages.grep(selectedLanguage).isEmpty()) selectedLanguage = "en"; - changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG); + changeStatusbar(m_languageNames[m_languages.tqfindIndex(Prefs::selectedLanguage())], IDS_LANG); // Show/hide characters toolbar if (Prefs::showCharToolbar()) secondToolbar->show(); @@ -276,8 +276,8 @@ void KHangMan::setLevel() if (currentLevel > (uint) levels.count()) currentLevel= 0; levelString = levels[currentLevel]; - levelString.replace(0, 1, levelString.left(1).lower()); - levelString = levels[currentLevel].replace(0, 1, levels[currentLevel].left(1).lower()) ; + levelString.tqreplace(0, 1, levelString.left(1).lower()); + levelString = levels[currentLevel].tqreplace(0, 1, levels[currentLevel].left(1).lower()) ; } void KHangMan::loadLevels() @@ -292,14 +292,14 @@ void KHangMan::loadLevels() for (TQStringList::Iterator it = mfiles.begin(); it != mfiles.end(); ++it ) { TQFile f( *it); //find the last / in the file name - int location = f.name().findRev("/"); + int location = f.name().tqfindRev("/"); //strip the string to keep only the filename and not the path TQString mString = f.name().right(f.name().length()-location-1); if (mString == Prefs::levelFile()) levelBool = true; mString = mString.left(mString.length()-6); //Put the first letter in Upper case - mString = mString.replace(0, 1, mString.left(1).upper()); + mString = mString.tqreplace(0, 1, mString.left(1).upper()); levels+=mString; } //TODO else tell no files had been found @@ -307,13 +307,13 @@ void KHangMan::loadLevels() // Sort easy, medium, hard at bottom, with the other categories at the top levels.sort(); - TQString replace[3] = { "Easy", "Medium", "Hard" }; + TQString tqreplace[3] = { "Easy", "Medium", "Hard" }; for ( int i = 0; i < 3; ++i ) { - if ( levels.findIndex( replace[i] ) > -1 ) + if ( levels.tqfindIndex( tqreplace[i] ) > -1 ) { - levels.remove( replace[i] ); - levels.append( replace[i] ); + levels.remove( tqreplace[i] ); + levels.append( tqreplace[i] ); } } @@ -338,7 +338,7 @@ void KHangMan::loadLevels() if (levelBool == false) { - Prefs::setLevelFile(levels[0].replace(0, 1, levels[0].left(1).lower())+".kvtml"); + Prefs::setLevelFile(levels[0].tqreplace(0, 1, levels[0].left(1).lower())+".kvtml"); Prefs::setCurrentLevel(0); currentLevel =0; Prefs::writeConfig(); @@ -351,7 +351,7 @@ void KHangMan::loadLevels() setLevel(); TQString m_lstring = translatedLevels[currentLevel].utf8(); - m_lstring.replace(0, 1, m_lstring.left(1).upper()); + m_lstring.tqreplace(0, 1, m_lstring.left(1).upper()); changeStatusbar(m_lstring, IDS_LEVEL); } @@ -380,7 +380,7 @@ void KHangMan::optionsPreferences() Timer *m_timer = new Timer(); dialog->addPage(m_timer, i18n("Timers"), "clock"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateSettings())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateSettings())); dialog->show(); } @@ -420,22 +420,22 @@ void KHangMan::loadLangToolBar() m_allData.clear(); if (!m_noSpecialChars) { - TQString myString=TQString("khangman/%1.txt").arg(Prefs::selectedLanguage()); + TQString myString=TQString("khangman/%1.txt").tqarg(Prefs::selectedLanguage()); TQFile myFile; myFile.setName(locate("data", myString)); // Let's look in local KDEHOME dir then if (!myFile.exists()) { TQString myString=TQString("khangman/data/%1/%1.txt") - .arg(Prefs::selectedLanguage()) - .arg(Prefs::selectedLanguage()); + .tqarg(Prefs::selectedLanguage()) + .tqarg(Prefs::selectedLanguage()); myFile.setName(locate("data",myString)); kdDebug() << myString << endl; } if (!myFile.exists()) { TQString mString=i18n("File $KDEDIR/share/apps/khangman/%1.txt not found;\n" - "check your installation.").arg(Prefs::selectedLanguage()); + "check your installation.").tqarg(Prefs::selectedLanguage()); KMessageBox::sorry( this, mString, i18n("Error") ); kapp->quit(); @@ -455,9 +455,9 @@ void KHangMan::loadLangToolBar() for (int i=0; i<(int) m_allData.count(); i++) secondToolbar->insertButton (charIcon(m_allData[i].at(0)), i, - TQT_SIGNAL( clicked() ), this, + TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPasteChar()), true, - i18n("Inserts the character %1").arg(m_allData[i]), i+1 ); + i18n("Inserts the character %1").tqarg(m_allData[i]), i+1 ); } if (Prefs::showCharToolbar()) @@ -480,7 +480,7 @@ void KHangMan::slotPasteChar() TQString KHangMan::charIcon(const TQChar & c) { ///Create a name and path for the icon - TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png"); TQRect r(4, 4, 120, 120); @@ -492,19 +492,19 @@ TQString KHangMan::charIcon(const TQChar & c) ///Create the pixmap TQPixmap pm(128, 128); - pm.fill(Qt::white); + pm.fill(TQt::white); TQPainter p(&pm); p.setFont(font); - p.setPen(Qt::black); - p.drawText(r, Qt::AlignCenter, (TQString) c); + p.setPen(TQt::black); + p.drawText(r, TQt::AlignCenter, (TQString) c); - ///Create transparency mask + ///Create transparency tqmask TQBitmap bm(128, 128); - bm.fill(Qt::color0); + bm.fill(TQt::color0); TQPainter b(&bm); b.setFont(font); - b.setPen(Qt::color1); - b.drawText(r, Qt::AlignCenter, (TQString) c); + b.setPen(TQt::color1); + b.drawText(r, TQt::AlignCenter, (TQString) c); ///Mask the pixmap pm.setMask(bm); diff --git a/khangman/khangman/khangman.h b/khangman/khangman/khangman.h index 7c47711a..befebd3e 100644 --- a/khangman/khangman/khangman.h +++ b/khangman/khangman/khangman.h @@ -51,6 +51,7 @@ const int IDS_HINT = 103; class KHangMan : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp index 8fc5bcc5..f4165258 100644 --- a/khangman/khangman/khangmanview.cpp +++ b/khangman/khangman/khangmanview.cpp @@ -41,23 +41,23 @@ #include "khangmanview.h" -KHangManView::KHangManView(KHangMan*parent, const char *name) - : TQWidget(parent, name, WStaticContents | WNoAutoErase) +KHangManView::KHangManView(KHangMan*tqparent, const char *name) + : TQWidget(tqparent, name, WStaticContents | WNoAutoErase) { - khangman = parent; + khangman = tqparent; // The widget for entering letters. m_letterInput = new KLineEdit( this, "charWrite" ); - m_letterInput->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, + m_letterInput->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, (TQSizePolicy::SizeType) 0, 0, 0, m_letterInput->sizePolicy().hasHeightForWidth() ) ); m_letterInput->setMaxLength( 1 ); - m_letterInput->setAlignment( int( TQLineEdit::AlignHCenter ) ); + m_letterInput->tqsetAlignment( int( TQLineEdit::AlignHCenter ) ); // Press this button to enter a letter (or press enter) m_guessButton = new KPushButton( this, "guessButton" ); - m_guessButton->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, + m_guessButton->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, (TQSizePolicy::SizeType) 0, 0, 0, m_guessButton->sizePolicy().hasHeightForWidth() ) ); @@ -102,30 +102,30 @@ void KHangManView::replaceLetters(const TQString& sChar) // Replace letter in the word if (Prefs::oneLetter()) { // We just replace the next instance. - for (int count=0; count < m_word.contains(sChar, false); count++) { + for (int count=0; count < m_word.tqcontains(sChar, false); count++) { - index = m_word.find(sChar, index, false); + index = m_word.tqfind(sChar, index, false); if (m_goodWord.at(2*index)=='_') { - m_goodWord.replace((2*index), 1, m_word.at(index)); + m_goodWord.tqreplace((2*index), 1, m_word.at(index)); kdDebug() << "m_goodword " << m_goodWord << endl; - if (count == m_word.contains(sChar, false)-1) + if (count == m_word.tqcontains(sChar, false)-1) b_end = true; break; } else index++; - if (count == m_word.contains(sChar, false)-1) + if (count == m_word.tqcontains(sChar, false)-1) b_end = true; } } else { - for (int count=0; count < m_word.contains(sChar, false); count++) { + for (int count=0; count < m_word.tqcontains(sChar, false); count++) { //searching for letter location - index = m_word.find(sChar, index, false); + index = m_word.tqfind(sChar, index, false); //we replace it... - m_goodWord.replace((2*index), 1,m_word.at(index)); + m_goodWord.tqreplace((2*index), 1,m_word.at(index)); index++; } } @@ -146,7 +146,7 @@ void KHangManView::replaceLetters(const TQString& sChar) if (!Prefs::oneLetter()) m_guessedLetters << sChar; //appends the list only if not in One Letter only mode... - if (m_word.contains(sChar, false) == 1) + if (m_word.tqcontains(sChar, false) == 1) m_guessedLetters << sChar; //append if only one instance if (Prefs::oneLetter() && b_end) @@ -159,28 +159,28 @@ bool KHangManView::containsChar(const TQString &sChar) bool b = false; if (m_accentedLetters && !Prefs::accentedLetters()) { if (sChar=="i") - b = m_word.contains(TQString::fromUtf8("í"), false); + b = m_word.tqcontains(TQString::fromUtf8("í"), false); if (sChar=="a") - b = m_word.contains(TQString::fromUtf8("à"), false) - || m_word.contains(TQString::fromUtf8("á"), false) - || m_word.contains(TQString::fromUtf8("ã"), false); + b = m_word.tqcontains(TQString::fromUtf8("à"), false) + || m_word.tqcontains(TQString::fromUtf8("á"), false) + || m_word.tqcontains(TQString::fromUtf8("ã"), false); if (sChar=="u") - b = m_word.contains(TQString::fromUtf8("ü"), false) - || m_word.contains(TQString::fromUtf8("ù"), false); + b = m_word.tqcontains(TQString::fromUtf8("ü"), false) + || m_word.tqcontains(TQString::fromUtf8("ù"), false); if (sChar=="o") - b = m_word.contains(TQString::fromUtf8("ò"), false) - || m_word.contains(TQString::fromUtf8("ó"), false) - || m_word.contains(TQString::fromUtf8("õ"), false); + b = m_word.tqcontains(TQString::fromUtf8("ò"), false) + || m_word.tqcontains(TQString::fromUtf8("ó"), false) + || m_word.tqcontains(TQString::fromUtf8("õ"), false); if (sChar=="e") - b = m_word.contains(TQString::fromUtf8("è"), false) - || m_word.contains(TQString::fromUtf8("é"), false); + b = m_word.tqcontains(TQString::fromUtf8("è"), false) + || m_word.tqcontains(TQString::fromUtf8("é"), false); } - return (b || m_word.contains(sChar, false)); + return (b || m_word.tqcontains(sChar, false)); } @@ -190,7 +190,7 @@ bool KHangManView::containsChar(const TQString &sChar) void KHangManView::mousePressEvent(TQMouseEvent *mouse) { - if (mouse->button() == RightButton && m_hintExists && Prefs::hint()) { + if (mouse->button() == Qt::RightButton && m_hintExists && Prefs::hint()) { KPassivePopup *myPopup = new KPassivePopup( m_letterInput); myPopup->setView(i18n("Hint"), m_hint ); @@ -234,7 +234,7 @@ void KHangManView::setTheme() void KHangManView::paintEvent( TQPaintEvent * ) { // This pixmap implements double buffering to remove all forms of - // flicker in the repainting. + // flicker in the tqrepainting. TQPixmap buf(width(), height()); // Repaint the contents of the khangman view into the pixmap. @@ -379,7 +379,7 @@ void KHangManView::slotTry() } // Handle the guess. - if (!m_guessedLetters.contains(guess.lower())) { + if (!m_guessedLetters.tqcontains(guess.lower())) { // The letter is not already guessed. if (containsChar(guess)) { @@ -389,11 +389,11 @@ void KHangManView::slotTry() TQString stripWord = m_goodWord; TQString sword = m_word; if (dd > 0) { - stripWord.replace(2*c, 1, ""); - stripWord.replace(2*c-1, 1, ""); + stripWord.tqreplace(2*c, 1, ""); + stripWord.tqreplace(2*c-1, 1, ""); - stripWord.replace(2*(dd-1), 1, ""); - stripWord.replace(2*(dd-1)-1, 1, ""); + stripWord.tqreplace(2*(dd-1), 1, ""); + stripWord.tqreplace(2*(dd-1)-1, 1, ""); } TQStringList rightChars = TQStringList::split(" ", stripWord, true); @@ -431,7 +431,7 @@ void KHangManView::slotTry() popup->show(mapToGlobal(point)); TQTimer::singleShot( 4*1000, this, TQT_SLOT(slotNewGame()) ); } - else if (KMessageBox::questionYesNo(this, i18n("Congratulations! You won! Do you want to play again?"),TQString::null,i18n("Play Again"), i18n("Do Not Play")) == 3) + else if (KMessageBox::questionYesNo(this, i18n("Congratulations! You won! Do you want to play again?"),TQString(),i18n("Play Again"), i18n("Do Not Play")) == 3) slotNewGame(); else kapp->quit(); @@ -442,7 +442,7 @@ void KHangManView::slotTry() m_guessedLetters << guess.lower(); m_guessedLetters << guess.upper(); - m_missedLetters = m_missedLetters.replace((2 * m_numMissedLetters), + m_missedLetters = m_missedLetters.tqreplace((2 * m_numMissedLetters), 1, guess.lower()); m_numMissedLetters++; update(); @@ -467,7 +467,7 @@ void KHangManView::slotTry() TQLabel *popLabel = new TQLabel( vb); popLabel->setFont(TQFont("Sans Serif", 14, TQFont::Normal)); - popLabel->setText(i18n("You lost!\nThe word was\n%1").arg(m_word)); + popLabel->setText(i18n("You lost!\nThe word was\n%1").tqarg(m_word)); popup->setView( vb ); TQPoint abspos = popup->pos(); @@ -477,7 +477,7 @@ void KHangManView::slotTry() TQTimer::singleShot( 4 * 1000, this, TQT_SLOT(slotNewGame()) ); } - else if (KMessageBox::questionYesNo(this, newGameString, TQString::null, i18n("Play Again"), i18n("Do Not Play")) == 3) + else if (KMessageBox::questionYesNo(this, newGameString, TQString(), i18n("Play Again"), i18n("Do Not Play")) == 3) slotNewGame(); else kapp->quit(); @@ -496,7 +496,7 @@ void KHangManView::slotTry() int x = 0; int y = 0; - if (m_missedLetters.contains(guess, false) > 0) { + if (m_missedLetters.tqcontains(guess, false) > 0) { // FIXME: popup should be better placed. TQPoint abspos = popup->pos(); @@ -513,7 +513,7 @@ void KHangManView::slotTry() m_letterInput->setEnabled(false); } - if (m_goodWord.contains(guess, false) > 0) { + if (m_goodWord.tqcontains(guess, false) > 0) { TQPoint abspos = popup->pos(); if (Prefs::mode() == 0) { @@ -586,15 +586,15 @@ void KHangManView::game() // Check if the data files are installed in the correct dir. TQString myString = TQString("khangman/data/%1/%2") - .arg(Prefs::selectedLanguage()) - .arg(Prefs::levelFile()); + .tqarg(Prefs::selectedLanguage()) + .tqarg(Prefs::levelFile()); TQFile myFile; myFile.setName(locate("data", myString)); if (!myFile.exists()) { TQString mString = i18n("File $KDEDIR/share/apps/khangman/data/%1/%2 not found!\n" "Check your installation, please!") - .arg(Prefs::selectedLanguage()) - .arg(Prefs::levelFile()); + .tqarg(Prefs::selectedLanguage()) + .tqarg(Prefs::levelFile()); KMessageBox::sorry( this, mString, i18n("Error") ); kapp->quit(); } @@ -631,42 +631,42 @@ void KHangManView::game() // If needed, display white space or - if in word or semi dot. // 1. Find dashes. - int f = m_word.find( "-" ); + int f = m_word.tqfind( "-" ); if (f>0) { - m_goodWord.replace(2*f, 1, "-"); + m_goodWord.tqreplace(2*f, 1, "-"); - int g = m_word.find( "-", f+1); + int g = m_word.tqfind( "-", f+1); if (g>0) - m_goodWord.replace(2*g, 3, "-"); + m_goodWord.tqreplace(2*g, 3, "-"); if (g>1) m_goodWord.append("_"); } // 2. Find white space. - c = m_word.find( " " ); + c = m_word.tqfind( " " ); if (c > 0) { - m_goodWord.replace(2*c, 1, " "); - dd = m_word.find( " ", c+1); + m_goodWord.tqreplace(2*c, 1, " "); + dd = m_word.tqfind( " ", c+1); if (dd > 0) - m_goodWord.replace(2*dd, c+1, " "); + m_goodWord.tqreplace(2*dd, c+1, " "); } // 3. Find · - int e = m_word.find( TQString::fromUtf8("·") ); + int e = m_word.tqfind( TQString::fromUtf8("·") ); if (e>0) - m_goodWord.replace(2*e, 1, TQString::fromUtf8("·") ); + m_goodWord.tqreplace(2*e, 1, TQString::fromUtf8("·") ); // 4. Find ' - int h = m_word.find( "'" ); + int h = m_word.tqfind( "'" ); if (h>0) - m_goodWord.replace(2*h, 1, "'"); + m_goodWord.tqreplace(2*h, 1, "'"); } void KHangManView::readFile() { kdDebug() << "in read kvtml file " << endl; - TQString myString=TQString("khangman/data/%1/%2").arg(Prefs::selectedLanguage()).arg(Prefs::levelFile()); + TQString myString=TQString("khangman/data/%1/%2").tqarg(Prefs::selectedLanguage()).tqarg(Prefs::levelFile()); myString= locate("data", myString); KEduVocDataItemList verbs = KEduVocData::parse(myString); @@ -728,7 +728,7 @@ void KHangManView::loadAnimation() for (uint i = 0; i < 11; i++) { m_animationPics[i].load(locate( "data", TQString("khangman/pics/%1/animation%2.png") - .arg(m_themeName).arg(i) )); + .tqarg(m_themeName).tqarg(i) )); } } diff --git a/khangman/khangman/khangmanview.h b/khangman/khangman/khangmanview.h index 7ffffcf2..8f03f7c9 100644 --- a/khangman/khangman/khangmanview.h +++ b/khangman/khangman/khangmanview.h @@ -38,16 +38,17 @@ class KHangMan; * here. */ -class KHangManView : public QWidget +class KHangManView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KHangManView(KHangMan *parent=0, const char *name=0); + KHangManView(KHangMan *tqparent=0, const char *name=0); virtual ~KHangManView(); - ///parent instance + ///tqparent instance KHangMan *khangman; void setTheme(); diff --git a/khangman/khangman/khnewstuff.cpp b/khangman/khangman/khnewstuff.cpp index f15fca87..efc816e5 100644 --- a/khangman/khangman/khnewstuff.cpp +++ b/khangman/khangman/khnewstuff.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -55,8 +55,8 @@ bool KHNewStuff::install( const TQString &fileName ) m_view->khangman->setLanguages(); //refresh Languages menu m_view->khangman->m_languageAction->setItems(m_view->khangman->m_languageNames); - m_view->khangman->slotChangeLanguage(m_view->khangman->m_languages.findIndex(Prefs::selectedLanguage())); - m_view->khangman->m_languageAction->setCurrentItem(m_view->khangman->m_languages.findIndex(Prefs::selectedLanguage())); + m_view->khangman->slotChangeLanguage(m_view->khangman->m_languages.tqfindIndex(Prefs::selectedLanguage())); + m_view->khangman->m_languageAction->setCurrentItem(m_view->khangman->m_languages.tqfindIndex(Prefs::selectedLanguage())); return true; } diff --git a/khangman/khangman/khnewstuff.h b/khangman/khangman/khnewstuff.h index 826300f2..a80652ed 100644 --- a/khangman/khangman/khnewstuff.h +++ b/khangman/khangman/khnewstuff.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KHNEWSTUFF_H #define KHNEWSTUFF_H diff --git a/khangman/khangman/normal.ui b/khangman/khangman/normal.ui index f9673223..ad8dc9e9 100644 --- a/khangman/khangman/normal.ui +++ b/khangman/khangman/normal.ui @@ -1,10 +1,10 @@ normal - + normal - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout4 + tqlayout4 unnamed - + kcfg_OneLetter @@ -41,7 +41,7 @@ For example, the word to guess is "potato". If this option is unchecked, when yo Default is that for one letter typed, all instances of that letter in the word are displayed. - + kcfg_WonDialog @@ -58,7 +58,7 @@ This is the default state. If this option is checked, this dialog will not appear and a new game will automatically start after four seconds. A passive popup tells you you have won the game. When this opton is checked you don't have an intrusive dialog each time you won a game. - + groupBox3_2 @@ -69,7 +69,7 @@ If this option is checked, this dialog will not appear and a new game will autom unnamed - + kcfg_Sound @@ -90,5 +90,5 @@ Default is no sound. - + diff --git a/khangman/khangman/prefs.kcfgc b/khangman/khangman/prefs.kcfgc index b7e804e6..8d9311bc 100644 --- a/khangman/khangman/prefs.kcfgc +++ b/khangman/khangman/prefs.kcfgc @@ -1,6 +1,6 @@ # Code generation options for kconfig_compiler File=khangman.kcfg -IncludeFiles=kstandarddirs.h,qdir.h +IncludeFiles=kstandarddirs.h,tqdir.h ClassName=Prefs Singleton=true Mutators=true diff --git a/khangman/khangman/timer.h b/khangman/khangman/timer.h index ad6b50bb..1d2d1738 100644 --- a/khangman/khangman/timer.h +++ b/khangman/khangman/timer.h @@ -33,6 +33,7 @@ class Timer : public timerdlg { Q_OBJECT + TQ_OBJECT public: ///Constructor diff --git a/khangman/khangman/timerdlg.ui b/khangman/khangman/timerdlg.ui index facfaaa1..2e803f1d 100644 --- a/khangman/khangman/timerdlg.ui +++ b/khangman/khangman/timerdlg.ui @@ -1,10 +1,10 @@ timerdlg - + timerdlg - + 0 0 @@ -16,7 +16,7 @@ unnamed - + groupBox5 @@ -27,15 +27,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + kcfg_HintTimer @@ -64,7 +64,7 @@ Time during which the Hint is displayed - You can set the time for displaying the Hint tooltip. Default is 3 seconds but younger children might need longer time to be able to read the Hint. + You can set the time for displaying the Hint tooltip. Default is 3 seconds but younger tqchildren might need longer time to be able to read the Hint. @@ -77,7 +77,7 @@ Expanding - + 295 20 @@ -94,14 +94,14 @@ Expanding - + 25 16 - + timeHintLabel @@ -122,9 +122,9 @@ - + - layout6 + tqlayout6 @@ -138,7 +138,7 @@ Set the time for displaying the Already Guessed Letter: - + timeMissedLabel @@ -149,7 +149,7 @@ kcfg_MissedTimer - + kcfg_MissedTimer @@ -178,7 +178,7 @@ Time during which the Already Guessed tooltip is displayed - You can set the time for displaying the Already Guessed tooltip after you try a letter that was already guessed. Default is 3 seconds but younger children might need longer time to be able to understand they are trying a letter that was already guessed. + You can set the time for displaying the Already Guessed tooltip after you try a letter that was already guessed. Default is 3 seconds but younger tqchildren might need longer time to be able to understand they are trying a letter that was already guessed. @@ -191,7 +191,7 @@ Expanding - + 25 16 @@ -208,7 +208,7 @@ Expanding - + 295 20 @@ -221,7 +221,7 @@ - + kactivelabel.h kactivelabel.h diff --git a/kig/ChangeLog b/kig/ChangeLog index ec8d6042..8c60c89f 100644 --- a/kig/ChangeLog +++ b/kig/ChangeLog @@ -10,7 +10,7 @@ 2005-09-16 Pino Toscano * Move a text label by (2,2), so the attached ones should be less - sticky to the "parent" object. + sticky to the "tqparent" object. 2005-09-08 Pino Toscano @@ -936,7 +936,7 @@ and made a sort of skeleton to modify type's data. * Made buttons of some dialogs like other KDE dialogs ones (with - icons and correct alignment). + icons and correct tqalignment). * Kig now ask the user when exporting type(s) to an already existant file. @@ -1142,8 +1142,8 @@ * Fix the moving system again, it now only redraws exactly those objects that need to be redrawn. E.g. when a constrained point - was moved, before it was assumed that all of its parents, and - their children would move, whereas in reality, a constrained point + was moved, before it was assumed that all of its tqparents, and + their tqchildren would move, whereas in reality, a constrained point does not move the curve it is constrained to. This is now taken into account for. This much optimizes the case where we move the constrained point in examples/sine-curve.kig. @@ -1200,7 +1200,7 @@ could not open.. I'm backporting this into Kig 0.6.0 and informing the packager.. - * clean up: Objects now store their parents in order, so that no + * clean up: Objects now store their tqparents in order, so that no parsing has to be done in the calc() function.. Also some more modifications making that function a bit simpler are included. Specifically, ArgsParser now does the checking of the arguments, @@ -1218,7 +1218,7 @@ 2003-09-01 Dominique Devriese - * only move an object if its parents are not yet moving.. This + * only move an object if its tqparents are not yet moving.. This fixes bug #63250. * remove the defective operator| and operator& implementations for @@ -1399,7 +1399,7 @@ * show an appropriate error when trying to open an non-existing file.. - * clean up the object parent-child relation mechanism. Rather + * clean up the object tqparent-child relation mechanism. Rather large code cleanup, that simplifies a lot of code.. Needed a backwards-compatible file format extension. This commit now also adds proper treatment of internal objects, because it no longer @@ -1438,7 +1438,7 @@ 2003-05-24 Dominique Devriese * when the user tries to construct a macro that constructs an - object from its children, warn him instead of + object from its tqchildren, warn him instead of crashing... Thanks to Stephan Binner for the bug report * improve the export to image dialog, as suggested by Stephan Binner @@ -1516,7 +1516,7 @@ * organise the filters directory more sanely - * fix for deleting: remove deleted objects from their children, so + * fix for deleting: remove deleted objects from their tqchildren, so they don't appear in saved files 2003-05-07 Dominique Devriese diff --git a/kig/DESIGN b/kig/DESIGN index fd887779..6d4a8c37 100644 --- a/kig/DESIGN +++ b/kig/DESIGN @@ -19,7 +19,7 @@ An ObjectImp represents the current state of an object in Kig. It keeps information about what type of object it is ( e.g. a line, a point, a circle etc. ), and its exact data ( e.g. the center and radius of the circle ). It is *not* in any way aware of how the -object was calculated from its parents (e.g. is this a line that is +object was calculated from its tqparents (e.g. is this a line that is constructed as the parallel of another line, or as the line going through two given points ? ) or how it is drawn on the window ( e.g. the thickness of the line, its color etc. ). @@ -50,21 +50,21 @@ calculating an ObjectImp from other ObjectImp's. It is also a node in the dependency graph of a certain document. E.g. a LineImp can be calculated from the two PointImp's it has to go through; every time either of them moves, this calculation is redone. In this case, there -would be an ObjectCalcer that keeps a reference to its two parents ( +would be an ObjectCalcer that keeps a reference to its two tqparents ( the ObjectCalcer's representing the points ), and that will calculate its ObjectImp value every time it is asked to do so ( i.e. every time -one of its parents moves.. ). +one of its tqparents moves.. ). Because of the complex relations that ObjectCalcer's hold to other ObjectCalcer's and to other classes, they have been made reference-counted. This means that they keep a count internally of how much times a pointer to them is held. If this count reaches 0, this means that nobody needs them anymore, and they delete themselves. -E.g. an ObjectCalcer always keeps a reference to its parents, to +E.g. an ObjectCalcer always keeps a reference to its tqparents, to ensure that those aren't deleted before it is deleted. In the inheritance graph of a document, the lowermost objects keep -references to their parents and those keep reference to their parents, +references to their tqparents and those keep reference to their tqparents, so that all of the top of the graph is kept alive. Of course, someone needs to keep a reference to the bottommost objects in the graph, because otherwise, the entire graph would be deleted. As we will see @@ -76,7 +76,7 @@ At the end of the program, this reference is released, and all the objects are deleted. A special case of an ObjectCalcer is the ObjectConstCalcer. This is -an ObjectCalcer that has no parents, and only holds some data. The +an ObjectCalcer that has no tqparents, and only holds some data. The data is held as an ObjectImp of some type, and it will remain constant, and no calculation needs to be done to get it, it is just returned every time it is needed. @@ -158,10 +158,10 @@ Most of this is handled by the TextType class. 2.1.2 TextType -The TextType class is an implementation of an ObjectType. It contains -code specifying how to calculate a TextImp from its parents, and for +The TextType class is an implementation of an ObjectType. It tqcontains +code specifying how to calculate a TextImp from its tqparents, and for how it behaves on user input. A text object has at least three -parents, and can handle any number of optional arguments. The three +tqparents, and can handle any number of optional arguments. The three mandatory arguments are an int, which is set to 1 or 0 depending on whether the label needs a surrounding box, a PointImp, containing the location of the text label, and a string containing the text of the @@ -170,7 +170,7 @@ additional argument is used to replace the lowest-numbered of those tokens, with its string representation. The function ObjectImp::fillInNextEscape is used for this. -For example, if a TextType has the following parents: +For example, if a TextType has the following tqparents: a IntImp with value 0 a PointImp with value (0,0) a String with value "This segment is %1 units long." @@ -185,7 +185,7 @@ All this gives labels in Kig a lot of flexibility. 2.2 Locuses Locuses are a mathematical concept that has been modelled in Kig. -Loosely defined, a locus is the mathematical shape defined by the set +Loosely defined, a locus is the mathematical tqshape defined by the set of points that a certain point moves through while another point is moved over its constraints. This can be used to define mathematical objects like conics, and various other things. It has been modelled @@ -197,7 +197,7 @@ proud of this design. In the implementation of this, we use the concept of constrained points. This is a point that is attached to a certain curve. It is implemented in Kig by the ConstrainedPointType, which takes a CurveImp -and a DoubleImp as parents and calculates a Point from these by using +and a DoubleImp as tqparents and calculates a Point from these by using the CurveImp::getPoint function. 2.2.2 The Implementation @@ -213,7 +213,7 @@ smallest part of the hierarchy that contains all paths from the first point to the second point. We then determine all objects that are not *on* one of those paths ( meaning that they are not calculated from the first point, or another object that is on one of those paths ), -but that are parents of one or more objects that are on those paths. +but that are tqparents of one or more objects that are on those paths. I call this set of objects the "side of the path" sometimes in the code. The function that finds them is called sideOfTreePath. @@ -221,7 +221,7 @@ Next, an ObjectHierarchy object is constructed, which stores the way to calculate the second point from the first point and the objects from the previous paragraph. -An object is then constructed that has as parent the curve parent that +An object is then constructed that has as tqparent the curve tqparent that the first point is constrained to, the HierarchyImp containing the ObjectHierarchy from the previous paragraph, and all the objects from the "side of the tree". This new object is an ObjectTypeCalcer with @@ -258,9 +258,9 @@ the constrained point. This is wrong because when the constrained point moves within the limits of the curve constraining it, the locus does by definition not change. Also, if the constrained point is redefined so that it is no longer constrained to any curve, this is a -major problem, because it would invalidate the locus. Another point +major problem, because it would tqinvalidate the locus. Another point is that in practice, the locus depends on more objects than its -parents alone. This is not a good thing, because it makes it +tqparents alone. This is not a good thing, because it makes it impossible to optimise drawing of the objects, using the information about which objects depend on which others, because this information is invalid. diff --git a/kig/FEATURES b/kig/FEATURES index 012f49f1..054ce9bc 100644 --- a/kig/FEATURES +++ b/kig/FEATURES @@ -16,7 +16,7 @@ here are some nice Kig features i'd like to show off :) - is a KPart: try opening macrotest.kig from konqueror, if it doesn't work yet, open your kcontrol, then go to "File Browsing"->"File Associations", click add, group:"application", name:"x-kig", open - the "embedding" tab page for the new type, click "add", find + the "embedding" tab page for the new type, click "add", tqfind "KigPart" (if you installed Kig correctly (did you get the "--prefix" on your configure right?) , it should be there), and add it. then try opening macrotest.kig again @@ -30,7 +30,7 @@ here are some nice Kig features i'd like to show off :) Moreover, the other supported formats are: XFig files, and SVG and LaTeX documents. These are useful since not all other programs support Kig files yet... ;) -- Kig is very compatible with the program it was intended to replace, +- Kig is very compatible with the program it was intended to tqreplace, KGeo. It supports all of its Object types and most of its file format... - There is a very flexible mechanism for supporting TextLabels with diff --git a/kig/Makefile.am b/kig/Makefile.am index b2483db0..66724ec2 100644 --- a/kig/Makefile.am +++ b/kig/Makefile.am @@ -1,3 +1,5 @@ +INCLUDES = $(all_includes) + if KIG_COMPILE_PYTHON_SCRIPTING scriptingdir = scripting scriptinglib = scripting/libscripting.la @@ -23,7 +25,7 @@ SUBDIRS = \ kde_module_LTLIBRARIES = libkigpart.la libkigpart_la_SOURCES = dummy.cpp -libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lktexteditor libkigpart_la_LIBADD = $(LIB_KPARTS) \ misc/libmisc.la objects/libobjects.la filters/libfilters.la \ modes/libmodes.la kig/libkigparttemp.la $(scriptinglib) diff --git a/kig/README.boost-python1.30-gcc3.2 b/kig/README.boost-python1.30-gcc3.2 index cafda75e..959d5264 100644 --- a/kig/README.boost-python1.30-gcc3.2 +++ b/kig/README.boost-python1.30-gcc3.2 @@ -12,7 +12,7 @@ be applied in the following way. Open a console window, and go to the directory containing the Boost.Python headers. This will most likely be called something like "/usr/include/boost/python/". Then execute the following commands ( -before giving these commands, replace "/dir/to/kig/distribution/" by +before giving these commands, tqreplace "/dir/to/kig/distribution/" by the directory where you put the downloaded kig distribution ): cd object diff --git a/kig/TODO b/kig/TODO index 8acd9949..a6f97fe3 100644 --- a/kig/TODO +++ b/kig/TODO @@ -50,7 +50,7 @@ - make DoubleImp a "visible" object with uses like Dr. Geo numeric values. -- Provide some nice stuff for differential geometry: velocity vector +- Provide some nice stuff for differential tqgeometry: velocity vector of a curve, curvature vector, osculating parabole. Most of this is not too difficult to implement, but very cool :) @@ -58,9 +58,9 @@ allow for importing from/exporting to other formula formats such as KFormula, OOFormula and MathML. -- other types of fillable shapes, like arc sector, arc segment... +- other types of fillable tqshapes, like arc sector, arc segment... -- defined integrals, as a particular case of filled shapes. +- defined integrals, as a particular case of filled tqshapes. - improve *a lot* the transformation support for cubics. @@ -102,8 +102,8 @@ - extend ObjectFactory::sensiblePointCalcer to also construct intersection points of stuff... (pino: done for lines) -- when moving an object that wants to move its parents, try to check if - it is itself not an indirect child of one of the parents it is +- when moving an object that wants to move its tqparents, try to check if + it is itself not an indirect child of one of the tqparents it is trying to move, and forbid the move in that case, as it will lead to chaotic behaviour. I am not sure if this is really well possible, but I have to look at it. @@ -141,7 +141,7 @@ - write cabri-filter-status.txt. -- add "Tools": easy tools designed for geometry, like Angle converter and +- add "Tools": easy tools designed for tqgeometry, like Angle converter and so on... - save a "session", i.e.: record how a document is moved, and save it to diff --git a/kig/configure.in.in b/kig/configure.in.in index 33986af8..b9884199 100644 --- a/kig/configure.in.in +++ b/kig/configure.in.in @@ -121,6 +121,12 @@ AC_DEFUN([REGINA_LIB_BOOST_PYTHON], [ "$prefix/include/$pyver" "$prefix/$pyver/include"; do CXXFLAGS="$__regina_py_save_cxxflags -I$incdir" LDFLAGS="$__regina_py_save_ldflags -shared" + if test -z "$qt_libraries"; then + LDFLAGS="$LDFLAGS" + else + LDFLAGS="$LDFLAGS -L$qt_libraries" + fi + LDFLAGS="$LDFLAGS -ltqt" # Check for python includes. AC_TRY_COMPILE([ @@ -146,6 +152,12 @@ AC_DEFUN([REGINA_LIB_BOOST_PYTHON], [ for extralibs in "" "-lpthread -lm -lutil -ldl"; do AC_MSG_CHECKING([for $pylibdir/lib$pylib and $extralibs with $incdir/Python.h]) LDFLAGS="$__regina_py_save_ldflags -L$pylibdir" + if test -z "$qt_libraries"; then + LDFLAGS="$LDFLAGS" + else + LDFLAGS="$LDFLAGS -L$qt_libraries" + fi + LDFLAGS="$LDFLAGS -ltqt" LIBS="-l$pylib $extralibs" AC_TRY_LINK([ #include @@ -156,6 +168,12 @@ AC_DEFUN([REGINA_LIB_BOOST_PYTHON], [ for bplib in "-lboost_python-mt" "-lboost_python-gcc-mt-1_32" "-lboost_python-gcc-mt-1_31" "-lboost_python-gcc-mt" "-lboost_python"; do AC_MSG_CHECKING([compilation of a boost.python program with $bplib]) LDFLAGS="$__regina_py_save_ldflags -L$pylibdir" + if test -z "$qt_libraries"; then + LDFLAGS="$LDFLAGS" + else + LDFLAGS="$LDFLAGS -L$qt_libraries" + fi + LDFLAGS="$LDFLAGS -ltqt" LIBS="-l$pylib $bplib $extralibs" AC_TRY_LINK([ #include diff --git a/kig/examples/figure_angle.fgeo b/kig/examples/figure_angle.fgeo index 22db1113..47076564 100644 --- a/kig/examples/figure_angle.fgeo +++ b/kig/examples/figure_angle.fgeo @@ -1,30 +1,30 @@ - + -5.833333 2.950000 - + -4.666666 -0.783334 - + 2.333334 -0.216667 - - - + + + - - - + + + - - - - + + + + diff --git a/kig/examples/figure_manyobjects.fgeo b/kig/examples/figure_manyobjects.fgeo index c03634e3..c89c976f 100644 --- a/kig/examples/figure_manyobjects.fgeo +++ b/kig/examples/figure_manyobjects.fgeo @@ -1,72 +1,72 @@ - + -6.700000 2.250000 - + 0.266667 2.083333 - + -0.800000 -2.516667 - + -2.766667 1.883333 - - - + + + - - - + + + - + -2.833333 -0.983334 - + 1.500000 1.883333 - + -0.566667 3.983333 - - - + + + - - - + + + - + -5.533333 -0.383333 - + -2.800000 1.883333 - - + + - + 3.166667 -0.683333 - - - + + + - - - - + + + + diff --git a/kig/examples/session_alotofthings.fgeo b/kig/examples/session_alotofthings.fgeo index 967dada9..dc8bb729 100644 --- a/kig/examples/session_alotofthings.fgeo +++ b/kig/examples/session_alotofthings.fgeo @@ -1,69 +1,69 @@ - + 0.766667 2.450000 - + -3.300000 2.650000 - + -7.900000 -2.583333 - + -7.800000 0.116667 - + -4.533333 1.216667 - + -8.566667 3.116667 - + -7.066667 1.783334 - - - + + + - - - - + + + + - - - + + + - + -1.066667 -0.416667 - - - + + + - - - + + + - - - + + + - - - + + + - Figure 1 contains: + Figure 1 tqcontains: - some points; - an arc; - a line; @@ -72,91 +72,91 @@ - an intersection point; - a reflection point; -Figure 2 contains: +Figure 2 tqcontains: - some points; - 2 lines; - a midpoint; - a parallel; - 2 intersection points; -Figure 3 contains: +Figure 3 tqcontains: - some points; - a circle; - a vector; - a moved circle; - + -5.200000 0.216667 - + 1.200000 3.116667 - + -7.666667 1.650000 - - - + + + - - - + + + - - - + + + - + -6.200000 -1.483334 - - - + + + - - - + + + - - - + + + - + -6.433334 2.050000 - + -1.400000 2.583333 - + -1.300000 -0.350000 - + -3.433333 -0.883333 - + -6.433334 2.050000 - - + + - - - + + + - - - + + + diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc index 3cadf522..55ecf939 100644 --- a/kig/filters/cabri-filter.cc +++ b/kig/filters/cabri-filter.cc @@ -56,7 +56,7 @@ * * Nr: Simple sequential numbering of the objects in a file. * Type: seen so far: Pt, Axes, Line, Cir - * NumberOfParents: The number of parents that will be specified in + * NumberOfParents: The number of tqparents that will be specified in * Parents * Color: * R -> red @@ -96,7 +96,7 @@ * Visible: * V means visible, I means invisible * Fixed: - * St means fix this object ( if you move one of its parents, it + * St means fix this object ( if you move one of its tqparents, it * won't move ), nSt ( the default ) means don't fix this object. * Parents: * The numbers of the objects this object depends on @@ -118,7 +118,7 @@ struct CabriObject int specialAppearanceSwitch; bool visible; bool fixed; - std::vector parents; + std::vector tqparents; std::vector data; }; @@ -151,25 +151,25 @@ static TQString readLine( TQFile& file ) static TQColor translatecolor( const TQString& s ) { - if ( s == "R" ) return Qt::red; - if ( s == "O" ) return Qt::magenta; - if ( s == "Y" ) return Qt::yellow; - if ( s == "P" ) return Qt::darkMagenta; - if ( s == "V" ) return Qt::darkBlue; - if ( s == "Bl" ) return Qt::blue; - if ( s == "lBl" ) return Qt::cyan; // TODO: bright blue - if ( s == "G" ) return Qt::green; - if ( s == "dG" ) return Qt::darkGreen; + if ( s == "R" ) return TQt::red; + if ( s == "O" ) return TQt::magenta; + if ( s == "Y" ) return TQt::yellow; + if ( s == "P" ) return TQt::darkMagenta; + if ( s == "V" ) return TQt::darkBlue; + if ( s == "Bl" ) return TQt::blue; + if ( s == "lBl" ) return TQt::cyan; // TODO: bright blue + if ( s == "G" ) return TQt::green; + if ( s == "dG" ) return TQt::darkGreen; if ( s == "Br" ) return TQColor( 165, 42, 42 ); if ( s == "dBr" ) return TQColor( 128, 128, 0 ); - if ( s == "lGr" ) return Qt::lightGray; - if ( s == "Gr" ) return Qt::gray; - if ( s == "dGr" ) return Qt::darkGray; - if ( s == "B" ) return Qt::black; - if ( s == "W" ) return Qt::white; + if ( s == "lGr" ) return TQt::lightGray; + if ( s == "Gr" ) return TQt::gray; + if ( s == "dGr" ) return TQt::darkGray; + if ( s == "B" ) return TQt::black; + if ( s == "W" ) return TQt::white; kdDebug() << k_funcinfo << "unknown color: " << s << endl; - return Qt::black; + return TQt::black; } bool KigFilterCabri::readObject( TQFile& f, CabriObject& myobj ) @@ -246,14 +246,14 @@ bool KigFilterCabri::readObject( TQFile& f, CabriObject& myobj ) KIG_FILTER_PARSE_ERROR; tmp = thirdlinere.cap( 2 ); - TQStringList parentsids = TQStringList::split( ' ', tmp ); - for ( TQStringList::iterator i = parentsids.begin(); - i != parentsids.end(); ++i ) + TQStringList tqparentsids = TQStringList::split( ' ', tmp ); + for ( TQStringList::iterator i = tqparentsids.begin(); + i != tqparentsids.end(); ++i ) { - myobj.parents.push_back( ( *i ).toInt( &ok ) ); + myobj.tqparents.push_back( ( *i ).toInt( &ok ) ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; } - if ( myobj.parents.size() != myobj.numberOfParents ) + if ( myobj.tqparents.size() != myobj.numberOfParents ) KIG_FILTER_PARSE_ERROR; tmp = thirdlinere.cap( 4 ); @@ -277,8 +277,8 @@ bool KigFilterCabri::readObject( TQFile& f, CabriObject& myobj ) // << "specialAppearanceSwitch = " << myobj.specialAppearanceSwitch << endl // << "visible = " << visible << endl // << "fixed = " << myobj.fixed << endl -// << "parents =" << endl; -// for ( std::vector::iterator i = myobj.parents.begin(); i != myobj.parents.end(); ++i ) +// << "tqparents =" << endl; +// for ( std::vector::iterator i = myobj.tqparents.begin(); i != myobj.tqparents.end(); ++i ) // kdDebug() << " " << *i << endl; // kdDebug() << "vals = " << endl; // for ( std::vector::iterator i = myobj.data.begin(); i != myobj.data.end(); ++i ) @@ -352,8 +352,8 @@ KigDocument* KigFilterCabri::load( const TQString& file ) int ps = 0; args.clear(); - for ( std::vector::iterator i = obj.parents.begin(); - i != obj.parents.end(); ++i ) + for ( std::vector::iterator i = obj.tqparents.begin(); + i != obj.tqparents.end(); ++i ) args.push_back( calcers[*i-3] ); // two fake objects at the start ( origin and axes.. ) @@ -441,10 +441,10 @@ KigDocument* KigFilterCabri::load( const TQString& file ) obj.thick *= 2; if ( args.size() != 1 || obj.data.size() != 2 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* parent = args[0]; - if ( !parent->imp()->inherits( CurveImp::stype() ) ) + ObjectCalcer* tqparent = args[0]; + if ( !tqparent->imp()->inherits( CurveImp::stype() ) ) KIG_FILTER_PARSE_ERROR; - const CurveImp* curve = static_cast( parent->imp() ); + const CurveImp* curve = static_cast( tqparent->imp() ); Coordinate pt = Coordinate( obj.data[0], obj.data[1] ); double param = curve->getParam( pt, *ret ); args.push_back( new ObjectConstCalcer( new DoubleImp( param ) ) ); @@ -486,11 +486,11 @@ KigDocument* KigFilterCabri::load( const TQString& file ) // points, or a vector... if ( args.size() != 1 || !obj.data.empty() ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* parent = args[0]; - if ( parent->imp()->inherits( SegmentImp::stype() ) ) - oc = fact->propertyObjectCalcer( parent, "mid-point" ) ; - else if ( parent->imp()->inherits( VectorImp::stype() ) ) - oc = fact->propertyObjectCalcer( parent, "vect-mid-point" ); + ObjectCalcer* tqparent = args[0]; + if ( tqparent->imp()->inherits( SegmentImp::stype() ) ) + oc = fact->propertyObjectCalcer( tqparent, "mid-point" ) ; + else if ( tqparent->imp()->inherits( VectorImp::stype() ) ) + oc = fact->propertyObjectCalcer( tqparent, "vect-mid-point" ); else KIG_FILTER_PARSE_ERROR; } else if ( obj.type == "PBiss" ) @@ -505,12 +505,12 @@ KigDocument* KigFilterCabri::load( const TQString& file ) } if ( args.size() != 1 || !obj.data.empty() ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* parent = args[0]; + ObjectCalcer* tqparent = args[0]; ObjectCalcer* midpoint = 0; - if ( parent->imp()->inherits( SegmentImp::stype() ) ) - midpoint = fact->propertyObjectCalcer( parent, "mid-point" ) ; -// else if ( parent->imp()->inherits( VectorImp::stype() ) ) -// midpoint = fact->propertyObjectCalcer( parent, "vect-mid-point" ); + if ( tqparent->imp()->inherits( SegmentImp::stype() ) ) + midpoint = fact->propertyObjectCalcer( tqparent, "mid-point" ) ; +// else if ( tqparent->imp()->inherits( VectorImp::stype() ) ) +// midpoint = fact->propertyObjectCalcer( tqparent, "vect-mid-point" ); else KIG_FILTER_PARSE_ERROR; midpoint->calc( *ret ); args.push_back( midpoint ); @@ -549,7 +549,7 @@ KigDocument* KigFilterCabri::load( const TQString& file ) else { notSupported( file, i18n( "This Cabri file contains a \"%1\" object, " - "which Kig does not currently support." ).arg( obj.type ) ); + "which Kig does not currently support." ).tqarg( TQString(obj.type) ) ); return 0; } diff --git a/kig/filters/drgeo-filter-chooser.h b/kig/filters/drgeo-filter-chooser.h index f5057361..1adb47c0 100644 --- a/kig/filters/drgeo-filter-chooser.h +++ b/kig/filters/drgeo-filter-chooser.h @@ -28,6 +28,7 @@ class KigFilterDrgeoChooser : public KigFilterDrgeoChooserBase { Q_OBJECT + TQ_OBJECT public: KigFilterDrgeoChooser( const TQStringList& l ); diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui index 829d84cc..aa4361ee 100644 --- a/kig/filters/drgeo-filter-chooserbase.ui +++ b/kig/filters/drgeo-filter-chooserbase.ui @@ -1,10 +1,10 @@ KigFilterDrgeoChooserBase - + KigFilterDrgeoChooserBase - + 0 0 @@ -25,7 +25,7 @@ 6 - + ExplanationTextLabel @@ -33,11 +33,11 @@ The current Dr. Geo file contains more than one figure. Please select which to import: - + WordBreak|AlignVCenter - + Layout1 @@ -72,7 +72,7 @@ Please select which to import: Horizontal - + Layout7 @@ -96,7 +96,7 @@ Please select which to import: Expanding - + 20 20 @@ -131,7 +131,7 @@ Please select which to import: - + klistbox.h kpushbutton.h diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc index 82438a57..3f213146 100644 --- a/kig/filters/drgeo-filter.cc +++ b/kig/filters/drgeo-filter.cc @@ -62,7 +62,7 @@ struct DrGeoHierarchyElement { TQString id; - std::vector parents; + std::vector tqparents; }; KigFilterDrgeo::KigFilterDrgeo() @@ -106,9 +106,9 @@ KigDocument* KigFilterDrgeo::load( const TQString& file ) if ( figures.isEmpty() ) { if( nmacros > 0 ) warning( i18n( "The Dr. Geo file \"%1\" is a macro file so it contains no " - "figures." ).arg( file ) ); + "figures." ).tqarg( file ) ); else - warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).arg( file ) ); + warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).tqarg( file ) ); return false; } @@ -201,8 +201,8 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co { TQDomElement ce = c.toElement(); if ( ce.isNull() ) continue; - else if ( ce.tagName() == "parent" ) - elem.parents.push_back( ce.attribute( "ref" ) ); + else if ( ce.tagName() == "tqparent" ) + elem.tqparents.push_back( ce.attribute( "ref" ) ); } TQString curid = domelem.attribute( "id" ); elem.id = !curid.isNull() ? curid : TQString::number( withoutid++ ) ; @@ -216,9 +216,9 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co for ( uint i = 0; i < elems.size(); ++i ) { x = ""; - for ( uint j = 0; j < elems[i].parents.size(); ++j ) + for ( uint j = 0; j < elems[i].tqparents.size(); ++j ) { - x += elems[i].parents[j] + "_"; + x += elems[i].tqparents[j] + "_"; } kdDebug() << " --> " << i << " - " << elems[i].id << " - " << x << endl; } @@ -241,25 +241,25 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co kdDebug() << "+++ id: " << curid << endl; #endif const DrGeoHierarchyElement& el = elems[curid]; - std::vector parents; - for ( uint j = 0; j < el.parents.size(); ++j ) + std::vector tqparents; + for ( uint j = 0; j < el.tqparents.size(); ++j ) { - int parentid = convertDrgeoIndex( elems, el.parents[j] ); - if ( parentid == -1 ) + int tqparentid = convertDrgeoIndex( elems, el.tqparents[j] ); + if ( tqparentid == -1 ) KIG_FILTER_PARSE_ERROR; - parents.push_back( holders[parentid-nignored]->calcer() ); + tqparents.push_back( holders[tqparentid-nignored]->calcer() ); }; TQDomElement domelem = a.toElement(); #ifdef DRGEO_DEBUG - if ( parents.size() > 0 ) - for ( uint j = 0; j < parents.size(); ++j ) + if ( tqparents.size() > 0 ) + for ( uint j = 0; j < tqparents.size(); ++j ) { - kdDebug() << "+++++++++ parent[" << j << "]: " << parents[j] << " - " - << parents[j]->imp()->type()->internalName() << endl; + kdDebug() << "+++++++++ tqparent[" << j << "]: " << tqparents[j] << " - " + << tqparents[j]->imp()->type()->internalName() << endl; } else - kdDebug() << "+++++++++ parents: NO" << endl; + kdDebug() << "+++++++++ tqparents: NO" << endl; kdDebug() << "+++++++++ " << domelem.tagName() << " - " << domelem.attribute("type") << endl; #endif @@ -291,15 +291,15 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = fact->fixedPointCalcer( Coordinate( x, y ) ); } else if ( domelem.attribute( "type" ) == "Middle_2pts" ) - oc = new ObjectTypeCalcer( MidPointType::instance(), parents ); + oc = new ObjectTypeCalcer( MidPointType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Middle_segment" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - if ( !parents[0]->imp()->inherits( SegmentImp::stype() ) ) + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + if ( !tqparents[0]->imp()->inherits( SegmentImp::stype() ) ) KIG_FILTER_PARSE_ERROR; - ObjectPropertyCalcer* o1 = fact->propertyObjectCalcer( parents[0], "end-point-A" ); + ObjectPropertyCalcer* o1 = fact->propertyObjectCalcer( tqparents[0], "end-point-A" ); o1->calc( *ret ); - ObjectPropertyCalcer* o2 = fact->propertyObjectCalcer( parents[0], "end-point-B" ); + ObjectPropertyCalcer* o2 = fact->propertyObjectCalcer( tqparents[0], "end-point-B" ); o2->calc( *ret ); std::vector args; args.push_back( o1 ); @@ -312,37 +312,37 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co double value = values.toDouble( &ok3 ); if ( ! ok3 ) KIG_FILTER_PARSE_ERROR; - if ( ( parents[0]->imp()->inherits( CircleImp::stype() ) ) || - ( parents[0]->imp()->inherits( SegmentImp::stype() ) ) ) - oc = fact->constrainedPointCalcer( parents[0], value ); - else if ( parents[0]->imp()->inherits( LineImp::stype() ) ) + if ( ( tqparents[0]->imp()->inherits( CircleImp::stype() ) ) || + ( tqparents[0]->imp()->inherits( SegmentImp::stype() ) ) ) + oc = fact->constrainedPointCalcer( tqparents[0], value ); + else if ( tqparents[0]->imp()->inherits( LineImp::stype() ) ) { - const LineData l = static_cast( parents[0]->imp() )->data(); + const LineData l = static_cast( tqparents[0]->imp() )->data(); const Coordinate p = convertDrgeoLineParam( value, l ); - oc = fact->constrainedPointCalcer( parents[0], p, *ret ); + oc = fact->constrainedPointCalcer( tqparents[0], p, *ret ); } - else if ( parents[0]->imp()->inherits( RayImp::stype() ) ) + else if ( tqparents[0]->imp()->inherits( RayImp::stype() ) ) { - const LineData l = static_cast( parents[0]->imp() )->data(); + const LineData l = static_cast( tqparents[0]->imp() )->data(); const Coordinate p = convertDrgeoHalflineParam( value, l ); - oc = fact->constrainedPointCalcer( parents[0], p, *ret ); + oc = fact->constrainedPointCalcer( tqparents[0], p, *ret ); } - else if ( parents[0]->imp()->inherits( ArcImp::stype() ) ) - oc = fact->constrainedPointCalcer( parents[0], 1 - value ); + else if ( tqparents[0]->imp()->inherits( ArcImp::stype() ) ) + oc = fact->constrainedPointCalcer( tqparents[0], 1 - value ); else { -// oc = fact->constrainedPointCalcer( parents[0], value ); +// oc = fact->constrainedPointCalcer( tqparents[0], value ); notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } } else if ( domelem.attribute( "type" ) == "Intersection" ) { - if ( ( parents[0]->imp()->inherits( AbstractLineImp::stype() ) ) && - ( parents[1]->imp()->inherits( AbstractLineImp::stype() ) ) ) - oc = new ObjectTypeCalcer( LineLineIntersectionType::instance(), parents ); + if ( ( tqparents[0]->imp()->inherits( AbstractLineImp::stype() ) ) && + ( tqparents[1]->imp()->inherits( AbstractLineImp::stype() ) ) ) + oc = new ObjectTypeCalcer( LineLineIntersectionType::instance(), tqparents ); else { bool ok; @@ -351,21 +351,21 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co if ( which == 1 ) which = -1; else if ( which == 0 ) which = 1; else KIG_FILTER_PARSE_ERROR; - std::vector args = parents; + std::vector args = tqparents; const ObjectType* type = 0; args.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); - if ( ( parents[0]->imp()->inherits( CircleImp::stype() ) ) && - ( parents[1]->imp()->inherits( CircleImp::stype() ) ) ) + if ( ( tqparents[0]->imp()->inherits( CircleImp::stype() ) ) && + ( tqparents[1]->imp()->inherits( CircleImp::stype() ) ) ) type = CircleCircleIntersectionType::instance(); - else if ( ( parents[0]->imp()->inherits( CircleImp::stype() ) && - parents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || - ( parents[1]->imp()->inherits( CircleImp::stype() ) && - parents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) + else if ( ( tqparents[0]->imp()->inherits( CircleImp::stype() ) && + tqparents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || + ( tqparents[1]->imp()->inherits( CircleImp::stype() ) && + tqparents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) type = ConicLineIntersectionType::instance(); - else if ( ( parents[0]->imp()->inherits( ArcImp::stype() ) && - parents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || - ( parents[1]->imp()->inherits( ArcImp::stype() ) && - parents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) + else if ( ( tqparents[0]->imp()->inherits( ArcImp::stype() ) && + tqparents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || + ( tqparents[1]->imp()->inherits( ArcImp::stype() ) && + tqparents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) type = ArcLineIntersectionType::instance(); else { @@ -377,17 +377,17 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } } else if ( domelem.attribute( "type" ) == "Reflexion" ) - oc = new ObjectTypeCalcer( LineReflectionType::instance(), parents ); + oc = new ObjectTypeCalcer( LineReflectionType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Symmetry" ) - oc = new ObjectTypeCalcer( PointReflectionType::instance(), parents ); + oc = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Translation" ) - oc = new ObjectTypeCalcer( TranslatedType::instance(), parents ); + oc = new ObjectTypeCalcer( TranslatedType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Rotation" ) - oc = new ObjectTypeCalcer( RotationType::instance(), parents ); + oc = new ObjectTypeCalcer( RotationType::instance(), tqparents ); else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -419,11 +419,11 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, parents ); + oc = new ObjectTypeCalcer( type, tqparents ); } else if( domelem.attribute( "type" ) == "3pts" ) { @@ -432,65 +432,65 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, parents ); + oc = new ObjectTypeCalcer( type, tqparents ); } else if( domelem.attribute( "type" ) == "segment" ) { if( domelem.tagName() == "circle" ) { type = CircleBPRType::instance(); - ObjectPropertyCalcer* o = fact->propertyObjectCalcer( parents[1], "length" ); + ObjectPropertyCalcer* o = fact->propertyObjectCalcer( tqparents[1], "length" ); o->calc( *ret ); - ObjectCalcer* a = parents[0]; - parents.clear(); - parents.push_back( a ); - parents.push_back( o ); + ObjectCalcer* a = tqparents[0]; + tqparents.clear(); + tqparents.push_back( a ); + tqparents.push_back( o ); } else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, parents ); + oc = new ObjectTypeCalcer( type, tqparents ); } else if( domelem.attribute( "type" ) == "npts" ) { if( domelem.tagName() == "polygon" ) { - if ( parents.size() < 3 ) KIG_FILTER_PARSE_ERROR; + if ( tqparents.size() < 3 ) KIG_FILTER_PARSE_ERROR; type = PolygonBNPType::instance(); } else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, parents ); + oc = new ObjectTypeCalcer( type, tqparents ); } else if ( domelem.attribute( "type" ) == "perpendicular" ) - oc = new ObjectTypeCalcer( LinePerpendLPType::instance(), parents ); + oc = new ObjectTypeCalcer( LinePerpendLPType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "parallel" ) - oc = new ObjectTypeCalcer( LineParallelLPType::instance(), parents ); + oc = new ObjectTypeCalcer( LineParallelLPType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Reflexion" ) - oc = new ObjectTypeCalcer( LineReflectionType::instance(), parents ); + oc = new ObjectTypeCalcer( LineReflectionType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Symmetry" ) - oc = new ObjectTypeCalcer( PointReflectionType::instance(), parents ); + oc = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Translation" ) - oc = new ObjectTypeCalcer( TranslatedType::instance(), parents ); + oc = new ObjectTypeCalcer( TranslatedType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Rotation" ) - oc = new ObjectTypeCalcer( RotationType::instance(), parents ); + oc = new ObjectTypeCalcer( RotationType::instance(), tqparents ); else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -529,76 +529,76 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co bool ok3; double dvalue = value.toDouble( &ok3 ); if ( ok3 ) - value = TQString( "%1" ).arg( dvalue, 0, 'g', 3 ); + value = TQString( "%1" ).tqarg( dvalue, 0, 'g', 3 ); oc = fact->labelCalcer( value, m, false, std::vector(), *ret ); } else if ( domelem.attribute( "type" ) == "pt_abscissa" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "coordinate-x", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "coordinate-x", *ret, false ); } else if ( domelem.attribute( "type" ) == "pt_ordinate" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "coordinate-y", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "coordinate-y", *ret, false ); } else if ( domelem.attribute( "type" ) == "segment_length" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "length", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "length", *ret, false ); } else if ( domelem.attribute( "type" ) == "circle_perimeter" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "circumference", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "circumference", *ret, false ); } else if ( domelem.attribute( "type" ) == "arc_length" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "arc-length", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "arc-length", *ret, false ); } else if ( domelem.attribute( "type" ) == "distance_2pts" ) { - if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; - ObjectTypeCalcer* so = new ObjectTypeCalcer( SegmentABType::instance(), parents ); + if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + ObjectTypeCalcer* so = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); so->calc( *ret ); oc = filtersConstructTextObject( m, so, "length", *ret, false ); } else if ( domelem.attribute( "type" ) == "vector_norm" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "length", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "length", *ret, false ); } else if ( domelem.attribute( "type" ) == "vector_abscissa" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "length-x", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "length-x", *ret, false ); } else if ( domelem.attribute( "type" ) == "vector_ordinate" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "length-y", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "length-y", *ret, false ); } else if ( domelem.attribute( "type" ) == "slope" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "slope", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "slope", *ret, false ); } else if ( domelem.attribute( "type" ) == "distance_pt_line" ) { - if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; std::vector args; - args.push_back( parents[1] ); - args.push_back( parents[0] ); + args.push_back( tqparents[1] ); + args.push_back( tqparents[0] ); ObjectTypeCalcer* po = new ObjectTypeCalcer( LinePerpendLPType::instance(), args ); po->calc( *ret ); args.clear(); - args.push_back( parents[1] ); + args.push_back( tqparents[1] ); args.push_back( po ); ObjectTypeCalcer* io = new ObjectTypeCalcer( LineLineIntersectionType::instance(), args ); io->calc( *ret ); args.clear(); - args.push_back( parents[0] ); + args.push_back( tqparents[0] ); args.push_back( io ); ObjectTypeCalcer* so = new ObjectTypeCalcer( SegmentABType::instance(), args ); so->calc( *ret ); @@ -607,18 +607,18 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co // types of 'equation' else if ( domelem.attribute( "type" ) == "line" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "equation", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "equation", *ret, false ); } else if ( domelem.attribute( "type" ) == "circle" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "simply-cartesian-equation", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "simply-cartesian-equation", *ret, false ); } else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -630,13 +630,13 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co { if ( domelem.attribute( "type" ) == "3pts" ) { - if ( parents.size() != 3 ) KIG_FILTER_PARSE_ERROR; - oc = new ObjectTypeCalcer( HalfAngleType::instance(), parents ); + if ( tqparents.size() != 3 ) KIG_FILTER_PARSE_ERROR; + oc = new ObjectTypeCalcer( HalfAngleType::instance(), tqparents ); } else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -669,7 +669,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co // since Kig doesn't support Guile scripts, it will write script's text // in a label, so the user can freely see the code and make whatever // he/she wants - // possible idea: construct a new script object with the parents of Guile + // possible idea: construct a new script object with the tqparents of Guile // one and the Guile code inserted commented... depends on a better // handling of arguments in scripts? if ( domelem.attribute( "type" ) == "nitems" ) @@ -677,7 +677,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -685,11 +685,11 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else if ( domelem.tagName() == "locus" ) { if ( domelem.attribute( "type" ) == "None" ) - oc = fact->locusCalcer( parents[0], parents[1] ); + oc = fact->locusCalcer( tqparents[0], tqparents[1] ); else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -709,7 +709,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co kdDebug() << ">>>>>>>>> UNKNOWN OBJECT" << endl; #endif notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " - "which Kig does not currently support." ).arg( domelem.tagName() ).arg( + "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -723,7 +723,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co if ( domelem.attribute( "color" ) == "Bordeaux" ) co.setRgb( 145, 0, 0 ); else - co = Qt::blue; + co = TQt::blue; // reading width and style // Dashed -> the little one // Normal -> the medium @@ -747,8 +747,8 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co TQString ps = domelem.attribute( "style" ); int pointstyle = ObjectDrawer::pointStyleFromString( ps ); // show this object? - bool show = ( ( domelem.attribute( "masked" ) != "True" ) && - ( domelem.attribute( "masked" ) != "Alway" ) ); + bool show = ( ( domelem.attribute( "tqmasked" ) != "True" ) && + ( domelem.attribute( "tqmasked" ) != "Alway" ) ); // costructing the ObjectDrawer* ObjectDrawer* d = new ObjectDrawer( co, w, show, s, pointstyle ); // reading object name @@ -770,16 +770,16 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co { std::vector args2; args2.push_back( o->nameCalcer() ); - oc2 = fact->attachedLabelCalcer( TQString::fromLatin1( "%1" ), oc, + oc2 = fact->attachedLabelCalcer( TQString::tqfromLatin1( "%1" ), oc, static_cast( oc->imp() )->coordinate(), false, args2, *ret ); - co = Qt::black; + co = TQt::black; } } else if ( domelem.tagName() == "angle" ) { oc2 = filtersConstructTextObject( - static_cast( holders[curid-1-nignored]->calcer()->parents()[1]->imp() )->coordinate(), + static_cast( holders[curid-1-nignored]->calcer()->tqparents()[1]->imp() )->coordinate(), holders[curid-1-nignored]->calcer(), "angle-degrees", *ret, false ); } diff --git a/kig/filters/drgeo-filter.h b/kig/filters/drgeo-filter.h index 9b0ef369..ddd2359e 100644 --- a/kig/filters/drgeo-filter.h +++ b/kig/filters/drgeo-filter.h @@ -26,7 +26,7 @@ class KigDocument; class TQString; /** - * This is an import filter for the GNOME geometry program DrGeo. + * This is an import filter for the GNOME tqgeometry program DrGeo. */ class KigFilterDrgeo : public KigFilter diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc index b44888f0..f2847c0a 100644 --- a/kig/filters/exporter.cc +++ b/kig/filters/exporter.cc @@ -65,13 +65,13 @@ class ExporterAction KigWidget* mw; public: ExporterAction( const KigPart* doc, KigWidget* w, - KActionCollection* parent, KigExporter* exp ); + KActionCollection* tqparent, KigExporter* exp ); void slotActivated(); }; ExporterAction::ExporterAction( const KigPart* doc, KigWidget* w, - KActionCollection* parent, KigExporter* exp ) - : KAction( exp->menuEntryName(), KShortcut(), 0, 0, parent ), + KActionCollection* tqparent, KigExporter* exp ) + : KAction( exp->menuEntryName(), KShortcut(), 0, 0, tqparent ), mexp( exp ), mdoc( doc ), mw( w ) { TQString iconstr = exp->menuIcon(); @@ -121,7 +121,7 @@ void ImageExporter::run( const KigPart& doc, KigWidget& w ) } KigFileDialog* kfd = new KigFileDialog( - TQString::null, KImageIO::pattern( KImageIO::Writing ), + TQString(), KImageIO::pattern( KImageIO::Writing ), i18n( "Export as Image" ), &w ); kfd->setOptionCaption( i18n( "Image Options" ) ); ImageExporterOptions* opts = new ImageExporterOptions( 0L, w.size() ); @@ -156,20 +156,20 @@ void ImageExporter::run( const KigPart& doc, KigWidget& w ) { KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please check if the file permissions are set correctly." ) - .arg( filename ) ); + .tqarg( filename ) ); return; }; TQPixmap img( TQSize( width, height ) ); - img.fill( Qt::white ); - KigPainter p( ScreenInfo( w.screenInfo().shownRect(), img.rect() ), &img, doc.document() ); + img.fill( TQt::white ); + KigPainter p( ScreenInfo( w.screenInfo().shownRect(), img.rect() ), TQT_TQPAINTDEVICE(&img), doc.document() ); p.setWholeWinOverlay(); p.drawGrid( doc.document().coordinateSystem(), showgrid, showaxes ); // FIXME: show the selections ? p.drawObjects( doc.document().objects(), false ); if ( ! img.save( filename, type.latin1() ) ) { - KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to image \"%1\"" ).arg( filename ) ); + KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to image \"%1\"" ).tqarg( filename ) ); } } @@ -244,7 +244,7 @@ class XFigExportImpVisitor // << "c: " << c << endl; ret *= 9450; ret /= msr.width(); - return ret.toQPoint(); + return ret.toTQPoint(); } void emitLine( const Coordinate& a, const Coordinate& b, int width, bool vector = false ); @@ -257,14 +257,14 @@ public: mnextcolorid( 32 ) { // predefined colors in XFig.. - mcolormap[Qt::black] = 0; - mcolormap[Qt::blue] = 1; - mcolormap[Qt::green] = 2; - mcolormap[Qt::cyan] = 3; - mcolormap[Qt::red] = 4; - mcolormap[Qt::magenta] = 5; - mcolormap[Qt::yellow] = 6; - mcolormap[Qt::white] = 7; + mcolormap[TQt::black] = 0; + mcolormap[TQt::blue] = 1; + mcolormap[TQt::green] = 2; + mcolormap[TQt::cyan] = 3; + mcolormap[TQt::red] = 4; + mcolormap[TQt::magenta] = 5; + mcolormap[TQt::yellow] = 6; + mcolormap[TQt::white] = 7; } void visit( const LineImp* imp ); void visit( const PointImp* imp ); @@ -297,7 +297,7 @@ void XFigExportImpVisitor::mapColor( const ObjectDrawer* obj ) void XFigExportImpVisitor::visit( ObjectHolder* obj ) { if ( ! obj->drawer()->shown() ) return; - assert( mcolormap.find( obj->drawer()->color() ) != mcolormap.end() ); + assert( mcolormap.tqfind( obj->drawer()->color() ) != mcolormap.end() ); mcurcolorid = mcolormap[ obj->drawer()->color() ]; mcurobj = obj; obj->imp()->visit( this ); @@ -593,7 +593,7 @@ void XFigExporter::run( const KigPart& doc, KigWidget& w ) { KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please " "check if the file permissions are set correctly." ) - .arg( file_name ) ); + .tqarg( file_name ) ); return; }; TQTextStream stream( &file ); diff --git a/kig/filters/filter.cc b/kig/filters/filter.cc index 81cd1ef4..0cfe1479 100644 --- a/kig/filters/filter.cc +++ b/kig/filters/filter.cc @@ -31,7 +31,7 @@ KigFilters* KigFilters::sThis; -KigFilter* KigFilters::find(const TQString& mime) +KigFilter* KigFilters::tqfind(const TQString& mime) { for (vect::iterator i = mFilters.begin(); i != mFilters.end(); ++i) { @@ -73,14 +73,14 @@ void KigFilter::fileNotFound( const TQString& file ) const i18n( "The file \"%1\" could not be opened. " "This probably means that it does not " "exist, or that it cannot be opened due to " - "its permissions" ).arg( file ) ); + "its permissions" ).tqarg( file ) ); } void KigFilter::parseError( const TQString& file, const TQString& explanation ) const { const TQString text = i18n( "An error was encountered while parsing the file \"%1\". It " - "cannot be opened." ).arg( file ); + "cannot be opened." ).tqarg( file ); const TQString title = i18n( "Parse Error" ); if ( explanation.isNull() ) @@ -92,7 +92,7 @@ void KigFilter::parseError( const TQString& file, const TQString& explanation ) void KigFilter::notSupported( const TQString& file, const TQString& explanation ) const { KMessageBox::detailedSorry( 0, - i18n( "Kig cannot open the file \"%1\"." ).arg( file ), + i18n( "Kig cannot open the file \"%1\"." ).tqarg( file ), explanation, i18n( "Not Supported" ) ); } diff --git a/kig/filters/filter.h b/kig/filters/filter.h index c887b05c..af087818 100644 --- a/kig/filters/filter.h +++ b/kig/filters/filter.h @@ -34,7 +34,7 @@ class KigFilters { public: static KigFilters* instance(); - KigFilter* find (const TQString& mime); + KigFilter* tqfind (const TQString& mime); // bool save ( const KigDocument& data, TQTextStream& stream ); /** @@ -55,7 +55,7 @@ protected: { \ TQString locs = i18n( "An error was encountered at " \ "line %1 in file %2." ) \ - .arg( __LINE__ ).arg( __FILE__ ); \ + .tqarg( __LINE__ ).tqarg( __FILE__ ); \ parseError( file, locs ); \ return 0; \ } @@ -71,7 +71,7 @@ class KigFilter protected: // shows errors to the user.. void fileNotFound( const TQString& file ) const; - void parseError( const TQString& file, const TQString& explanation = TQString::null ) const; + void parseError( const TQString& file, const TQString& explanation = TQString() ) const; void notSupported( const TQString& file, const TQString& explanation ) const; void warning( const TQString& explanation ) const; public: diff --git a/kig/filters/filters-common.cc b/kig/filters/filters-common.cc index 4ba24e9f..6ae6cef9 100644 --- a/kig/filters/filters-common.cc +++ b/kig/filters/filters-common.cc @@ -34,6 +34,6 @@ ObjectTypeCalcer* filtersConstructTextObject( propo->calc( doc ); std::vector args; args.push_back( propo ); - return fact->labelCalcer( TQString::fromLatin1( "%1" ), c, needframe, + return fact->labelCalcer( TQString::tqfromLatin1( "%1" ), c, needframe, args, doc ); } diff --git a/kig/filters/imageexporteroptions.cc b/kig/filters/imageexporteroptions.cc index cd68a0af..d88792fc 100644 --- a/kig/filters/imageexporteroptions.cc +++ b/kig/filters/imageexporteroptions.cc @@ -23,8 +23,8 @@ #include -ImageExporterOptions::ImageExporterOptions( TQWidget* parent, const TQSize& s ) - : ImageExporterOptionsBase( parent, "imageexporteroptions" ), msize( s ), +ImageExporterOptions::ImageExporterOptions( TQWidget* tqparent, const TQSize& s ) + : ImageExporterOptionsBase( tqparent, "imageexporteroptions" ), msize( s ), minternallysettingstuff( false ) { keepAspectRatio->setChecked( true ); diff --git a/kig/filters/imageexporteroptions.h b/kig/filters/imageexporteroptions.h index eacbe859..82db4950 100644 --- a/kig/filters/imageexporteroptions.h +++ b/kig/filters/imageexporteroptions.h @@ -26,6 +26,7 @@ class ImageExporterOptions : public ImageExporterOptionsBase { Q_OBJECT + TQ_OBJECT TQSize msize; @@ -34,7 +35,7 @@ class ImageExporterOptions // value like to user changes... bool minternallysettingstuff; public: - ImageExporterOptions( TQWidget* parent, const TQSize& s ); + ImageExporterOptions( TQWidget* tqparent, const TQSize& s ); ~ImageExporterOptions(); protected slots: diff --git a/kig/filters/imageexporteroptionsbase.ui b/kig/filters/imageexporteroptionsbase.ui index 03145dec..6399fd7e 100644 --- a/kig/filters/imageexporteroptionsbase.ui +++ b/kig/filters/imageexporteroptionsbase.ui @@ -1,10 +1,10 @@ ImageExporterOptionsBase - + ImageExporterOptionsBase - + 0 0 @@ -22,7 +22,7 @@ 6 - + groupBox1 @@ -33,7 +33,7 @@ unnamed - + Layout2_2 @@ -47,7 +47,7 @@ 6 - + WidthLabel_2 @@ -68,7 +68,7 @@ - + Layout3_2 @@ -82,7 +82,7 @@ 6 - + HeightLabel_2 @@ -103,7 +103,7 @@ - + keepAspectRatio @@ -113,7 +113,7 @@ - + groupBox2 @@ -124,7 +124,7 @@ unnamed - + showGridCheckBox @@ -132,7 +132,7 @@ Show grid - + showAxesCheckBox @@ -144,7 +144,7 @@ - + knuminput.h knuminput.h diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc index 02c1efde..379af11d 100644 --- a/kig/filters/kgeo-filter.cc +++ b/kig/filters/kgeo-filter.cc @@ -74,7 +74,7 @@ void KigFilterKGeo::loadMetrics(KSimpleConfig* c ) struct KGeoHierarchyElement { int id; - std::vector parents; + std::vector tqparents; }; static void visitElem( std::vector& ret, @@ -84,8 +84,8 @@ static void visitElem( std::vector& ret, { if ( !seen[i] ) { - for ( uint j = 0; j < elems[i].parents.size(); ++j ) - visitElem( ret, elems, seen, elems[i].parents[j] ); + for ( uint j = 0; j < elems[i].tqparents.size(); ++j ) + visitElem( ret, elems, seen, elems[i].tqparents[j] ); ret.push_back( elems[i] ); seen[i] = true; }; @@ -111,10 +111,10 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c c->setGroup("Main"); int number = c->readNumEntry ("Number"); - // first we determine the parent relationships, and sort the + // first we determine the tqparent relationships, and sort the // elements in an order that we can be sure all of an object's - // parents will have been handled before it is handled itself.. - // ( aka topological sort of the parent relations graph.. + // tqparents will have been handled before it is handled itself.. + // ( aka topological sort of the tqparent relations graph.. std::vector elems; elems.reserve( number ); @@ -125,15 +125,15 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c group.setNum( i + 1 ); group.prepend( "Object " ); c->setGroup( group ); - TQStrList parents; - c->readListEntry( "Parents", parents ); + TQStrList tqparents; + c->readListEntry( "Parents", tqparents ); elems.push_back( elem ); - for ( const char* parent = parents.first(); parent; parent = parents.next() ) + for ( const char* tqparent = tqparents.first(); tqparent; tqparent = tqparents.next() ) { - int parentIndex = TQString::fromLatin1( parent ).toInt( &ok ); + int tqparentIndex = TQString::tqfromLatin1( tqparent ).toInt( &ok ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; - if ( parentIndex != 0 ) - elems[i].parents.push_back( parentIndex - 1 ); + if ( tqparentIndex != 0 ) + elems[i].tqparents.push_back( tqparentIndex - 1 ); }; }; @@ -153,11 +153,11 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c c->setGroup( group ); int objID = c->readNumEntry( "Geo" ); - std::vector parents; - for ( uint j = 0; j < e.parents.size(); ++j ) + std::vector tqparents; + for ( uint j = 0; j < e.tqparents.size(); ++j ) { - int parentid = e.parents[j]; - parents.push_back( os[parentid]->calcer() ); + int tqparentid = e.tqparents[j]; + tqparents.push_back( os[tqparentid]->calcer() ); }; ObjectCalcer* o = 0; @@ -166,84 +166,84 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c case ID_point: { // fetch the coordinates... - TQString strX = c->readEntry("QPointX"); - TQString strY = c->readEntry("QPointY"); + TQString strX = c->readEntry("TQPointX"); + TQString strY = c->readEntry("TQPointY"); double x = strX.toDouble(&ok); if (!ok) KIG_FILTER_PARSE_ERROR; double y = strY.toDouble(&ok); if (!ok) KIG_FILTER_PARSE_ERROR; Coordinate m( x, y ); - uint nparents = parents.size(); - if ( nparents == 0 ) + uint ntqparents = tqparents.size(); + if ( ntqparents == 0 ) o = factory->fixedPointCalcer( m ); - else if ( nparents == 1 ) - o = factory->constrainedPointCalcer( parents[0], m, *ret ); + else if ( ntqparents == 1 ) + o = factory->constrainedPointCalcer( tqparents[0], m, *ret ); else KIG_FILTER_PARSE_ERROR; break; } case ID_segment: { - o = new ObjectTypeCalcer( SegmentABType::instance(), parents ); + o = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); break; } case ID_circle: { - o = new ObjectTypeCalcer( CircleBCPType::instance(), parents ); + o = new ObjectTypeCalcer( CircleBCPType::instance(), tqparents ); break; } case ID_line: { - o = new ObjectTypeCalcer( LineABType::instance(), parents ); + o = new ObjectTypeCalcer( LineABType::instance(), tqparents ); break; } case ID_bisection: { // if this is the bisection of two points, first build a segment // between them.. - if ( parents.size() == 2 ) + if ( tqparents.size() == 2 ) { - ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), parents ); - parents.clear(); - parents.push_back( seg ); + ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); + tqparents.clear(); + tqparents.push_back( seg ); } - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - o = factory->propertyObjectCalcer( parents[0], "mid-point" ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + o = factory->propertyObjectCalcer( tqparents[0], "mid-point" ); break; }; case ID_perpendicular: { - o = new ObjectTypeCalcer( LinePerpendLPType::instance(), parents ); + o = new ObjectTypeCalcer( LinePerpendLPType::instance(), tqparents ); break; } case ID_parallel: { - o = new ObjectTypeCalcer( LineParallelLPType::instance(), parents ); + o = new ObjectTypeCalcer( LineParallelLPType::instance(), tqparents ); break; } case ID_vector: { - o = new ObjectTypeCalcer( VectorType::instance(), parents ); + o = new ObjectTypeCalcer( VectorType::instance(), tqparents ); break; } case ID_ray: { - o = new ObjectTypeCalcer( RayABType::instance(), parents ); + o = new ObjectTypeCalcer( RayABType::instance(), tqparents ); break; } case ID_move: { - o = new ObjectTypeCalcer( TranslatedType::instance(), parents ); + o = new ObjectTypeCalcer( TranslatedType::instance(), tqparents ); break; } case ID_mirrorPoint: { - o = new ObjectTypeCalcer( PointReflectionType::instance(), parents ); + o = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents ); break; } case ID_pointOfConc: { - o = new ObjectTypeCalcer( LineLineIntersectionType::instance(), parents ); + o = new ObjectTypeCalcer( LineLineIntersectionType::instance(), tqparents ); break; } case ID_text: @@ -264,79 +264,79 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c case ID_fixedCircle: { double r = c->readDoubleNumEntry( "Radius" ); - parents.push_back( new ObjectConstCalcer( new DoubleImp( r ) ) ); - o = new ObjectTypeCalcer( CircleBPRType::instance(), parents ); + tqparents.push_back( new ObjectConstCalcer( new DoubleImp( r ) ) ); + o = new ObjectTypeCalcer( CircleBPRType::instance(), tqparents ); break; } case ID_angle: { - if ( parents.size() == 3 ) + if ( tqparents.size() == 3 ) { - ObjectTypeCalcer* ao = new ObjectTypeCalcer( AngleType::instance(), parents ); + ObjectTypeCalcer* ao = new ObjectTypeCalcer( AngleType::instance(), tqparents ); ao->calc( *ret ); - parents.clear(); - parents.push_back( ao ); + tqparents.clear(); + tqparents.push_back( ao ); }; - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* angle = parents[0]; - parents.clear(); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + ObjectCalcer* angle = tqparents[0]; + tqparents.clear(); const Coordinate c = - static_cast( angle->parents()[1]->imp() )->coordinate(); + static_cast( angle->tqparents()[1]->imp() )->coordinate(); o = filtersConstructTextObject( c, angle, "angle-degrees", *ret, true ); break; } case ID_distance: { - if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; - ObjectTypeCalcer* segment = new ObjectTypeCalcer( SegmentABType::instance(), parents ); + if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + ObjectTypeCalcer* segment = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); segment->calc( *ret ); - Coordinate m = ( static_cast( parents[0]->imp() )->coordinate() + - static_cast( parents[1]->imp() )->coordinate() ) / 2; + Coordinate m = ( static_cast( tqparents[0]->imp() )->coordinate() + + static_cast( tqparents[1]->imp() )->coordinate() ) / 2; o = filtersConstructTextObject( m, segment, "length", *ret, true ); break; } case ID_arc: { - o = new ObjectTypeCalcer( AngleType::instance(), parents ); + o = new ObjectTypeCalcer( AngleType::instance(), tqparents ); break; } case ID_area: { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - const CircleImp* circle = static_cast( parents[0]->imp() ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + const CircleImp* circle = static_cast( tqparents[0]->imp() ); const Coordinate c = circle->center() + Coordinate( circle->radius(), 0 ); - o = filtersConstructTextObject( c, parents[0], "surface", *ret, true ); + o = filtersConstructTextObject( c, tqparents[0], "surface", *ret, true ); break; } case ID_slope: { - // if parents contains a segment, line, vector or whatever, we - // take its parents cause we want points.. - if ( parents.size() == 1 ) parents = parents[0]->parents(); - if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + // if tqparents contains a segment, line, vector or whatever, we + // take its tqparents cause we want points.. + if ( tqparents.size() == 1 ) tqparents = tqparents[0]->tqparents(); + if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; const Coordinate c = ( - static_cast( parents[0]->imp() )->coordinate() + - static_cast( parents[1]->imp() )->coordinate() ) / 2; - ObjectTypeCalcer* line = new ObjectTypeCalcer( LineABType::instance(), parents ); + static_cast( tqparents[0]->imp() )->coordinate() + + static_cast( tqparents[1]->imp() )->coordinate() ) / 2; + ObjectTypeCalcer* line = new ObjectTypeCalcer( LineABType::instance(), tqparents ); line->calc( *ret ); o = filtersConstructTextObject( c, line, "slope", *ret, true ); break; } case ID_circumference: { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - const CircleImp* c = static_cast( parents[0]->imp() ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + const CircleImp* c = static_cast( tqparents[0]->imp() ); const Coordinate m = c->center() + Coordinate( c->radius(), 0 ); - o = filtersConstructTextObject( m, parents[0], "circumference", *ret, true ); + o = filtersConstructTextObject( m, tqparents[0], "circumference", *ret, true ); break; } case ID_rotation: { // in kig, the rotated object should be last.. - ObjectCalcer* t = parents[2]; - parents[2] = parents[0]; - parents[0] = t; - o = new ObjectTypeCalcer( RotationType::instance(), parents ); + ObjectCalcer* t = tqparents[2]; + tqparents[2] = tqparents[0]; + tqparents[0] = t; + o = new ObjectTypeCalcer( RotationType::instance(), tqparents ); break; } default: @@ -346,7 +346,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c // set the color... TQColor co = c->readColorEntry( "Color" ); if( !co.isValid() ) - co = Qt::blue; + co = TQt::blue; ObjectDrawer* d = new ObjectDrawer( co ); os[i] = new ObjectHolder( o, d ); diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h index f8accd91..0eb8d462 100644 --- a/kig/filters/kgeo-filter.h +++ b/kig/filters/kgeo-filter.h @@ -25,11 +25,11 @@ class KSimpleConfig; /** * This is an import filter for files generated by the program KGeo, - * which was an interactive geometry program in kdeedu. Kig is + * which was an interactive tqgeometry program in kdeedu. Kig is * supposed to be its successor, and this import filter is part of my * attempt to achieve that :) * - * Status: a significant part of KGeo's format is supported, not all + * tqStatus: a significant part of KGeo's format is supported, not all * yet, though.. */ class KigFilterKGeo diff --git a/kig/filters/kgeo-resource.h b/kig/filters/kgeo-resource.h index f7af0f64..9a392ac8 100644 --- a/kig/filters/kgeo-resource.h +++ b/kig/filters/kgeo-resource.h @@ -71,7 +71,7 @@ #define ID_FILE_PRINT 10080 -#define ID_FILE_QUIT 10090 +#define ID_FILE_TQUIT 10090 /////////////////////////////////////////////////////////////////// // Edit-menu entries diff --git a/kig/filters/kseg-defs.h b/kig/filters/kseg-defs.h index 59dd3e4c..5319afaf 100644 --- a/kig/filters/kseg-defs.h +++ b/kig/filters/kseg-defs.h @@ -58,10 +58,10 @@ using namespace std; inline int ROUND(double x) { return ((int)(x + 0.5)); } inline int SIGN(double x) { return (x < 0) ? -1 : 1; } -inline int INTRAND(int a, int b) { return QMIN(a, b) + rand() % abs(a - b); } +inline int INTRAND(int a, int b) { return TQMIN(a, b) + rand() % abs(a - b); } #define SQR(x) ((x) * (x)) #define CUBE(x) ((x) * (x) * (x)) -#define QUAD(x) (((x) * (x)) * ((x) * (x))) +#define TQUAD(x) (((x) * (x)) * ((x) * (x))) enum G_Type { @@ -254,9 +254,9 @@ enum MenuIDs ID_CONSTRUCTION_MAKE_INITIAL, ID_CONSTRUCTION_RECURSE, - ID_PLAY_QUICKPLAY, + ID_PLAY_TQUICKPLAY, - ID_QUICKPLAY_SET_DIRECTORY, + ID_TQUICKPLAY_SET_DIRECTORY, ID_FILE_RECENTLIST_START //should be the last entry }; diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc index fb96c25c..6f784759 100644 --- a/kig/filters/kseg-filter.cc +++ b/kig/filters/kseg-filter.cc @@ -67,7 +67,7 @@ bool KigFilterKSeg::supportMime( const TQString& mime ) struct drawstyle { - Q_INT8 pointstyle; + TQ_INT8 pointstyle; TQFont font; TQPen pen; TQBrush brush; @@ -93,50 +93,50 @@ static Coordinate readKSegCoordinate( TQDataStream& stream ) return t + Coordinate( -7, -7 ); } -static ObjectTypeCalcer* intersectionPoint( const std::vector& parents, int which ) +static ObjectTypeCalcer* intersectionPoint( const std::vector& tqparents, int which ) { - if ( parents.size() != 2 ) return 0; + if ( tqparents.size() != 2 ) return 0; int nlines = 0; int nconics = 0; int narcs = 0; for ( int i = 0; i < 2; ++i ) { - if ( parents[i]->imp()->inherits( AbstractLineImp::stype() ) ) ++nlines; - else if ( parents[i]->imp()->inherits( ConicImp::stype() ) ) ++nconics; - else if ( parents[i]->imp()->inherits( ArcImp::stype() ) ) ++narcs; + if ( tqparents[i]->imp()->inherits( AbstractLineImp::stype() ) ) ++nlines; + else if ( tqparents[i]->imp()->inherits( ConicImp::stype() ) ) ++nconics; + else if ( tqparents[i]->imp()->inherits( ArcImp::stype() ) ) ++narcs; else return 0; }; if ( nlines == 2 ) - return which == -1 ? new ObjectTypeCalcer( LineLineIntersectionType::instance(), parents ) : 0; + return which == -1 ? new ObjectTypeCalcer( LineLineIntersectionType::instance(), tqparents ) : 0; else if ( nlines == 1 && nconics == 1 ) { - std::vector intparents( parents ); - intparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); - return new ObjectTypeCalcer( ConicLineIntersectionType::instance(), intparents ); + std::vector inttqparents( tqparents ); + inttqparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); + return new ObjectTypeCalcer( ConicLineIntersectionType::instance(), inttqparents ); } else if ( nlines == 0 && nconics == 2 ) { - std::vector rparents( parents ); - rparents.push_back( new ObjectConstCalcer( new IntImp( 1 ) ) ); - rparents.push_back( new ObjectConstCalcer( new IntImp( 1 ) ) ); - rparents.push_back( new ObjectTypeCalcer( ConicRadicalType::instance(), rparents ) ); - std::vector iparents; - iparents.push_back( parents[0] ); - iparents.push_back( rparents.back() ); - iparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); - return new ObjectTypeCalcer( ConicLineIntersectionType::instance(), iparents ); + std::vector rtqparents( tqparents ); + rtqparents.push_back( new ObjectConstCalcer( new IntImp( 1 ) ) ); + rtqparents.push_back( new ObjectConstCalcer( new IntImp( 1 ) ) ); + rtqparents.push_back( new ObjectTypeCalcer( ConicRadicalType::instance(), rtqparents ) ); + std::vector itqparents; + itqparents.push_back( tqparents[0] ); + itqparents.push_back( rtqparents.back() ); + itqparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); + return new ObjectTypeCalcer( ConicLineIntersectionType::instance(), itqparents ); } else if ( nlines == 1 && narcs == 1 ) { - std::vector intparents( parents ); - intparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); - return new ObjectTypeCalcer( ArcLineIntersectionType::instance(), intparents ); + std::vector inttqparents( tqparents ); + inttqparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); + return new ObjectTypeCalcer( ArcLineIntersectionType::instance(), inttqparents ); } else return 0; } ObjectCalcer* KigFilterKSeg::transformObject( const TQString& file, KigDocument& kigdoc, - std::vector& parents, + std::vector& tqparents, int subtype, bool& ok ) { ok = true; @@ -145,34 +145,34 @@ ObjectCalcer* KigFilterKSeg::transformObject( const TQString& file, KigDocument& { case G_TRANSLATED: { - std::vector vectorparents( parents.begin() + 1, parents.end() ); - ObjectTypeCalcer* vector = new ObjectTypeCalcer( VectorType::instance(), vectorparents ); + std::vector vectortqparents( tqparents.begin() + 1, tqparents.end() ); + ObjectTypeCalcer* vector = new ObjectTypeCalcer( VectorType::instance(), vectortqparents ); vector->calc( kigdoc ); std::vector transparents; - transparents.push_back( parents[0] ); + transparents.push_back( tqparents[0] ); transparents.push_back( vector ); retobj = new ObjectTypeCalcer( TranslatedType::instance(), transparents ); break; } case G_ROTATED: { - std::vector angleparents( parents.begin() + 2, parents.end() ); - ObjectTypeCalcer* angle = new ObjectTypeCalcer( AngleType::instance(), angleparents ); + std::vector angletqparents( tqparents.begin() + 2, tqparents.end() ); + ObjectTypeCalcer* angle = new ObjectTypeCalcer( AngleType::instance(), angletqparents ); angle->calc( kigdoc ); - std::vector rotparents; - rotparents.push_back( parents[0] ); - rotparents.push_back( parents[1] ); - rotparents.push_back( angle ); - retobj = new ObjectTypeCalcer( RotationType::instance(), rotparents ); + std::vector rottqparents; + rottqparents.push_back( tqparents[0] ); + rottqparents.push_back( tqparents[1] ); + rottqparents.push_back( angle ); + retobj = new ObjectTypeCalcer( RotationType::instance(), rottqparents ); break; } case G_SCALED: { - if ( parents.size() == 4 ) + if ( tqparents.size() == 4 ) { - retobj = new ObjectTypeCalcer( ScalingOverCenter2Type::instance(), parents ); + retobj = new ObjectTypeCalcer( ScalingOverCenter2Type::instance(), tqparents ); } else { @@ -187,8 +187,8 @@ ObjectCalcer* KigFilterKSeg::transformObject( const TQString& file, KigDocument& } case G_REFLECTED: { - std::vector mirparents( parents.begin(), parents.end() ); - retobj = new ObjectTypeCalcer( LineReflectionType::instance(), mirparents ); + std::vector mirtqparents( tqparents.begin(), tqparents.end() ); + retobj = new ObjectTypeCalcer( LineReflectionType::instance(), mirtqparents ); break; } } @@ -250,14 +250,14 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) { short styleid; stream >> styleid; - short nparents; - stream >> nparents; - std::vector parents( nparents, 0 ); - for ( short j = 0; j < nparents; ++j ) + short ntqparents; + stream >> ntqparents; + std::vector tqparents( ntqparents, 0 ); + for ( short j = 0; j < ntqparents; ++j ) { - int parent; - stream >> parent; - parents[j] = ret[parent]->calcer(); + int tqparent; + stream >> tqparent; + tqparents[j] = ret[tqparent]->calcer(); }; // read the object.. @@ -318,13 +318,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, parents, descendtype, ok ); + o = transformObject( file, *retdoc, tqparents, descendtype, ok ); break; } case G_FREE_POINT: { // fixed point - if ( nparents != 0 ) KIG_FILTER_PARSE_ERROR; + if ( ntqparents != 0 ) KIG_FILTER_PARSE_ERROR; Coordinate c = readKSegCoordinate( stream ); o = fact->fixedPointCalcer( c ); break; @@ -334,37 +334,37 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) // constrained point double p; stream >> p; - if ( nparents != 1 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* parent = parents[0]; - assert( parent ); - o = fact->constrainedPointCalcer( parent, p ); + if ( ntqparents != 1 ) KIG_FILTER_PARSE_ERROR; + ObjectCalcer* tqparent = tqparents[0]; + assert( tqparent ); + o = fact->constrainedPointCalcer( tqparent, p ); break; } case G_INTERSECTION_POINT: { // KSeg has somewhat weird intersection objects.. // for all objects G_INTERSECTION_POINT gets the - // first intersection of its parents, G_INTERSECTION2_POINT + // first intersection of its tqparents, G_INTERSECTION2_POINT // represents the second, if present. - o = intersectionPoint( parents, -1 ); + o = intersectionPoint( tqparents, -1 ); if ( ! o ) KIG_FILTER_PARSE_ERROR; break; } case G_INTERSECTION2_POINT: { - o = intersectionPoint( parents, 1 ); + o = intersectionPoint( tqparents, 1 ); if ( ! o ) KIG_FILTER_PARSE_ERROR; break; } case G_MID_POINT: { // midpoint of a segment.. - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - if ( !parents[0]->imp()->inherits( SegmentImp::stype() ) ) + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + if ( !tqparents[0]->imp()->inherits( SegmentImp::stype() ) ) KIG_FILTER_PARSE_ERROR; - int index = parents[0]->imp()->propertiesInternalNames().findIndex( "mid-point" ); + int index = tqparents[0]->imp()->propertiesInternalNames().tqfindIndex( "mid-point" ); assert( index != -1 ); - o = new ObjectPropertyCalcer( parents[0], index ); + o = new ObjectPropertyCalcer( tqparents[0], index ); break; } default: @@ -383,13 +383,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, parents, descendtype, ok ); + o = transformObject( file, *retdoc, tqparents, descendtype, ok ); break; } case G_ENDPOINTS_SEGMENT: { - if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( SegmentABType::instance(), parents ); + if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); break; } default: @@ -406,18 +406,18 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, parents, descendtype, ok ); + o = transformObject( file, *retdoc, tqparents, descendtype, ok ); break; } case G_TWOPOINTS_RAY: { - if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( RayABType::instance(), parents ); + if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( RayABType::instance(), tqparents ); break; } case G_BISECTOR_RAY: { - ObjectTypeCalcer* angle = new ObjectTypeCalcer( HalfAngleType::instance(), parents ); + ObjectTypeCalcer* angle = new ObjectTypeCalcer( HalfAngleType::instance(), tqparents ); angle->calc( *retdoc ); o = fact->propertyObjectCalcer( angle, "angle-bisector" ); break; @@ -436,25 +436,25 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, parents, descendtype, ok ); + o = transformObject( file, *retdoc, tqparents, descendtype, ok ); break; } case G_TWOPOINTS_LINE: { - if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( LineABType::instance(), parents ); + if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( LineABType::instance(), tqparents ); break; } case G_PARALLEL_LINE: { - if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( LineParallelLPType::instance(), parents ); + if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( LineParallelLPType::instance(), tqparents ); break; } case G_PERPENDICULAR_LINE: { - if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( LinePerpendLPType::instance(), parents ); + if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( LinePerpendLPType::instance(), tqparents ); break; } default: @@ -471,37 +471,37 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, parents, descendtype, ok ); + o = transformObject( file, *retdoc, tqparents, descendtype, ok ); break; } case G_CENTERPOINT_CIRCLE: { - if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( CircleBCPType::instance(), parents ); + if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( CircleBCPType::instance(), tqparents ); break; } case G_CENTERRADIUS_CIRCLE: { ObjectCalcer* point; ObjectCalcer* segment; - if ( parents[0]->imp()->inherits( PointImp::stype() ) ) + if ( tqparents[0]->imp()->inherits( PointImp::stype() ) ) { - point = parents[0]; - segment = parents[1]; + point = tqparents[0]; + segment = tqparents[1]; } else { - point = parents[1]; - segment = parents[0]; + point = tqparents[1]; + segment = tqparents[0]; }; - int index = segment->imp()->propertiesInternalNames().findIndex( "length" ); + int index = segment->imp()->propertiesInternalNames().tqfindIndex( "length" ); if ( index == -1 ) KIG_FILTER_PARSE_ERROR; ObjectPropertyCalcer* length = new ObjectPropertyCalcer( segment, index ); length->calc( *retdoc ); - std::vector cparents; - cparents.push_back( point ); - cparents.push_back( length ); - o = new ObjectTypeCalcer( CircleBPRType::instance(), cparents ); + std::vector ctqparents; + ctqparents.push_back( point ); + ctqparents.push_back( length ); + o = new ObjectTypeCalcer( CircleBPRType::instance(), ctqparents ); break; } default: @@ -518,13 +518,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, parents, descendtype, ok ); + o = transformObject( file, *retdoc, tqparents, descendtype, ok ); break; } case G_THREEPOINTS_ARC: { - if ( nparents != 3 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( ArcBTPType::instance(), parents ); + if ( ntqparents != 3 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( ArcBTPType::instance(), tqparents ); break; } default: @@ -541,13 +541,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, parents, descendtype, ok ); + o = transformObject( file, *retdoc, tqparents, descendtype, ok ); break; } default: { - if ( nparents < 3 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( PolygonBNPType::instance(), parents ); + if ( ntqparents < 3 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( PolygonBNPType::instance(), tqparents ); } } // default: @@ -581,13 +581,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, parents, descendtype, ok ); + o = transformObject( file, *retdoc, tqparents, descendtype, ok ); break; } case G_OBJECT_LOCUS: { - if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = fact->locusCalcer( parents[0], parents[1] ); + if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = fact->locusCalcer( tqparents[0], tqparents[1] ); break; } default: @@ -636,7 +636,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) std::vector args2; args2.push_back( object->nameCalcer() ); ObjectCalcer* oc2 = fact->attachedLabelCalcer( - TQString::fromLatin1( "%1" ), object->calcer(), + TQString::tqfromLatin1( "%1" ), object->calcer(), static_cast( object->imp() )->coordinate(), false, args2, *retdoc ); oc2->calc( *retdoc ); diff --git a/kig/filters/kseg-filter.h b/kig/filters/kseg-filter.h index 03d03958..d8909282 100644 --- a/kig/filters/kseg-filter.h +++ b/kig/filters/kseg-filter.h @@ -29,7 +29,7 @@ class KigFilterKSeg ~KigFilterKSeg(); ObjectCalcer* transformObject( const TQString& file, KigDocument& kigdoc, - std::vector& parents, + std::vector& tqparents, int subtype, bool& ok ); public: diff --git a/kig/filters/latexexporter.cc b/kig/filters/latexexporter.cc index 98d3fc2e..811cfd9b 100644 --- a/kig/filters/latexexporter.cc +++ b/kig/filters/latexexporter.cc @@ -194,7 +194,7 @@ void LatexExportImpVisitor::mapColor( TQColor color ) ColorMap newcolor; newcolor.color = color; TQString tmpname = color.name(); - tmpname.replace( "#", "" ); + tmpname.tqreplace( "#", "" ); newcolor.name = tmpname; mcolors.push_back( newcolor ); mstream << "\\newrgbcolor{" << tmpname << "}{" @@ -213,9 +213,9 @@ double LatexExportImpVisitor::dimRealToCoord( int dim ) TQString LatexExportImpVisitor::writeStyle( Qt::PenStyle style ) { TQString ret( "linestyle=" ); - if ( style == Qt::DashLine ) + if ( style == TQt::DashLine ) ret += "dashed"; - else if ( style == Qt::DotLine ) + else if ( style == TQt::DotLine ) ret += "dotted,dotsep=2pt"; else ret += "solid"; @@ -228,9 +228,9 @@ void LatexExportImpVisitor::plotGenericCurve( const CurveImp* imp ) if ( width == -1 ) width = 1; TQString prefix = TQString( "\\pscurve[linecolor=%1,linewidth=%2,%3]" ) - .arg( mcurcolorid ) - .arg( width / 100.0 ) - .arg( writeStyle( mcurobj->drawer()->style() ) ); + .tqarg( mcurcolorid ) + .tqarg( width / 100.0 ) + .tqarg( writeStyle( mcurobj->drawer()->style() ) ); std::vector< std::vector< Coordinate > > coordlist; coordlist.push_back( std::vector< Coordinate >() ); @@ -483,7 +483,7 @@ void LatexExportImpVisitor::visit( const PolygonImp* imp ) void LatexExporter::run( const KigPart& doc, KigWidget& w ) { KigFileDialog* kfd = new KigFileDialog( - TQString::null, i18n( "*.tex|Latex Documents (*.tex)" ), + TQString(), i18n( "*.tex|Latex Documents (*.tex)" ), i18n( "Export as Latex" ), &w ); kfd->setOptionCaption( i18n( "Latex Options" ) ); LatexExporterOptions* opts = new LatexExporterOptions( 0L ); @@ -507,7 +507,7 @@ void LatexExporter::run( const KigPart& doc, KigWidget& w ) { KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please " "check if the file permissions are set correctly." ) - .arg( file_name ) ); + .tqarg( file_name ) ); return; }; diff --git a/kig/filters/latexexporteroptions.ui b/kig/filters/latexexporteroptions.ui index d2e60c5b..04275dd7 100644 --- a/kig/filters/latexexporteroptions.ui +++ b/kig/filters/latexexporteroptions.ui @@ -1,10 +1,10 @@ LatexExporterOptions - + LatexExporterOptions - + 0 0 @@ -22,7 +22,7 @@ 6 - + groupBox1 @@ -33,7 +33,7 @@ unnamed - + showGridCheckBox @@ -41,7 +41,7 @@ Show grid - + showAxesCheckBox @@ -49,7 +49,7 @@ Show axes - + showExtraFrameCheckBox @@ -63,7 +63,7 @@ - + diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc index a5378263..4a3d0a04 100644 --- a/kig/filters/native-filter.cc +++ b/kig/filters/native-filter.cc @@ -51,7 +51,7 @@ struct HierElem { int id; - std::vector parents; + std::vector tqparents; TQDomElement el; }; @@ -73,8 +73,8 @@ static void visitElem( std::vector& ret, { if ( !seen[i] ) { - for ( uint j = 0; j < elems[i].parents.size(); ++j ) - visitElem( ret, elems, seen, elems[i].parents[j] - 1); + for ( uint j = 0; j < elems[i].tqparents.size(); ++j ) + visitElem( ret, elems, seen, elems[i].tqparents[j] - 1); ret.push_back( elems[i] ); seen[i] = true; }; @@ -114,7 +114,7 @@ KigDocument* KigFilterNative::load( const TQString& file ) TQFile kigdoc( file ); #ifndef KIG_NO_COMPRESSED_FILES bool iscompressed = false; - if ( !file.endsWith( ".kig", false ) ) + if ( !file.tqendsWith( ".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.endsWith( ".kigz", false ) ) + if ( file.tqendsWith( ".kigz", false ) ) { tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) ); } @@ -193,7 +193,7 @@ KigDocument* KigFilterNative::load( const TQString& file ) if ( major > 0 || minor > 9 ) { notSupported( file, i18n( "This file was created by Kig version \"%1\", " - "which this version cannot open." ).arg( version ) ); + "which this version cannot open." ).tqarg( version ) ); return false; } else if ( major == 0 && minor <= 3 ) @@ -204,7 +204,7 @@ KigDocument* KigFilterNative::load( const TQString& file ) "You can try to open this file with an older Kig " "version (0.4 to 0.6),\n" "and then save it again, which will save it in the " - "new format." ).arg( version ) ); + "new format." ).tqarg( version ) ); return false; } else if ( major == 0 && minor <= 6 ) @@ -226,7 +226,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement& if ( e.tagName() == "CoordinateSystem" ) { const TQCString type = e.text().latin1(); - CoordinateSystem* s = CoordinateSystemFactory::build( type ); + CoordinateSystem* s = CoordinateSystemFactory::build( type.data() ); if ( ! s ) { warning( i18n( "This Kig file has a coordinate system " @@ -273,7 +273,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement& if ( ! ok ) KIG_FILTER_PARSE_ERROR; extendVect( elems, id ); - elems[id-1].parents.push_back( pid ); + elems[id-1].tqparents.push_back( pid ); } } }; @@ -315,14 +315,14 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement& propname = ec.text().latin1(); }; - if ( i->parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* parent = retcalcers[i->parents[0] -1]; - QCStringList propnames = parent->imp()->propertiesInternalNames(); - int propid = propnames.findIndex( propname ); + if ( i->tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + ObjectCalcer* tqparent = retcalcers[i->tqparents[0] -1]; + QCStringList propnames = tqparent->imp()->propertiesInternalNames(); + int propid = propnames.tqfindIndex( propname ); if ( propid == -1 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectPropertyCalcer( parent, propid ); + o = new ObjectPropertyCalcer( tqparent, propid ); } else if ( e.tagName() == "Object" ) { @@ -331,23 +331,23 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement& KIG_FILTER_PARSE_ERROR; const ObjectType* type = - ObjectTypeFactory::instance()->find( tmp.latin1() ); + ObjectTypeFactory::instance()->tqfind( tmp.latin1() ); if ( !type ) { notSupported( file, i18n( "This Kig file uses an object of type \"%1\", " "which this Kig version does not support." "Perhaps you have compiled Kig without support " "for this object type," - "or perhaps you are using an older Kig version." ).arg( tmp ) ); + "or perhaps you are using an older Kig version." ).tqarg( tmp ) ); return false; }; - std::vector parents; - for ( std::vector::iterator j = i->parents.begin(); - j != i->parents.end(); ++j ) - parents.push_back( retcalcers[*j - 1] ); + std::vector tqparents; + for ( std::vector::iterator j = i->tqparents.begin(); + j != i->tqparents.end(); ++j ) + tqparents.push_back( retcalcers[*j - 1] ); - o = new ObjectTypeCalcer( type, parents ); + o = new ObjectTypeCalcer( type, tqparents ); } else continue; @@ -415,7 +415,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& ret->setAxes( false ); } const TQCString type = tmptype.latin1(); - CoordinateSystem* s = CoordinateSystemFactory::build( type ); + CoordinateSystem* s = CoordinateSystemFactory::build( type.data() ); if ( ! s ) { warning( i18n( "This Kig file has a coordinate system " @@ -434,25 +434,25 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& uint id = tmp.toInt( &ok ); if ( id <= 0 ) KIG_FILTER_PARSE_ERROR; - std::vector parents; - for ( TQDomElement parentel = e.firstChild().toElement(); ! parentel.isNull(); - parentel = parentel.nextSibling().toElement() ) + std::vector tqparents; + for ( TQDomElement tqparentel = e.firstChild().toElement(); ! tqparentel.isNull(); + tqparentel = tqparentel.nextSibling().toElement() ) { - if ( parentel.tagName() != "Parent" ) continue; - TQString tmp = parentel.attribute( "id" ); - uint parentid = tmp.toInt( &ok ); + if ( tqparentel.tagName() != "Parent" ) continue; + TQString tmp = tqparentel.attribute( "id" ); + uint tqparentid = tmp.toInt( &ok ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; - if ( parentid == 0 || parentid > calcers.size() ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* parent = calcers[parentid - 1].get(); - if ( ! parent ) KIG_FILTER_PARSE_ERROR; - parents.push_back( parent ); + if ( tqparentid == 0 || tqparentid > calcers.size() ) KIG_FILTER_PARSE_ERROR; + ObjectCalcer* tqparent = calcers[tqparentid - 1].get(); + if ( ! tqparent ) KIG_FILTER_PARSE_ERROR; + tqparents.push_back( tqparent ); } ObjectCalcer* o = 0; if ( e.tagName() == "Data" ) { - if ( !parents.empty() ) KIG_FILTER_PARSE_ERROR; + if ( !tqparents.empty() ) KIG_FILTER_PARSE_ERROR; TQString tmp = e.attribute( "type" ); TQString error; ObjectImp* imp = ObjectImpFactory::instance()->deserialize( tmp, e, error ); @@ -465,42 +465,42 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& } else if ( e.tagName() == "Property" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; TQCString propname = e.attribute( "which" ).latin1(); - ObjectCalcer* parent = parents[0]; - int propid = parent->imp()->propertiesInternalNames().findIndex( propname ); + ObjectCalcer* tqparent = tqparents[0]; + int propid = tqparent->imp()->propertiesInternalNames().tqfindIndex( propname ); if ( propid == -1 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectPropertyCalcer( parent, propid ); + o = new ObjectPropertyCalcer( tqparent, propid ); } else if ( e.tagName() == "Object" ) { TQString tmp = e.attribute( "type" ); const ObjectType* type = - ObjectTypeFactory::instance()->find( tmp.latin1() ); + ObjectTypeFactory::instance()->tqfind( tmp.latin1() ); if ( ! type ) { notSupported( file, i18n( "This Kig file uses an object of type \"%1\", " "which this Kig version does not support." "Perhaps you have compiled Kig without support " "for this object type," - "or perhaps you are using an older Kig version." ).arg( tmp ) ); + "or perhaps you are using an older Kig version." ).tqarg( tmp ) ); return false; } // mp: (I take the responsibility for this!) explanation: the usual ObjectTypeCalcer - // constructor also "sortArgs" the parents. I believe that this *must not* be done + // constructor also "sortArgs" the tqparents. I believe that this *must not* be done // when loading from a saved kig file for the following reasons: // 1. the arguments should already be in their intended order, since the file was // saved from a working hierarchy; furthermore we actually want to restore the original // hierarchy, not really to also fix possible problems with the original hierarchy; // 2. calling sortArgs could have undesirable side effects in particular situations, // since kig actually allow an ObjectType to produce different type of ObjectImp's - // it may happen that the parents of an object do not satisfy the requirements + // it may happen that the tqparents of an object do not satisfy the requirements // enforced by sortArgs (while moving around the free objects) but still be // perfectly valid - o = new ObjectTypeCalcer( type, parents, false ); + o = new ObjectTypeCalcer( type, tqparents, false ); } else KIG_FILTER_PARSE_ERROR; @@ -604,8 +604,8 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream ) const ObjectPropertyCalcer* o = static_cast( *i ); objectelem = doc.createElement( "Property" ); - TQCString propname = o->parent()->imp()->propertiesInternalNames()[o->propId()]; - objectelem.setAttribute( "which", propname ); + TQCString propname = o->tqparent()->imp()->propertiesInternalNames()[o->propId()]; + objectelem.setAttribute( TQString("which"), TQString(propname) ); } else if ( dynamic_cast( *i ) ) { @@ -615,8 +615,8 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream ) } else assert( false ); - const std::vector parents = ( *i )->parents(); - for ( std::vector::const_iterator i = parents.begin(); i != parents.end(); ++i ) + const std::vector tqparents = ( *i )->tqparents(); + for ( std::vector::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) { std::map::const_iterator idp = idmap.find( *i ); assert( idp != idmap.end() ); @@ -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::fromLatin1( d->shown() ? "true" : "false" ) ); + drawelem.setAttribute( "shown", TQString::tqfromLatin1( 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.endsWith( ".kig", false ) ) + if ( !outfile.tqendsWith( ".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.endsWith( ".kigz", false ) ) + if ( outfile.tqendsWith( ".kigz", false ) ) tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) ); else return false; diff --git a/kig/filters/svgexporter.cc b/kig/filters/svgexporter.cc index 57413004..93801b3b 100644 --- a/kig/filters/svgexporter.cc +++ b/kig/filters/svgexporter.cc @@ -59,7 +59,7 @@ TQString SVGExporter::menuIcon() const void SVGExporter::run( const KigPart& part, KigWidget& w ) { KigFileDialog* kfd = new KigFileDialog( - TQString::null, i18n( "*.svg|Scalable Vector Graphics (*.svg)" ), + TQString(), i18n( "*.svg|Scalable Vector Graphics (*.svg)" ), i18n( "Export as SVG" ), &w ); kfd->setOptionCaption( i18n( "SVG Options" ) ); SVGExporterOptions* opts = new SVGExporterOptions( 0L ); @@ -81,7 +81,7 @@ void SVGExporter::run( const KigPart& part, KigWidget& w ) { KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please " "check if the file permissions are set correctly." ) - .arg( file_name ) ); + .tqarg( file_name ) ); return; }; @@ -91,12 +91,12 @@ void SVGExporter::run( const KigPart& part, KigWidget& w ) TQPicture pic; pic.setBoundingRect( r ); KigPainter* p = new KigPainter( ScreenInfo( w.screenInfo().shownRect(), viewrect ), - &pic, part.document() ); + TQT_TQPAINTDEVICE(&pic), part.document() ); // p->setWholeWinOverlay(); -// p->setBrushColor( Qt::white ); -// p->setBrushStyle( Qt::SolidPattern ); +// p->setBrushColor( TQt::white ); +// p->setBrushStyle( TQt::SolidPattern ); // p->drawRect( r ); -// p->setBrushStyle( Qt::NoBrush ); +// p->setBrushStyle( TQt::NoBrush ); // p->setWholeWinOverlay(); p->drawGrid( part.document().coordinateSystem(), showgrid, showaxes ); p->drawObjects( part.document().objects(), false ); @@ -105,7 +105,7 @@ void SVGExporter::run( const KigPart& part, KigWidget& w ) if ( !pic.save( file_name, "SVG" ) ) { - KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to SVG file \"%1\"" ).arg( file_name ) ); + KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to SVG file \"%1\"" ).tqarg( file_name ) ); } } diff --git a/kig/filters/svgexporteroptions.ui b/kig/filters/svgexporteroptions.ui index 2de679cb..58176edf 100644 --- a/kig/filters/svgexporteroptions.ui +++ b/kig/filters/svgexporteroptions.ui @@ -1,10 +1,10 @@ SVGExporterOptions - + SVGExporterOptions - + 0 0 @@ -22,7 +22,7 @@ 6 - + groupBox1 @@ -33,7 +33,7 @@ unnamed - + showGridCheckBox @@ -41,7 +41,7 @@ Show grid - + showAxesCheckBox @@ -55,7 +55,7 @@ - + diff --git a/kig/filters/tests/locus.fgeo b/kig/filters/tests/locus.fgeo index a914068c..4ad79bbd 100644 --- a/kig/filters/tests/locus.fgeo +++ b/kig/filters/tests/locus.fgeo @@ -1,2 +1,2 @@ --1.6666663.216667-2.7666670.5500000.0806913.0000003.0166672.866667-0.7500002.6000003.816667 +-1.6666663.216667-2.7666670.5500000.0806913.0000003.0166672.866667-0.7500002.6000003.816667 diff --git a/kig/kfile/Makefile.am b/kig/kfile/Makefile.am index b8de2d3d..f2cc337f 100644 --- a/kig/kfile/Makefile.am +++ b/kig/kfile/Makefile.am @@ -9,11 +9,11 @@ kde_module_LTLIBRARIES = \ kfile_kig.la kfile_drgeo_la_SOURCES = kfile_drgeo.cpp -kfile_drgeo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) kfile_drgeo_la_LIBADD = $(LIB_KIO) kfile_kig_la_SOURCES = kfile_kig.cpp -kfile_kig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) kfile_kig_la_LIBADD = $(LIB_KIO) METASOURCES = AUTO diff --git a/kig/kfile/kfile_drgeo.cpp b/kig/kfile/kfile_drgeo.cpp index b921131b..bbdc6869 100644 --- a/kig/kfile/kfile_drgeo.cpp +++ b/kig/kfile/kfile_drgeo.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory drgeoFactory; K_EXPORT_COMPONENT_FACTORY( kfile_drgeo, drgeoFactory( "kfile_drgeo" ) ) -DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList &args ) - : KFilePlugin( parent, name, args ) +DrgeoPlugin::DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) + : KFilePlugin( tqparent, name, args ) { info = addMimeTypeInfo( "application/x-drgeo" ); @@ -41,7 +41,7 @@ DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList item = addItemInfo( group, "NumOfMacros", i18n( "Macros" ), TQVariant::Int ); group_contents = addGroupInfo( info, "DrgeoContents", i18n( "Translators: what this drgeo " - "file contains", "Contents" ) ); + "file tqcontains", "Contents" ) ); } bool DrgeoPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) diff --git a/kig/kfile/kfile_drgeo.h b/kig/kfile/kfile_drgeo.h index 4495cd17..19b28e5b 100644 --- a/kig/kfile/kfile_drgeo.h +++ b/kig/kfile/kfile_drgeo.h @@ -28,9 +28,10 @@ class TQStringList; class DrgeoPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - DrgeoPlugin( TQObject *parent, const char *name, const TQStringList& args ); + DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& metainfo, uint what); protected: diff --git a/kig/kfile/kfile_kig.cpp b/kig/kfile/kfile_kig.cpp index bd54a036..defae8c2 100644 --- a/kig/kfile/kfile_kig.cpp +++ b/kig/kfile/kfile_kig.cpp @@ -35,8 +35,8 @@ typedef KGenericFactory kigFactory; K_EXPORT_COMPONENT_FACTORY( kfile_kig, kigFactory( "kfile_kig" ) ) -KigPlugin::KigPlugin( TQObject *parent, const char *name, const TQStringList &args ) - : KFilePlugin( parent, name, args ) +KigPlugin::KigPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) + : KFilePlugin( tqparent, name, args ) { KFileMimeTypeInfo::ItemInfo* item; @@ -58,7 +58,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) TQString sfile = metainfo.path(); bool iscompressed = false; TQFile f( sfile ); - if ( !sfile.endsWith( ".kig", false ) ) + if ( !sfile.tqendsWith( ".kig", false ) ) { iscompressed = true; @@ -67,7 +67,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) return false; TQString tempname = sfile.section( '/', -1 ); - if ( sfile.endsWith( ".kigz", false ) ) + if ( sfile.tqendsWith( ".kigz", false ) ) { tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) ); } @@ -114,7 +114,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) TQString compatversion = main.attribute( "CompatibilityVersion" ); if ( compatversion.isEmpty() ) compatversion = i18n( "%1 represents Kig version", - "%1 (as the version)" ).arg( version ); + "%1 (as the version)" ).tqarg( version ); appendItem( metagroup, "CompatVersion", compatversion ); // reading the Coordinate System... diff --git a/kig/kfile/kfile_kig.h b/kig/kfile/kfile_kig.h index d5238a4f..7c0512be 100644 --- a/kig/kfile/kfile_kig.h +++ b/kig/kfile/kfile_kig.h @@ -28,9 +28,10 @@ class TQStringList; class KigPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KigPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KigPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& metainfo, uint what); protected: diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp index ed954d26..dc63b2dc 100644 --- a/kig/kig/kig.cpp +++ b/kig/kig/kig.cpp @@ -69,7 +69,7 @@ Kig::Kig() // now that the Part is loaded, we cast it to a Part to get // our hands on it m_part = static_cast - (factory->create(this, "kig_part", "KParts::ReadWritePart" )); + (factory->create(TQT_TQOBJECT(this), "kig_part", "KParts::ReadWritePart" )); if (m_part) { // tell the KParts::MainWindow that this is indeed the main widget @@ -105,30 +105,30 @@ Kig::~Kig() void Kig::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); #else createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); #endif // FIXME: this (recent files) should be app-wide, not specific to each window... - m_recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection()); + m_recentFilesAction = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection()); m_recentFilesAction->loadEntries(config); #if KDE_IS_VERSION( 3, 2, 90 ) KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); #else - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); #endif - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::tipOfDay( this, TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" ); + KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" ); } void Kig::saveProperties(KConfig* config) @@ -219,7 +219,7 @@ bool Kig::queryClose() switch( KMessageBox::warningYesNoCancel ( widget(), - i18n("Save changes to document %1?").arg(m_part->url().path()), + i18n("Save changes to document %1?").tqarg(m_part->url().path()), i18n("Save Changes?"),KStdGuiItem::save(),KStdGuiItem::discard() )) { @@ -272,7 +272,7 @@ void Kig::fileOpen() if (!file_name.isEmpty()) openURL(file_name); } -// ifdef's disabled, cause Qt moc doesn't handle ifdef's.. +// ifdef's disabled, cause TQt tqmoc doesn't handle ifdef's.. // #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES void Kig::optionsShowToolbar() { diff --git a/kig/kig/kig.h b/kig/kig/kig.h index 51c236f2..71176db8 100644 --- a/kig/kig/kig.h +++ b/kig/kig/kig.h @@ -49,6 +49,7 @@ class KRecentFilesAction; class Kig : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor @@ -114,7 +115,7 @@ class Kig : public KParts::MainWindow private slots: void fileNew(); void fileOpen(); - // Qt moc doesn't handle ifdef's, so i'm disabling it.. + // TQt tqmoc doesn't handle ifdef's, so i'm disabling it.. // #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES void optionsShowToolbar(); void optionsShowStatusbar(); diff --git a/kig/kig/kig_commands.cpp b/kig/kig/kig_commands.cpp index d4668f55..d6b79805 100644 --- a/kig/kig/kig_commands.cpp +++ b/kig/kig/kig_commands.cpp @@ -97,7 +97,7 @@ KigCommand* KigCommand::removeCommand( KigPart& doc, const std::vectorimp()->type()->removeAStatement(); else - text = i18n( "Remove %1 Objects" ).arg( os.size() ); + text = i18n( "Remove %1 Objects" ).tqarg( os.size() ); KigCommand* ret = new KigCommand( doc, text ); ret->addTask( new RemoveObjectsTask( os ) ); return ret; @@ -109,7 +109,7 @@ KigCommand* KigCommand::addCommand( KigPart& doc, const std::vectorimp()->type()->addAStatement(); else - text = i18n( "Add %1 Objects" ).arg( os.size() ); + text = i18n( "Add %1 Objects" ).tqarg( os.size() ); KigCommand* ret = new KigCommand( doc, text ); ret->addTask( new AddObjectsTask( os ) ); return ret; @@ -181,11 +181,11 @@ void ChangeObjectConstCalcerTask::execute( KigPart& doc ) { mnewimp = mcalcer->switchImp( mnewimp ); - std::set allchildren = getAllChildren( mcalcer.get() ); - std::vector allchildrenvect( allchildren.begin(), allchildren.end() ); - allchildrenvect = calcPath( allchildrenvect ); - for ( std::vector::iterator i = allchildrenvect.begin(); - i != allchildrenvect.end(); ++i ) + std::set alltqchildren = getAllChildren( mcalcer.get() ); + std::vector alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() ); + alltqchildrenvect = calcPath( alltqchildrenvect ); + for ( std::vector::iterator i = alltqchildrenvect.begin(); + i != alltqchildrenvect.end(); ++i ) ( *i )->calc( doc.document() ); } @@ -274,7 +274,7 @@ class ChangeParentsAndTypeTask::Private { public: ObjectTypeCalcer* o; - std::vector newparents; + std::vector newtqparents; const ObjectType* newtype; }; @@ -284,13 +284,13 @@ ChangeParentsAndTypeTask::~ChangeParentsAndTypeTask() } ChangeParentsAndTypeTask::ChangeParentsAndTypeTask( - ObjectTypeCalcer* o, const std::vector& newparents, + ObjectTypeCalcer* o, const std::vector& newtqparents, const ObjectType* newtype ) : KigCommandTask(), d( new Private ) { d->o = o; - std::copy( newparents.begin(), newparents.end(), - std::back_inserter( d->newparents ) ); + std::copy( newtqparents.begin(), newtqparents.end(), + std::back_inserter( d->newtqparents ) ); d->newtype = newtype; } @@ -300,24 +300,24 @@ void ChangeParentsAndTypeTask::execute( KigPart& doc ) d->o->setType( d->newtype ); d->newtype = oldtype; - std::vector oldparentso = d->o->parents(); - std::vector oldparents( - oldparentso.begin(), oldparentso.end() ); - std::vector newparents; - for ( std::vector::iterator i = d->newparents.begin(); - i != d->newparents.end(); ++i ) - newparents.push_back( i->get() ); - d->o->setParents( newparents ); - d->newparents = oldparents; - - for ( std::vector::iterator i = newparents.begin(); i != newparents.end(); ++i ) + std::vector oldtqparentso = d->o->tqparents(); + std::vector oldtqparents( + oldtqparentso.begin(), oldtqparentso.end() ); + std::vector newtqparents; + for ( std::vector::iterator i = d->newtqparents.begin(); + i != d->newtqparents.end(); ++i ) + newtqparents.push_back( i->get() ); + d->o->setParents( newtqparents ); + d->newtqparents = oldtqparents; + + for ( std::vector::iterator i = newtqparents.begin(); i != newtqparents.end(); ++i ) ( *i )->calc( doc.document() ); d->o->calc( doc.document() ); - std::set allchildren = getAllChildren( d->o ); - std::vector allchildrenvect( allchildren.begin(), allchildren.end() ); - allchildrenvect = calcPath( allchildrenvect ); - for ( std::vector::iterator i = allchildrenvect.begin(); - i != allchildrenvect.end(); ++i ) + std::set alltqchildren = getAllChildren( d->o ); + std::vector alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() ); + alltqchildrenvect = calcPath( alltqchildrenvect ); + for ( std::vector::iterator i = alltqchildrenvect.begin(); + i != alltqchildrenvect.end(); ++i ) ( *i )->calc( doc.document() ); } diff --git a/kig/kig/kig_commands.h b/kig/kig/kig_commands.h index 0dd7c93a..e9df77c1 100644 --- a/kig/kig/kig_commands.h +++ b/kig/kig/kig_commands.h @@ -44,6 +44,7 @@ class KigCommand : public TQObject, public KNamedCommand { Q_OBJECT + TQ_OBJECT class Private; Private* d; public: @@ -58,7 +59,7 @@ public: static KigCommand* addCommand( KigPart& doc, ObjectHolder* os ); /** * make sure that when you delete something, you are also deleting - * its parents. This class assumes you've done that. + * its tqparents. This class assumes you've done that. * \ref KigDocument::delObjects() takes care of this for you. */ static KigCommand* removeCommand( KigPart& doc, const std::vector& os ); @@ -123,7 +124,7 @@ protected: * this class monitors a set of DataObjects for changes and returns an * appropriate ChangeObjectImpsCommand if necessary.. * E.g. MovingMode wants to move certain objects, so it monitors all - * the parents of the explicitly moving objects: + * the tqparents of the explicitly moving objects: * \code * MonitorDataObjects mon( getAllParents( emo ) ); * \endcode @@ -180,7 +181,7 @@ class ChangeParentsAndTypeTask class Private; Private* d; public: - ChangeParentsAndTypeTask( ObjectTypeCalcer* o, const std::vector& newparents, + ChangeParentsAndTypeTask( ObjectTypeCalcer* o, const std::vector& newtqparents, const ObjectType* newtype ); ~ChangeParentsAndTypeTask(); diff --git a/kig/kig/kig_document.cc b/kig/kig/kig_document.cc index 884b41c5..04f1e7fa 100644 --- a/kig/kig/kig_document.cc +++ b/kig/kig/kig_document.cc @@ -69,7 +69,7 @@ std::vector KigDocument::whatAmIOn( const Coordinate& p, const Ki for ( std::set::const_iterator i = mobjects.begin(); i != mobjects.end(); ++i ) { - if(!(*i)->contains(p, w, mnightvision)) continue; + if(!(*i)->tqcontains(p, w, mnightvision)) continue; if ( (*i)->imp()->inherits( PointImp::stype() ) ) ret.push_back( *i ); else if ( !(*i)->imp()->inherits( PolygonImp::stype() ) ) curves.push_back( *i ); diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 1f891bb9..137d0096 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -67,9 +67,7 @@ #include #include #include -#if QT_VERSION >= 0x030100 #include -#endif using namespace std; @@ -89,13 +87,13 @@ class SetCoordinateSystemAction { KigPart& md; public: - SetCoordinateSystemAction( KigPart& d, KActionCollection* parent ); + SetCoordinateSystemAction( KigPart& d, KActionCollection* tqparent ); void slotActivated( int index ); }; SetCoordinateSystemAction::SetCoordinateSystemAction( - KigPart& d, KActionCollection* parent ) - : KSelectAction( i18n( "&Set Coordinate System" ), 0, parent, "settings_set_coordinate_system" ), + KigPart& d, KActionCollection* tqparent ) + : KSelectAction( i18n( "&Set Coordinate System" ), 0, tqparent, "settings_set_coordinate_system" ), md( d ) { setItems( CoordinateSystemFactory::names() ); @@ -114,7 +112,7 @@ class KigPrintDialogPage : public KPrintDialogPage { public: - KigPrintDialogPage( TQWidget* parent = 0, const char* name = 0 ); + KigPrintDialogPage( TQWidget* tqparent = 0, const char* name = 0 ); ~KigPrintDialogPage(); void getOptions( TQMap& opts, bool ); @@ -126,8 +124,8 @@ private: TQCheckBox *showaxes; }; -KigPrintDialogPage::KigPrintDialogPage( TQWidget* parent, const char* name ) - : KPrintDialogPage( parent, name ) +KigPrintDialogPage::KigPrintDialogPage( TQWidget* tqparent, const char* name ) + : KPrintDialogPage( tqparent, name ) { setTitle( i18n( "Kig Options" ) ); @@ -167,10 +165,10 @@ bool KigPrintDialogPage::isValid( TQString& ) return true; } -KigPart::KigPart( TQWidget *parentWidget, const char *, - TQObject *parent, const char *name, +KigPart::KigPart( TQWidget *tqparentWidget, const char *, + TQObject *tqparent, const char *name, const TQStringList& ) - : KParts::ReadWritePart( parent, name ), + : KParts::ReadWritePart( tqparent, name ), mMode( 0 ), mdocument( new KigDocument() ) { // we need an instance @@ -179,7 +177,7 @@ KigPart::KigPart( TQWidget *parentWidget, const char *, mMode = new NormalMode( *this ); // we need a widget, to actually show the document - m_widget = new KigView(this, false, parentWidget, "kig_view"); + m_widget = new KigView(this, false, tqparentWidget, "kig_view"); // notify the part that this is our internal widget setWidget( m_widget ); @@ -260,17 +258,17 @@ void KigPart::setupActions() KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(), actionCollection() ); - KAction* a = KStdAction::zoomIn( m_widget, TQT_SLOT( slotZoomIn() ), + KAction* a = KStdAction::zoomIn( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomIn() ), actionCollection() ); a->setToolTip( i18n( "Zoom in on the document" ) ); a->setWhatsThis( i18n( "Zoom in on the document" ) ); - a = KStdAction::zoomOut( m_widget, TQT_SLOT( slotZoomOut() ), + a = KStdAction::zoomOut( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomOut() ), actionCollection() ); a->setToolTip( i18n( "Zoom out of the document" ) ); a->setWhatsThis( i18n( "Zoom out of the document" ) ); - a = KStdAction::fitToPage( m_widget, TQT_SLOT( slotRecenterScreen() ), + a = KStdAction::fitToPage( TQT_TQOBJECT(m_widget), TQT_SLOT( slotRecenterScreen() ), actionCollection() ); // grr.. why isn't there an icon for this.. a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", KIcon::Toolbar ) ) ); @@ -283,7 +281,7 @@ void KigPart::setupActions() #endif #endif #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION - a = KStdAction::fullScreen( m_widget, TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" ); + a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->tqparent()),"fullscreen" ); #else tmp = l->loadIcon( "window_fullscreen", KIcon::Toolbar ); a = new KAction( @@ -296,13 +294,13 @@ void KigPart::setupActions() // TODO: an icon for this.. a = new KAction( - i18n( "&Select Shown Area" ), "viewmagfit", 0, m_widget, TQT_SLOT( zoomRect() ), + i18n( "&Select Shown Area" ), "viewmagfit", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomRect() ), actionCollection(), "view_select_shown_rect" ); a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) ); a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) ); a = new KAction( - i18n( "S&elect Zoom Area" ), "viewmag", 0, m_widget, TQT_SLOT( zoomArea() ), + i18n( "S&elect Zoom Area" ), "viewmag", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomArea() ), actionCollection(), "view_zoom_area" ); // a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) ); // a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) ); @@ -371,7 +369,7 @@ bool KigPart::openFile() { KMessageBox::sorry( widget(), i18n( "The file \"%1\" you tried to open does not exist. " - "Please verify that you entered the correct path." ).arg( m_file ), + "Please verify that you entered the correct path." ).tqarg( m_file ), i18n( "File Not Found" ) ); return false; }; @@ -380,7 +378,7 @@ bool KigPart::openFile() // findByURL... KMimeType::Ptr mimeType = KMimeType::findByPath ( m_file ); kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl; - KigFilter* filter = KigFilters::instance()->find( mimeType->name() ); + KigFilter* filter = KigFilters::instance()->tqfind( mimeType->name() ); if ( !filter ) { // we don't support this mime type... @@ -392,7 +390,7 @@ bool KigPart::openFile() "question would be worth implementing support for, you can " "always ask us nicely on mailto:toscano.pino@tiscali.it " "or do the work yourself and send me a patch." - ).arg(mimeType->name()), + ).tqarg(mimeType->name()), i18n( "Format Not Supported" ) ); return false; @@ -468,7 +466,7 @@ void KigPart::_addObject( ObjectHolder* o ) void KigPart::delObject( ObjectHolder* o ) { - // we delete all children and their children etc. too... + // we delete all tqchildren and their tqchildren etc. too... std::vector os; os.push_back( o ); delObjects( os ); @@ -621,7 +619,7 @@ bool KigPart::internalSaveAs() { int ret = KMessageBox::warningContinueCancel( m_widget, i18n( "The file \"%1\" already exists. Do you wish to overwrite it?" ) - .arg( file_name ), i18n( "Overwrite File?" ), i18n("Overwrite") ); + .tqarg( file_name ), i18n( "Overwrite File?" ), i18n("Overwrite") ); if ( ret != KMessageBox::Continue ) { return false; @@ -637,11 +635,7 @@ void KigPart::runMode( KigMode* m ) setMode( m ); -#if QT_VERSION >= 0x030100 (void) kapp->eventLoop()->enterLoop(); -#else - (void) kapp->enter_loop(); -#endif setMode( prev ); redrawScreen(); @@ -652,11 +646,7 @@ void KigPart::doneMode( KigMode* d ) assert( d == mMode ); // pretend to use this var.. (void)d; -#if QT_VERSION >= 0x030100 kapp->eventLoop()->exitLoop(); -#else - kapp->exit_loop(); -#endif } void KigPart::actionRemoved( GUIAction* a, GUIUpdateToken& t ) @@ -932,7 +922,7 @@ extern "C" int convertToNative( const KURL& url, const TQCString& outfile ) KMimeType::Ptr mimeType = KMimeType::findByPath ( file ); kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl; - KigFilter* filter = KigFilters::instance()->find( mimeType->name() ); + KigFilter* filter = KigFilters::instance()->tqfind( mimeType->name() ); if ( !filter ) { kdError() << "The file \"" << file << "\" is of a filetype not currently supported by Kig." << endl; @@ -952,7 +942,7 @@ extern "C" int convertToNative( const KURL& url, const TQCString& outfile ) for ( std::vector::iterator i = tmp.begin(); i != tmp.end(); ++i ) ( *i )->calc( *doc ); - TQString out = ( outfile == "-" ) ? TQString::null : outfile; + TQString out = ( outfile == "-" ) ? TQString() : outfile; bool success = KigFilters::instance()->save( *doc, out ); if ( !success ) { diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h index 3245f38b..187f559e 100644 --- a/kig/kig/kig_part.h +++ b/kig/kig/kig_part.h @@ -61,12 +61,13 @@ class ScreenInfo; class KigPart : public KParts::ReadWritePart { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - KigPart( TQWidget* parentWidget, const char* widgetName, - TQObject* parent = 0, const char* name = 0, + KigPart( TQWidget* tqparentWidget, const char* widgetName, + TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp index fbf16517..9eda893b 100644 --- a/kig/kig/kig_view.cpp +++ b/kig/kig/kig_view.cpp @@ -55,10 +55,10 @@ kdbgstream& operator<< ( kdbgstream& s, const TQPoint& t ) KigWidget::KigWidget( KigPart* part, KigView* view, - TQWidget* parent, + TQWidget* tqparent, const char* name, bool fullscreen ) - : TQWidget( parent, name, + : TQWidget( tqparent, name, fullscreen ? WStyle_Customize | WStyle_NoBorder : 0 ), mpart( part ), mview( view ), @@ -69,8 +69,8 @@ KigWidget::KigWidget( KigPart* part, { part->addWidget(this); - setFocusPolicy(ClickFocus); - setBackgroundMode( Qt::NoBackground ); + setFocusPolicy(TQ_ClickFocus); + setBackgroundMode( TQt::NoBackground ); setMouseTracking(true); curPix.resize( size() ); @@ -123,7 +123,7 @@ void KigWidget::updateWidget( const std::vector& overlay ) #undef SHOW_OVERLAY_RECTS #ifdef SHOW_OVERLAY_RECTS TQPainter debug (this, this); - debug.setPen(Qt::yellow); + debug.setPen(TQt::yellow); #endif // SHOW_OVERLAY_RECTS // we undo our old changes... for ( std::vector::const_iterator i = oldOverlay.begin(); i != oldOverlay.end(); ++i ) @@ -193,7 +193,7 @@ void KigWidget::recenterScreen() Rect KigWidget::matchScreenShape( const Rect& r ) const { - return r.matchShape( Rect::fromQRect( rect() ) ); + return r.matchShape( Rect::fromTQRect( rect() ) ); } void KigWidget::slotZoomIn() @@ -231,7 +231,7 @@ void KigWidget::slotZoomOut() void KigWidget::clearStillPix() { - stillPix.fill(Qt::white); + stillPix.fill(TQt::white); oldOverlay.clear(); oldOverlay.push_back ( TQRect( TQPoint(0,0), size() ) ); } @@ -245,7 +245,7 @@ void KigWidget::redrawScreen( const std::vector& selection, bool // update the screen... clearStillPix(); - KigPainter p( msi, &stillPix, mpart->document() ); + KigPainter p( msi, TQT_TQPAINTDEVICE(&stillPix), mpart->document() ); p.drawGrid( mpart->document().coordinateSystem(), mpart->document().grid(), mpart->document().axes() ); p.drawObjects( selection, true ); @@ -287,34 +287,34 @@ void KigWidget::updateScrollBars() KigView::KigView( KigPart* part, bool fullscreen, - TQWidget* parent, + TQWidget* tqparent, const char* name ) - : TQWidget( parent, name ), - mlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ), + : TQWidget( tqparent, name ), + mtqlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ), mupdatingscrollbars( false ), mrealwidget( 0 ), mpart( part ) { connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) ); - mlayout = new TQGridLayout( this, 2, 2 ); - mrightscroll = new TQScrollBar( Vertical, this, "Right Scrollbar" ); + mtqlayout = new TQGridLayout( this, 2, 2 ); + mrightscroll = new TQScrollBar(Qt::Vertical, this, "Right Scrollbar" ); // TODO: make this configurable... mrightscroll->setTracking( true ); connect( mrightscroll, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotRightScrollValueChanged( int ) ) ); connect( mrightscroll, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( updateScrollBars() ) ); - mbottomscroll = new TQScrollBar( Horizontal, this, "Bottom Scrollbar" ); + mbottomscroll = new TQScrollBar(Qt::Horizontal, this, "Bottom Scrollbar" ); connect( mbottomscroll, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotBottomScrollValueChanged( int ) ) ); connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( updateScrollBars() ) ); mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen ); - mlayout->addWidget( mbottomscroll, 1, 0 ); - mlayout->addWidget( mrealwidget, 0, 0 ); - mlayout->addWidget( mrightscroll, 0, 1 ); + mtqlayout->addWidget( mbottomscroll, 1, 0 ); + mtqlayout->addWidget( mrealwidget, 0, 0 ); + mtqlayout->addWidget( mrightscroll, 0, 1 ); - resize( sizeHint() ); + resize( tqsizeHint() ); mrealwidget->recenterScreen(); part->redrawScreen( mrealwidget ); updateScrollBars(); @@ -336,7 +336,7 @@ void KigView::updateScrollBars() Rect er = mrealwidget->entireDocumentRect(); Rect sr = mrealwidget->screenInfo().shownRect(); - // we define the total rect to be the smallest rect that contains + // we define the total rect to be the smallest rect that tqcontains // both er and sr... er |= sr; @@ -360,7 +360,7 @@ void KigView::updateScrollBars() mrightscroll->setLineStep( (int)( sr.height() / pw / 10 ) ); mrightscroll->setPageStep( (int)( sr.height() / pw / 1.2 ) ); - // note that since Qt has a coordinate system with the lowest y + // note that since TQt has a coordinate system with the lowest y // values at the top, and we have it the other way around ( i know i // shouldn't have done this.. :( ), we invert the value that the // scrollbar shows. This is inverted again in @@ -443,7 +443,7 @@ const KigDocument& KigWidget::document() const return mpart->document(); } -TQSize KigWidget::sizeHint() const +TQSize KigWidget::tqsizeHint() const { return TQSize( 630, 450 ); } @@ -508,9 +508,9 @@ void KigView::toggleFullScreen() { mrealwidget->setFullScreen( ! mrealwidget->isFullScreen() ); if ( mrealwidget->isFullScreen() ) - topLevelWidget()->showFullScreen(); + tqtopLevelWidget()->showFullScreen(); else - topLevelWidget()->showNormal(); + tqtopLevelWidget()->showNormal(); } void KigWidget::setFullScreen( bool f ) @@ -545,7 +545,7 @@ void KigView::zoomRect() void KigWidget::setShowingRect( const Rect& r ) { - msi.setShownRect( r.matchShape( Rect::fromQRect( rect() ) ) ); + msi.setShownRect( r.matchShape( Rect::fromTQRect( rect() ) ) ); } void KigView::slotRecenterScreen() @@ -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::fromLatin1("
") + + TQString::tqfromLatin1("
") + 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 a60e3ee5..4c167d7a 100644 --- a/kig/kig/kig_view.h +++ b/kig/kig/kig_view.h @@ -41,15 +41,16 @@ class KigView; /** * This class is the real widget showing the document. The other is a - * wrapper, that has the scrollbars... I'm not using QScrollView + * wrapper, that has the scrollbars... I'm not using TQScrollView * cause i've been having problems with that, and it's easier to do * the work myself... * Internally, this is basically a dumb class, which is manipulated by * KigMode's. All events are forwarded to them. */ -class KigWidget : public QWidget +class KigWidget : public TQWidget { Q_OBJECT + TQ_OBJECT KigPart* mpart; KigView* mview; @@ -61,7 +62,7 @@ class KigWidget : public QWidget void paintEvent( TQPaintEvent* e ); void wheelEvent( TQWheelEvent* e ); void resizeEvent( TQResizeEvent* ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * this is called to match a rect's dimensions to the dimensions of @@ -104,7 +105,7 @@ public: */ KigWidget( KigPart* doc, KigView* view, - TQWidget* parent = 0, + TQWidget* tqparent = 0, const char* name = 0, bool fullscreen = false ); @@ -224,16 +225,17 @@ public: * most of its functionality to KigWidget... */ class KigView - : public QWidget + : public TQWidget { Q_OBJECT + TQ_OBJECT - TQGridLayout* mlayout; + TQGridLayout* mtqlayout; TQScrollBar* mrightscroll; TQScrollBar* mbottomscroll; /** - * apparently, TQScrollBar also emits its signals when you update it + * aptqparently, TQScrollBar also emits its signals when you update it * manually, so we ignore them while we're in \ref updateScrollBars()... */ bool mupdatingscrollbars; @@ -244,7 +246,7 @@ class KigView public: KigView( KigPart* part, bool fullscreen = false, - TQWidget* parent = 0, + TQWidget* tqparent = 0, const char* name = 0 ); ~KigView(); diff --git a/kig/misc/argsparser.cpp b/kig/misc/argsparser.cpp index c2387970..9d722752 100644 --- a/kig/misc/argsparser.cpp +++ b/kig/misc/argsparser.cpp @@ -152,15 +152,15 @@ ArgsParser ArgsParser::without( const ObjectImpType* type ) const return ArgsParser( ret ); } -ArgsParser::spec ArgsParser::findSpec( const ObjectImp* obj, const Args& parents ) const +ArgsParser::spec ArgsParser::findSpec( const ObjectImp* obj, const Args& tqparents ) const { spec ret; ret.type = 0; std::vector found( margs.size(), false ); - for ( Args::const_iterator o = parents.begin(); - o != parents.end(); ++o ) + for ( Args::const_iterator o = tqparents.begin(); + o != tqparents.end(); ++o ) { for ( uint i = 0; i < margs.size(); ++i ) { @@ -183,9 +183,9 @@ ArgsParser::spec ArgsParser::findSpec( const ObjectImp* obj, const Args& parents } const ObjectImpType* ArgsParser::impRequirement( - const ObjectImp* o, const Args& parents ) const + const ObjectImp* o, const Args& tqparents ) const { - spec s = findSpec( o, parents ); + spec s = findSpec( o, tqparents ); return s.type; } @@ -233,9 +233,9 @@ ArgsParser::~ArgsParser() { } -bool ArgsParser::isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const +bool ArgsParser::isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const { - spec s = findSpec( o, parents ); + spec s = findSpec( o, tqparents ); return s.onOrThrough; } diff --git a/kig/misc/argsparser.h b/kig/misc/argsparser.h index 001d9359..a3aff562 100644 --- a/kig/misc/argsparser.h +++ b/kig/misc/argsparser.h @@ -26,7 +26,7 @@ class ObjectImpType; /** * This class is meant to take care of checking the types of the - * parents to ObjectCalcer's, and to put them in the correct order. + * tqparents to ObjectCalcer's, and to put them in the correct order. * An ObjectType should construct an ArgsParser with a specification * of the arguments it wants. This specification is given as an array * of ArgsParser::spec structs. This struct contains a pointer to an @@ -117,7 +117,7 @@ private: */ std::vector margs; - spec findSpec( const ObjectImp* o, const Args& parents ) const; + spec findSpec( const ObjectImp* o, const Args& tqparents ) const; public: ArgsParser( const struct spec* args, int n ); ArgsParser( const std::vector& args ); @@ -137,7 +137,7 @@ public: int check( const std::vector& os ) const; /** * returns the usetext for the argument that o would be used for, - * if sel were used as parents.. + * if sel were used as tqparents.. * \p o should be in \p sel ... */ std::string usetext( const ObjectImp* o, const Args& sel ) const; @@ -155,16 +155,16 @@ public: /** * returns the minimal ObjectImp ID that \p o needs to inherit in order - * to be useful.. \p o should be part of \p parents . + * to be useful.. \p o should be part of \p tqparents . */ - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; /** - * Supposing that \p parents would be given as parents, this function + * Supposing that \p tqparents would be given as tqparents, this function * returns whether the returned ObjectImp will be, by construction, * on \p o ( if \p o is a curve ), or through \p o ( if \p o is a point ). */ - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; // Checks the args according to this args specification. If the // objects should never have occurred, then an assertion failure diff --git a/kig/misc/builtin_stuff.cc b/kig/misc/builtin_stuff.cc index e162e7ac..432721cf 100644 --- a/kig/misc/builtin_stuff.cc +++ b/kig/misc/builtin_stuff.cc @@ -59,14 +59,14 @@ void setupBuiltinStuff() I18N_NOOP( "A segment constructed from its start and end point" ), "segment" ); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_segment", Qt::Key_S ) ); + actions->add( new ConstructibleAction( c, "objects_new_segment", TQt::Key_S ) ); // line by two points.. c = new SimpleObjectTypeConstructor( LineABType::instance(), I18N_NOOP( "Line by Two Points" ), I18N_NOOP( "A line constructed through two points"), "line" ); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_linettp", Qt::Key_L ) ); + actions->add( new ConstructibleAction( c, "objects_new_linettp", TQt::Key_L ) ); // ray by two points.. c = new SimpleObjectTypeConstructor( @@ -74,7 +74,7 @@ void setupBuiltinStuff() I18N_NOOP( "A half-line by its start point, and another point somewhere on it." ), "ray" ); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_ray", Qt::Key_R ) ); + actions->add( new ConstructibleAction( c, "objects_new_ray", TQt::Key_R ) ); // perpendicular line c = new SimpleObjectTypeConstructor( @@ -98,7 +98,7 @@ void setupBuiltinStuff() I18N_NOOP( "A circle constructed by its center and a point that pertains to it" ), "circlebcp" ); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_circlebcp", Qt::Key_C ) ); + actions->add( new ConstructibleAction( c, "objects_new_circlebcp", TQt::Key_C ) ); c = new SimpleObjectTypeConstructor( CircleBTPType::instance(), I18N_NOOP( "Circle by Three Points" ), @@ -227,7 +227,7 @@ void setupBuiltinStuff() I18N_NOOP( "An angle defined by three points" ), "angle" ); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_angle", Qt::Key_A ) ); + actions->add( new ConstructibleAction( c, "objects_new_angle", TQt::Key_A ) ); c = new SimpleObjectTypeConstructor( EquilateralHyperbolaB4PType::instance(), @@ -260,7 +260,7 @@ void setupBuiltinStuff() "bisection" ); m.merge( mpotp ); m.merge( mpos ); - actions->add( new ConstructibleAction( &m, "objects_new_midpoint", Qt::Key_M ) ); + actions->add( new ConstructibleAction( &m, "objects_new_midpoint", TQt::Key_M ) ); }; c = new SimpleObjectTypeConstructor( @@ -269,7 +269,7 @@ void setupBuiltinStuff() I18N_NOOP( "Construct a vector from two given points." ), "vector" ); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_vector", Qt::Key_V ) ); + actions->add( new ConstructibleAction( c, "objects_new_vector", TQt::Key_V ) ); c = new SimpleObjectTypeConstructor( VectorSumType::instance(), @@ -509,7 +509,7 @@ void setupBuiltinStuff() ContainsTestType::instance(), I18N_NOOP( "Contains Test" ), I18N_NOOP( "Test whether a given curve contains a given point" ), - "testcontains" ); + "testtqcontains" ); ctors->add( c ); actions->add( new ConstructibleAction( c, "objects_new_containstest" ) ); @@ -562,12 +562,12 @@ void setupBuiltinStuff() // the generic intersection constructor.. c = new GenericIntersectionConstructor(); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_intersection", Qt::Key_I ) ); + actions->add( new ConstructibleAction( c, "objects_new_intersection", TQt::Key_I ) ); // the generic tangent constructor c = new TangentConstructor(); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_tangent", Qt::Key_T ) ); + actions->add( new ConstructibleAction( c, "objects_new_tangent", TQt::Key_T ) ); // the generic center of curvature constructor c = new CocConstructor(); diff --git a/kig/misc/calcpaths.cc b/kig/misc/calcpaths.cc index 1532715b..55787518 100644 --- a/kig/misc/calcpaths.cc +++ b/kig/misc/calcpaths.cc @@ -33,7 +33,7 @@ // I previously misunderstood the semantics of this function // and thought that the os vector had to be completed with all // the subtree generated by it. On the contrary, the os vector -// contains *all* the objects that we want, we only have to +// tqcontains *all* the objects that we want, we only have to // reorder them. Now it *should* work, however we postpone // activating this to a more proper moment @@ -75,7 +75,7 @@ void localdfs( ObjectCalcer* obj, std::vector& all) { visited.push_back( obj ); - const std::vector o = obj->children(); + const std::vector o = obj->tqchildren(); for ( std::vector::const_iterator i = o.begin(); i != o.end(); ++i ) { if ( std::find( visited.begin(), visited.end(), *i ) == visited.end() ) @@ -98,7 +98,7 @@ std::vector calcPath( const std::vector& os ) // the general idea here: // first we build a new Objects variable. For every object in os, - // we put all of its children at the end of it, and we do the same + // we put all of its tqchildren at the end of it, and we do the same // for the ones we add.. // "all" is the Objects var we're building... @@ -115,7 +115,7 @@ std::vector calcPath( const std::vector& os ) { for ( std::vector::const_iterator i = tmp.begin(); i != tmp.end(); ++i ) { - const std::vector o = (*i)->children(); + const std::vector o = (*i)->tqchildren(); std::copy( o.begin(), o.end(), std::back_inserter( all ) ); std::copy( o.begin(), o.end(), std::back_inserter( tmp2 ) ); }; @@ -124,7 +124,7 @@ std::vector calcPath( const std::vector& os ) }; // now we know that if all objects appear at least once after all of - // their parents. So, we take all, and of every object, we remove + // their tqparents. So, we take all, and of every object, we remove // every reference except the last one... std::vector ret; ret.reserve( os.size() ); @@ -148,7 +148,7 @@ bool addBranch( const std::vector& o, const ObjectCalcer* to, std if ( *i == to ) rb = true; else - if ( addBranch( (*i)->children(), to, ret ) ) + if ( addBranch( (*i)->tqchildren(), to, ret ) ) { rb = true; ret.push_back( *i ); @@ -163,7 +163,7 @@ std::vector calcPath( const std::vector& from, con for ( std::vector::const_iterator i = from.begin(); i != from.end(); ++i ) { - (void) addBranch( (*i)->children(), to, all ); + (void) addBranch( (*i)->tqchildren(), to, all ); }; std::vector ret; @@ -182,9 +182,9 @@ static void addNonCache( ObjectCalcer* o, std::vector& ret ) ret.push_back( o ); else { - std::vector parents = o->parents(); - for ( uint i = 0; i < parents.size(); ++i ) - addNonCache( parents[i], ret ); + std::vector tqparents = o->tqparents(); + for ( uint i = 0; i < tqparents.size(); ++i ) + addNonCache( tqparents[i], ret ); }; } @@ -193,16 +193,16 @@ static bool visit( const ObjectCalcer* o, const std::vector& from // this function returns true if the visited object depends on one // of the objects in from. If we encounter objects that are on the // side of the tree path ( they do not depend on from themselves, - // but their direct children do ), then we add them to ret. + // but their direct tqchildren do ), then we add them to ret. if ( std::find( from.begin(), from.end(), o ) != from.end() ) return true; - std::vector deps( o->parents().size(), false ); + std::vector deps( o->tqparents().size(), false ); bool somedepend = false; bool alldepend = true; - std::vector parents = o->parents(); - for ( uint i = 0; i < parents.size(); ++i ) + std::vector tqparents = o->tqparents(); + for ( uint i = 0; i < tqparents.size(); ++i ) { - bool v = visit( parents[i], from, ret ); + bool v = visit( tqparents[i], from, ret ); somedepend |= v; alldepend &= v; deps[i] = v; @@ -211,7 +211,7 @@ static bool visit( const ObjectCalcer* o, const std::vector& from { for ( uint i = 0; i < deps.size(); ++i ) if ( ! deps[i] ) - addNonCache( parents[i], ret ); + addNonCache( tqparents[i], ret ); }; return somedepend; @@ -234,8 +234,8 @@ std::vector getAllParents( const std::vector& objs std::set next; for ( std::set::const_iterator i = cur.begin(); i != cur.end(); ++i ) { - std::vector parents = (*i)->parents(); - next.insert( parents.begin(), parents.end() ); + std::vector tqparents = (*i)->tqparents(); + next.insert( tqparents.begin(), tqparents.end() ); }; ret.insert( next.begin(), next.end() ); @@ -253,16 +253,16 @@ std::vector getAllParents( ObjectCalcer* obj ) bool isChild( const ObjectCalcer* o, const std::vector& os ) { - std::vector parents = o->parents(); - std::set cur( parents.begin(), parents.end() ); + std::vector tqparents = o->tqparents(); + std::set cur( tqparents.begin(), tqparents.end() ); while ( ! cur.empty() ) { std::set next; for ( std::set::const_iterator i = cur.begin(); i != cur.end(); ++i ) { if ( std::find( os.begin(), os.end(), *i ) != os.end() ) return true; - std::vector parents = (*i)->parents(); - next.insert( parents.begin(), parents.end() ); + std::vector tqparents = (*i)->tqparents(); + next.insert( tqparents.begin(), tqparents.end() ); }; cur = next; }; @@ -289,8 +289,8 @@ std::set getAllChildren( const std::vector objs ) i != cur.end(); ++i ) { ret.insert( *i ); - std::vector children = (*i)->children(); - next.insert( children.begin(), children.end() ); + std::vector tqchildren = (*i)->tqchildren(); + next.insert( tqchildren.begin(), tqchildren.end() ); }; cur = next; }; diff --git a/kig/misc/calcpaths.h b/kig/misc/calcpaths.h index 620558a3..3abf19a6 100644 --- a/kig/misc/calcpaths.h +++ b/kig/misc/calcpaths.h @@ -23,14 +23,14 @@ /** * This function sorts \p os such that they're in the right order for * calc()-ing. This means that child objects must appear after their - * parents ( for you graph people, this is just a topological sort.. ) + * tqparents ( for you graph people, this is just a topological sort.. ) */ std::vector calcPath( const std::vector& os ); /** * This is a different function for more or less the same purpose. It * takes a few Objects, which are considered to have been calced - * already. Then, it puts the necessary part of their children in the + * already. Then, it puts the necessary part of their tqchildren in the * right order, so that calc()-ing correctly updates all of their data * ( they're calc'ed in the right order, i mean... ). The objects in * from are normally not included in the output, unless they appear @@ -42,7 +42,7 @@ std::vector calcPath( const std::vector& from, con * This function returns all objects on the side of the path through * the dependency tree from from down to to. This means that we look * for any objects that don't depend on any of the objects in from - * themselves, but of which one of the direct children does. We need + * themselves, but of which one of the direct tqchildren does. We need * this function for Locus stuff... */ std::vector sideOfTreePath( const std::vector& from, const ObjectCalcer* to ); diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp index b41b9284..83fdd077 100644 --- a/kig/misc/common.cpp +++ b/kig/misc/common.cpp @@ -347,7 +347,7 @@ Coordinate calcCircleRadicalStartPoint( const Coordinate& ca, const Coordinate& } double getDoubleFromUser( const TQString& caption, const TQString& label, double value, - TQWidget* parent, bool* ok, double min, double max, int decimals ) + TQWidget* tqparent, bool* ok, double min, double max, int decimals ) { #ifdef KIG_USE_KDOUBLEVALIDATOR KDoubleValidator vtor( min, max, decimals, 0, 0 ); @@ -357,12 +357,12 @@ double getDoubleFromUser( const TQString& caption, const TQString& label, double #if KDE_IS_VERSION( 3, 1, 90 ) TQString input = KInputDialog::getText( caption, label, KGlobal::locale()->formatNumber( value, decimals ), - ok, parent, "getDoubleFromUserDialog", &vtor ); + ok, tqparent, "getDoubleFromUserDialog", &vtor ); #else TQString input = KLineEditDlg::getText( caption, label, KGlobal::locale()->formatNumber( value, decimals ), - ok, parent, &vtor ); + ok, tqparent, &vtor ); #endif bool myok = true; @@ -422,7 +422,7 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // if ( fabs( a.x - b.x ) <= 1e-7 ) // { // // too small to be useful.. -// return r.contains( Coordinate( a.x, r.center().y ), miss ); +// return r.tqcontains( Coordinate( a.x, r.center().y ), miss ); // } // in case we have a segment we need also to check for the case when @@ -433,7 +433,7 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // - if the midpoint is in the rect than returning true is safe (also // in the cases where we have a ray or a line) - if ( r.contains( 0.5*( a + b ), miss ) ) return true; + if ( r.tqcontains( 0.5*( a + b ), miss ) ) return true; Coordinate dir = b - a; double m = dir.y / dir.x; @@ -455,10 +455,10 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // intersection is not between the begin and end point.. ) and if // the rect contains the intersection.. If it does, we have a winner.. return - ( imp->contains( leftint, width, w ) && r.contains( leftint, miss ) ) || - ( imp->contains( rightint, width, w ) && r.contains( rightint, miss ) ) || - ( imp->contains( bottomint, width, w ) && r.contains( bottomint, miss ) ) || - ( imp->contains( topint, width, w ) && r.contains( topint, miss ) ); + ( imp->tqcontains( leftint, width, w ) && r.tqcontains( leftint, miss ) ) || + ( imp->tqcontains( rightint, width, w ) && r.tqcontains( rightint, miss ) ) || + ( imp->tqcontains( bottomint, width, w ) && r.tqcontains( bottomint, miss ) ) || + ( imp->tqcontains( topint, width, w ) && r.tqcontains( topint, miss ) ); } bool operator==( const LineData& l, const LineData& r ) diff --git a/kig/misc/common.h b/kig/misc/common.h index d1969df3..d4f388fb 100644 --- a/kig/misc/common.h +++ b/kig/misc/common.h @@ -52,7 +52,7 @@ extern const double double_inf; */ double getDoubleFromUser( const TQString& caption, const TQString& label, double value, - TQWidget* parent, bool* ok, double min, double max, int decimals ); + TQWidget* tqparent, bool* ok, double min, double max, int decimals ); /** * Simple class representing a line. Used by various functions in Kig. diff --git a/kig/misc/coordinate.cpp b/kig/misc/coordinate.cpp index f2c272f2..86cf8eab 100644 --- a/kig/misc/coordinate.cpp +++ b/kig/misc/coordinate.cpp @@ -25,7 +25,7 @@ using namespace std; -Coordinate Coordinate::fromQPoint( const TQPoint& p ) +Coordinate Coordinate::fromTQPoint( const TQPoint& p ) { return Coordinate( p.x(), p.y() ); } @@ -159,10 +159,10 @@ const Coordinate Coordinate::normalize( double l ) const const Coordinate Coordinate::round() const { - return Coordinate( qRound( x ), qRound( y ) ); + return Coordinate( tqRound( x ), tqRound( y ) ); } -TQPoint Coordinate::toQPoint() const +TQPoint Coordinate::toTQPoint() const { Coordinate t = round(); return TQPoint( (int) t.x, (int) t.y ); diff --git a/kig/misc/coordinate.h b/kig/misc/coordinate.h index 8e19eb5e..745d64a7 100644 --- a/kig/misc/coordinate.h +++ b/kig/misc/coordinate.h @@ -33,7 +33,7 @@ class kdbgstream; class Coordinate { public: - static Coordinate fromQPoint( const TQPoint& p ); + static Coordinate fromTQPoint( const TQPoint& p ); /** Constructor. Construct a new Coordinate, with a given x and y * value. @@ -102,7 +102,7 @@ public: * x/y ratio untouched... */ const Coordinate normalize( double length = 1 ) const; - TQPoint toQPoint() const; + TQPoint toTQPoint() const; Coordinate& operator= ( const Coordinate& c ); /** Add. Add c to this Coordinate diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp index 859ed81d..deefe954 100644 --- a/kig/misc/coordinate_system.cpp +++ b/kig/misc/coordinate_system.cpp @@ -40,7 +40,7 @@ #include class CoordinateValidator - : public QValidator + : public TQValidator { bool mpolar; #ifdef KIG_USE_KDOUBLEVALIDATOR @@ -80,7 +80,7 @@ TQValidator::State CoordinateValidator::validate( TQString & input, int & pos ) if( tinput[tinput.length() - 1 ] == ' ' ) tinput.truncate( tinput.length() - 1 ); if ( tinput[0] == '(' ) tinput = tinput.mid( 1 ); if( tinput[0] == ' ' ) tinput = tinput.mid( 1 ); - int scp = tinput.find( ';' ); + int scp = tinput.tqfind( ';' ); if ( scp == -1 ) return mdv.validate( tinput, pos ) == Invalid ? Invalid : Valid; else { @@ -101,34 +101,34 @@ TQValidator::State CoordinateValidator::validate( TQString & input, int & pos ) void CoordinateValidator::fixup( TQString & input ) const { - int nsc = input.contains( ';' ); + int nsc = input.tqcontains( ';' ); if ( nsc > 1 ) { // where is the second ';' - int i = input.find( ';' ); - i = input.find( ';', i ); + int i = input.tqfind( ';' ); + i = input.tqfind( ';', i ); input = input.left( i ); }; // now the string has at most one semicolon left.. - int sc = input.find( ';' ); + int sc = input.tqfind( ';' ); if ( sc == -1 ) { sc = input.length(); KLocale* l = KGlobal::locale(); if ( mpolar ) - input.append( TQString::fromLatin1( ";" ) + l->positiveSign() + - TQString::fromLatin1( "0°" ) ); + input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() + + TQString::tqfromLatin1( "0°" ) ); else - input.append( TQString::fromLatin1( ";" ) + l->positiveSign() + - TQString::fromLatin1( "0" ) + l->decimalSymbol() + - TQString::fromLatin1( "0" ) ); + input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() + + TQString::tqfromLatin1( "0" ) + l->decimalSymbol() + + TQString::tqfromLatin1( "0" ) ); }; mre.exactMatch( input ); TQString ds1 = mre.cap( 1 ); mdv.fixup( ds1 ); TQString ds2 = mre.cap( 2 ); mdv.fixup( ds2 ); - input = ds1 + TQString::fromLatin1( "; " ) + ds2; + input = ds1 + TQString::tqfromLatin1( "; " ) + 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::fromLatin1( "( %1; %2 )" ).arg( xs ).arg( ys ); + return TQString::tqfromLatin1( "( %1; %2 )" ).tqarg( xs ).tqarg( ys ); } Coordinate EuclideanCoords::toScreen(const TQString& s, bool& ok) const @@ -255,7 +255,7 @@ void EuclideanCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) co /****** the axes ******/ if ( showaxes ) { - p.setPen( TQPen( Qt::gray, 1, Qt::SolidLine ) ); + p.setPen( TQPen( TQt::gray, 1, TQt::SolidLine ) ); // x axis p.drawSegment( Coordinate( hmin, 0 ), Coordinate( hmax, 0 ) ); // y axis @@ -286,8 +286,8 @@ void EuclideanCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) co ); }; // arrows on the ends of the axes... - p.setPen( TQPen( Qt::gray, 1, Qt::SolidLine ) ); - p.setBrush( TQBrush( Qt::gray ) ); + p.setPen( TQPen( TQt::gray, 1, TQt::SolidLine ) ); + p.setBrush( TQBrush( TQt::gray ) ); std::vector a; // the arrow on the right end of the X axis... @@ -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::fromLatin1("( %1; %2° )").arg( rs ).arg( ts ); + return TQString::tqfromLatin1("( %1; %2° )").tqarg( rs ).tqarg( ts ); } TQString PolarCoords::coordinateFormatNotice() const @@ -450,7 +450,7 @@ void PolarCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) const /****** the axes ******/ if ( showaxes ) { - p.setPen( TQPen( Qt::gray, 1, Qt::SolidLine ) ); + p.setPen( TQPen( TQt::gray, 1, TQt::SolidLine ) ); // x axis p.drawSegment( Coordinate( hmin, 0 ), Coordinate( hmax, 0 ) ); // y axis @@ -482,8 +482,8 @@ void PolarCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) const ); }; // arrows on the ends of the axes... - p.setPen( TQPen( Qt::gray, 1, Qt::SolidLine ) ); - p.setBrush( TQBrush( Qt::gray ) ); + p.setPen( TQPen( TQt::gray, 1, TQt::SolidLine ) ); + p.setBrush( TQBrush( TQt::gray ) ); std::vector a; // the arrow on the right end of the X axis... @@ -575,7 +575,7 @@ TQString CoordinateSystemFactory::setCoordinateSystemStatement( int id ) return i18n( "Set Polar Coordinate System" ); default: assert( false ); - return TQString::null; + return TQString(); } } @@ -608,15 +608,15 @@ Coordinate EuclideanCoords::snapToGrid( const Coordinate& c, const double hgraphmin = ceil( hmin / hd) * hd; const double vgraphmin = ceil( vmin / vd ) * vd; - const double nx = qRound( ( c.x - hgraphmin ) / hd ) * hd + hgraphmin; - const double ny = qRound( ( c.y - vgraphmin ) / vd ) * vd + vgraphmin; + const double nx = tqRound( ( c.x - hgraphmin ) / hd ) * hd + hgraphmin; + const double ny = tqRound( ( c.y - vgraphmin ) / vd ) * vd + vgraphmin; return Coordinate( nx, ny ); } Coordinate PolarCoords::snapToGrid( const Coordinate& c, const KigWidget& w ) const { - // we reuse the drawGrid code to find + // we reuse the drawGrid code to tqfind // we multiply by sqrt( 2 ) cause we don't want to miss circles in // the corners, that intersect with the axes outside of the @@ -643,7 +643,7 @@ Coordinate PolarCoords::snapToGrid( const Coordinate& c, double d = kigMin( hd, vd ); double dist = c.length(); - double ndist = qRound( dist / d ) * d; + double ndist = tqRound( dist / d ) * d; return c.normalize( ndist ); } diff --git a/kig/misc/coordinate_system.h b/kig/misc/coordinate_system.h index 44eaf6d6..f6c8cc7d 100644 --- a/kig/misc/coordinate_system.h +++ b/kig/misc/coordinate_system.h @@ -59,7 +59,7 @@ public: * KigWidget... ) */ class CoordinateSystem - : public Qt + : public TQt { public: CoordinateSystem(); diff --git a/kig/misc/cubic-common.cc b/kig/misc/cubic-common.cc index 029f1194..6bdf3aca 100644 --- a/kig/misc/cubic-common.cc +++ b/kig/misc/cubic-common.cc @@ -486,7 +486,7 @@ const CubicCartesianData calcCubicTransformation ( // assert (fabs(b[0][1][2] - b[1][2][0]) < 1e-8); // test a couple of cases // assert (fabs(b[0][1][1] - b[1][1][0]) < 1e-8); - // apparently, the above assertions are wrong ( due to rounding + // aptqparently, the above assertions are wrong ( due to rounding // errors, Maurizio and I hope :) ), so since the symmetry is not // present, we just take the sum of the parts of the matrix elements // that should be symmetric, instead of taking one of them, and diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc index c9435d2b..d17501c2 100644 --- a/kig/misc/guiaction.cc +++ b/kig/misc/guiaction.cc @@ -81,19 +81,19 @@ void ConstructibleAction::act( KigPart& d ) KigGUIAction::KigGUIAction( GUIAction* act, KigPart& doc, - TQObject* parent ) + TQObject* tqparent ) : KAction( act->descriptiveName(), doc.instance()->iconLoader()->loadIcon( act->iconFileName(), KIcon::Toolbar, 0, KIcon::DefaultState, 0L, true ), act->shortcut(), 0, 0, // no slot connection - parent, act->actionName() ), + tqparent, act->actionName() ), mact( act ), mdoc( doc ) { setWhatsThis( act->description() ); TQString tooltip = act->descriptiveName(); - tooltip.replace( TQRegExp( "&&" ), "&" ); + tooltip.tqreplace( TQRegExp( "&&" ), "&" ); setToolTip( tooltip ); } @@ -136,7 +136,7 @@ const char* ConstructPointAction::actionName() const int ConstructPointAction::shortcut() const { - return Qt::Key_P; + return TQt::Key_P; } void ConstructPointAction::act( KigPart& d ) @@ -223,7 +223,7 @@ void AddFixedPointAction::act( KigPart& doc ) KigInputDialog::getCoordinate( i18n( "Fixed Point" ), i18n( "Enter the coordinates for the new point." ) + - TQString::fromLatin1( "
" ) + + TQString::tqfromLatin1( "
" ) + doc.document().coordinateSystem().coordinateFormatNoticeMarkup(), doc.widget(), &ok, doc.document(), &c ); if ( ! ok ) return; @@ -252,12 +252,12 @@ int ConstructibleAction::shortcut() const int ConstructTextLabelAction::shortcut() const { - return Qt::Key_B; + return TQt::Key_B; } int AddFixedPointAction::shortcut() const { - return Qt::Key_F; + return TQt::Key_F; } #if 0 @@ -272,7 +272,7 @@ TestAction::~TestAction() TQString TestAction::description() const { - return TQString::fromLatin1( "Test stuff !!!" ); + return TQString::tqfromLatin1( "Test stuff !!!" ); } TQCString TestAction::iconFileName() const @@ -282,7 +282,7 @@ TQCString TestAction::iconFileName() const TQString TestAction::descriptiveName() const { - return TQString::fromLatin1( "Test stuff !!!" ); + return TQString::tqfromLatin1( "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::fromLatin1( script ) ) ); + Object* codeobject = new DataObject( new StringImp( TQString::tqfromLatin1( script ) ) ); Object* compiledcode = new RealObject( PythonCompileType::instance(), Objects( codeobject ) ); compiledcode->calc( doc ); diff --git a/kig/misc/guiaction.h b/kig/misc/guiaction.h index e2e3de54..e9595605 100644 --- a/kig/misc/guiaction.h +++ b/kig/misc/guiaction.h @@ -35,12 +35,13 @@ class KigGUIAction : public KAction { Q_OBJECT + TQ_OBJECT GUIAction* mact; KigPart& mdoc; public: KigGUIAction( GUIAction* act, KigPart& doc, - TQObject* parent ); + TQObject* tqparent ); void slotActivated(); GUIAction* guiAction(); diff --git a/kig/misc/kigfiledialog.cc b/kig/misc/kigfiledialog.cc index 2d7ea08f..cdfe2196 100644 --- a/kig/misc/kigfiledialog.cc +++ b/kig/misc/kigfiledialog.cc @@ -25,8 +25,8 @@ #include KigFileDialog::KigFileDialog( const TQString& startDir, const TQString& filter, - const TQString& caption, TQWidget* parent ) - : KFileDialog( startDir, filter, parent, "kigfiledialog", true ), + const TQString& caption, TQWidget* tqparent ) + : KFileDialog( startDir, filter, tqparent, "kigfiledialog", true ), mow( 0L ) { setCaption( caption ); @@ -53,7 +53,7 @@ void KigFileDialog::accept() { int ret = KMessageBox::warningContinueCancel( this, i18n( "The file \"%1\" already exists. Do you wish to overwrite it?" ) - .arg( sFile ), i18n( "Overwrite File?" ), i18n("Overwrite") ); + .tqarg( sFile ), i18n( "Overwrite File?" ), i18n("Overwrite") ); if ( ret != KMessageBox::Continue ) { KFileDialog::reject(); diff --git a/kig/misc/kigfiledialog.h b/kig/misc/kigfiledialog.h index 8c243131..5fb65949 100644 --- a/kig/misc/kigfiledialog.h +++ b/kig/misc/kigfiledialog.h @@ -28,6 +28,7 @@ class KigFileDialog : public KFileDialog { Q_OBJECT + TQ_OBJECT private: /** @@ -45,17 +46,17 @@ public: * documentation of KFileDialog for more help about this * \param filter the filter for the file dialog * \param caption the caption of this file dialog - * \param parent the parent for this file dialog + * \param tqparent the tqparent for this file dialog */ KigFileDialog( const TQString& startDir, const TQString& filter, - const TQString& caption, TQWidget *parent ); + const TQString& caption, TQWidget *tqparent ); /** * Use this to set the widget containing the options of eg an export filter. * The option widget will be popped up in a dialog right after the user * presses OK and before the dialog is closed. * - * You can construct the option widget with no parent, as it will be + * You can construct the option widget with no tqparent, as it will be * reparented. * * \param w the option widget diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc index ea0aeb66..de8f691d 100644 --- a/kig/misc/kiginputdialog.cc +++ b/kig/misc/kiginputdialog.cc @@ -65,8 +65,8 @@ KigInputDialogPrivate::KigInputDialogPrivate() } KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, - TQWidget* parent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 ) - : KDialogBase( parent, "kigdialog", true, caption, Ok|Cancel, Cancel, true ), + TQWidget* tqparent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 ) + : KDialogBase( tqparent, "kigdialog", true, caption, Ok|Cancel, Cancel, true ), d( new KigInputDialogPrivate() ) { d->m_coord1 = c1 ? Coordinate( *c1 ) : Coordinate::invalidCoord(); @@ -84,8 +84,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, d->m_textEdit = new KTextEdit( frame ); d->m_textEdit->setText( label ); d->m_textEdit->setReadOnly( true ); - d->m_textEdit->setFocusPolicy( NoFocus ); -// d->m_textEdit->setAlignment( d->m_textEdit->alignment() | Qt::WordBreak ); + d->m_textEdit->setFocusPolicy( TQ_NoFocus ); +// d->m_textEdit->tqsetAlignment( d->m_textEdit->tqalignment() | TQt::WordBreak ); d->m_textEdit->setFrameStyle( TQFrame::NoFrame ); mainlay->addWidget( d->m_textEdit ); @@ -121,8 +121,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, enableButtonOK( ok ); } -KigInputDialog::KigInputDialog( TQWidget* parent, const Goniometry& g ) - : KDialogBase( parent, "kigdialog", true, i18n( "Set Angle Size" ), Ok|Cancel, Cancel, true ), +KigInputDialog::KigInputDialog( TQWidget* tqparent, const Goniometry& g ) + : KDialogBase( tqparent, "kigdialog", true, i18n( "Set Angle Size" ), Ok|Cancel, Cancel, true ), d( new KigInputDialogPrivate() ) { d->m_gonio = g; @@ -171,7 +171,7 @@ KigInputDialog::KigInputDialog( TQWidget* parent, const Goniometry& g ) void KigInputDialog::keyPressEvent( TQKeyEvent* e ) { - if ( ( e->key() == Qt::Key_Return ) && ( e->state() == 0 ) ) + if ( ( e->key() == TQt::Key_Return ) && ( e->state() == 0 ) ) { if ( actionButton( Ok )->isEnabled() ) { @@ -180,7 +180,7 @@ void KigInputDialog::keyPressEvent( TQKeyEvent* e ) return; } } - else if ( ( e->key() == Qt::Key_Escape ) && ( e->state() == 0 ) ) + else if ( ( e->key() == TQt::Key_Escape ) && ( e->state() == 0 ) ) { actionButton( Cancel )->animateClick(); e->accept(); @@ -247,16 +247,16 @@ Goniometry KigInputDialog::goniometry() const } void KigInputDialog::getCoordinate( const TQString& caption, const TQString& label, - TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue ) + TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue ) { - getTwoCoordinates( caption, label, parent, ok, doc, cvalue, 0 ); + getTwoCoordinates( caption, label, tqparent, ok, doc, cvalue, 0 ); } void KigInputDialog::getTwoCoordinates( const TQString& caption, const TQString& label, - TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue, + TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue, Coordinate* cvalue2 ) { - KigInputDialog dlg( caption, label, parent, doc, cvalue, cvalue2 ); + KigInputDialog dlg( caption, label, tqparent, doc, cvalue, cvalue2 ); *ok = ( dlg.exec() == Accepted ); @@ -273,9 +273,9 @@ void KigInputDialog::getTwoCoordinates( const TQString& caption, const TQString& } -Goniometry KigInputDialog::getAngle( TQWidget* parent, bool* ok, const Goniometry& g ) +Goniometry KigInputDialog::getAngle( TQWidget* tqparent, bool* ok, const Goniometry& g ) { - KigInputDialog dlg( parent, g ); + KigInputDialog dlg( tqparent, g ); *ok = ( dlg.exec() == Accepted ); diff --git a/kig/misc/kiginputdialog.h b/kig/misc/kiginputdialog.h index c7b29e73..60f2ba54 100644 --- a/kig/misc/kiginputdialog.h +++ b/kig/misc/kiginputdialog.h @@ -41,13 +41,14 @@ class KigInputDialog : KDialogBase { Q_OBJECT + TQ_OBJECT public: private: - KigInputDialog( const TQString& caption, const TQString& label, TQWidget* parent, + KigInputDialog( const TQString& caption, const TQString& label, TQWidget* tqparent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 ); - KigInputDialog( TQWidget* parent, const Goniometry& g ); + KigInputDialog( TQWidget* tqparent, const Goniometry& g ); virtual void keyPressEvent( TQKeyEvent* e ); @@ -69,7 +70,7 @@ public: * * \param caption caption of the dialog * \param label text of the label of the dialog - * \param parent parent of the dialog widget + * \param tqparent tqparent of the dialog widget * \param ok it will be set to true if the user pressed Ok after inserting a * well-formatted Coordinate * \param doc the actual Kig document @@ -79,14 +80,14 @@ public: * displayed as initial value of the correspondenting text edit */ static void getCoordinate( const TQString& caption, const TQString& label, - TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue ); + TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue ); /** * Static convenience function to get two Coordinates at once from the user. * * \param caption caption of the dialog * \param label text of the label of the dialog - * \param parent parent of the dialog widget + * \param tqparent tqparent of the dialog widget * \param ok it will be set to true if the user pressed Ok after inserting * well-formatted Coordinates * \param doc the actual Kig document @@ -102,14 +103,14 @@ public: * the text edit representing the second Coordinate. */ static void getTwoCoordinates( const TQString& caption, const TQString& label, - TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue, + TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue, Coordinate* cvalue2 ); /** * Static convenience function to get an angle incapsulated in a Goniometry * class. * - * \param parent parent of the dialog widget + * \param tqparent tqparent of the dialog widget * \param ok it will be set to true if the user pressed Ok after inserting a * well-formatted angle * \param g the Goniometry class containing the original angle we are going @@ -117,7 +118,7 @@ public: * * \return a Goniometry class containing the new angle */ - static Goniometry getAngle( TQWidget* parent, bool* ok, const Goniometry& g ); + static Goniometry getAngle( TQWidget* tqparent, bool* ok, const Goniometry& g ); }; #endif diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp index 98594ecb..95be1837 100644 --- a/kig/misc/kigpainter.cpp +++ b/kig/misc/kigpainter.cpp @@ -42,18 +42,18 @@ KigPainter::KigPainter( const ScreenInfo& si, TQPaintDevice* device, const KigDocument& doc, bool no ) : mP ( device ), - color( Qt::blue ), + color( TQt::blue ), style( Qt::SolidLine ), pointstyle( 0 ), width( -1 ), brushStyle( Qt::NoBrush ), - brushColor( Qt::blue ), + brushColor( TQt::blue ), mdoc( doc ), msi( si ), mNeedOverlay( no ), overlayenlarge( 0 ) { - mP.setBackgroundColor( Qt::white ); + mP.setBackgroundColor( TQt::white ); } KigPainter::~KigPainter() @@ -136,7 +136,7 @@ void KigPainter::drawFatPoint( const Coordinate& p ) Rect r( tl, br ); TQRect qr = toScreen( r ); mP.drawRect( qr ); - mP.fillRect( qr, TQBrush( color, Qt::SolidPattern ) ); + mP.fillRect( qr, TQBrush( color, TQt::SolidPattern ) ); if( mNeedOverlay ) mOverlay.push_back( qr ); break; } @@ -196,7 +196,7 @@ void KigPainter::drawText( const Rect p, const TQString s, int textFlags, int le void KigPainter::textOverlay( const TQRect& r, const TQString s, int textFlags, int len ) { - // kdDebug() << Rect::fromQRect( mP.boundingRect( r, textFlags, s, len ) ) << endl; + // kdDebug() << Rect::fromTQRect( mP.boundingRect( r, textFlags, s, len ) ) << endl; TQRect newr( mP.boundingRect( r, textFlags, s, len ) ); newr.setWidth( newr.width() + 4 ); newr.setHeight( newr.height() + 4 ); @@ -218,7 +218,7 @@ void KigPainter::setColor( const TQColor& c ) mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) ); } -void KigPainter::setStyle( const PenStyle c ) +void KigPainter::setStyle( const Qt::PenStyle c ) { style = c; mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) ); @@ -251,7 +251,7 @@ void KigPainter::setBrush( const TQBrush& b ) mP.setBrush( b ); } -void KigPainter::setBrushStyle( const BrushStyle c ) +void KigPainter::setBrushStyle( const Qt::BrushStyle c ) { brushStyle = c; mP.setBrush( TQBrush( brushColor, brushStyle ) ); @@ -292,7 +292,7 @@ void KigPainter::drawPolygon( const std::vector& pts, TQBrush oldbrush = mP.brush(); setBrush( TQBrush( color, Dense4Pattern ) ); setPen( Qt::NoPen ); - // i know this isn't really fast, but i blame it all on Qt with its + // i know this isn't really fast, but i blame it all on TQt with its // stupid container classes... what's wrong with the STL ? TQPointArray t( pts.size() ); int c = 0; @@ -300,7 +300,7 @@ void KigPainter::drawPolygon( const std::vector& pts, { t.putPoints( c++, 1, i->x(), i->y() ); }; - mP.drawPolygon( t, winding, index, npoints ); + mP.tqdrawPolygon( t, winding, index, npoints ); setPen( oldpen ); setBrush( oldbrush ); if( mNeedOverlay ) mOverlay.push_back( t.boundingRect() ); @@ -499,9 +499,9 @@ void KigPainter::drawObjects( const std::vector& os, bool sel ) void KigPainter::drawFilledRect( const TQRect& r ) { - TQPen pen( Qt::black, 1, Qt::DotLine ); + TQPen pen( TQt::black, 1, TQt::DotLine ); setPen( pen ); - setBrush( TQBrush( Qt::cyan, Dense6Pattern ) ); + setBrush( TQBrush( TQt::cyan, Dense6Pattern ) ); drawRect( r.normalize() ); } @@ -511,7 +511,7 @@ void KigPainter::drawTextStd( const TQPoint& p, const TQString& s ) // tf = text formatting flags int tf = AlignLeft | AlignTop | DontClip | WordBreak; // we need the rect where we're going to paint text - setPen(TQPen(Qt::blue, 1, SolidLine)); + setPen(TQPen(TQt::blue, 1, SolidLine)); setBrush(Qt::NoBrush); drawText( Rect( msi.fromScreen(p), window().bottomRight() @@ -645,7 +645,7 @@ void KigPainter::drawAngle( const Coordinate& cpoint, const double dstartangle, setBrushStyle( Qt::SolidPattern ); // drawPolygon( arrow ); - mP.drawPolygon( arrow, false, 0, -1 ); + mP.tqdrawPolygon( arrow, false, 0, -1 ); // if ( mNeedOverlay ) mOverlay.push_back( toScreen( r ) ); setWholeWinOverlay(); //mp: ugly! why not compute a correct overlay? @@ -679,7 +679,7 @@ void KigPainter::drawVector( const Coordinate& a, const Coordinate& b ) Coordinate c = b - dir + perp; Coordinate d = b - dir - perp; // draw the arrow lines with a normal style - mP.setPen( TQPen( color, width == -1 ? 1 : width, Qt::SolidLine ) ); + mP.setPen( TQPen( color, width == -1 ? 1 : width, TQt::SolidLine ) ); drawSegment( b, c ); drawSegment( b, d ); // setting again the original style @@ -835,7 +835,7 @@ void KigPainter::drawCurve( const CurveImp* curve ) bool dooverlay = ! overlaypt && h < hmaxoverlay && valid0 && valid1 && fabs( p0.x - p1.x ) <= overlayRectSize() && fabs( p0.y - p1.y ) <= overlayRectSize(); - bool addn = sr.contains( p2 ) || h >= hmax; + bool addn = sr.tqcontains( p2 ) || h >= hmax; // estimated error between the curve and the segments double errsq = 1e21; if ( allvalid ) errsq = (0.5*p0 + 0.5*p1 - p2).squareLength(); @@ -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.drawPolyline( curpolyline, 0, curpolylinenextfree ); + mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree ); curpolylinenextfree = 0; } if ( curpolylinenextfree == 0 ) @@ -870,10 +870,10 @@ void KigPainter::drawCurve( const CurveImp* curve ) else if ( h >= hmin ) // we do not continue to subdivide indefinitely! { // push into stack in order to process both subintervals - if ( addn || ( valid0 && sr.contains( p0 ) ) ) + if ( addn || ( valid0 && sr.tqcontains( p0 ) ) ) workstack.push( workitem( curitem.first, coordparampair( t2, p2 ), overlaypt ) ); - if ( addn || ( valid1 && sr.contains( p1 ) ) ) + if ( addn || ( valid1 && sr.tqcontains( p1 ) ) ) { curitem = workitem( coordparampair( t2, p2 ), curitem.second , overlaypt ); @@ -883,7 +883,7 @@ void KigPainter::drawCurve( const CurveImp* curve ) } } // flush the rest of the curve - mP.drawPolyline( curpolyline, 0, curpolylinenextfree ); + mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree ); curpolylinenextfree = 0; if ( ! workstack.empty () ) @@ -912,10 +912,10 @@ void KigPainter::drawTextFrame( const Rect& frame, { // inspired upon kgeo, thanks to Marc Bartsch, i've taken some of // his code too.. - setPen( TQPen( Qt::black, 1 ) ); + setPen( TQPen( TQt::black, 1 ) ); setBrush( TQBrush( TQColor( 255, 255, 222 ) ) ); drawRect( frame ); - setPen( TQPen( TQColor( 197, 194, 197 ), 1, Qt::SolidLine ) ); + setPen( TQPen( TQColor( 197, 194, 197 ), 1, TQt::SolidLine ) ); TQRect qr = toScreen( frame ); @@ -924,7 +924,7 @@ void KigPainter::drawTextFrame( const Rect& frame, }; setPen( oldpen ); setBrush( oldbrush ); - drawText( frame, s, Qt::AlignVCenter | Qt::AlignLeft ); + drawText( frame, s, TQt::AlignVCenter | TQt::AlignLeft ); } void KigPainter::drawArc( const Coordinate& center, const double radius, diff --git a/kig/misc/kigpainter.h b/kig/misc/kigpainter.h index 70b4cd9a..ee3b14c1 100644 --- a/kig/misc/kigpainter.h +++ b/kig/misc/kigpainter.h @@ -51,7 +51,7 @@ class ObjectHolder; * It calls KigWidget::appendOverlay() for all of the places it draws in... */ class KigPainter - : public Qt + : public TQt { protected: // don't blaim me for this mutable hack. It's TT that hasn't got @@ -59,10 +59,10 @@ protected: mutable TQPainter mP; TQColor color; - PenStyle style; + Qt::PenStyle style; int pointstyle; int width; - BrushStyle brushStyle; + Qt::BrushStyle brushStyle; TQColor brushColor; const KigDocument& mdoc; @@ -94,7 +94,7 @@ public: Rect fromScreen( const TQRect& r ) const; // colors and stuff... - void setStyle( const PenStyle c ); + void setStyle( const Qt::PenStyle c ); void setColor( const TQColor& c ); /** * setting this to -1 means to use the default width for the object @@ -103,7 +103,7 @@ public: void setWidth( const int c ); void setPointStyle( const int p ); void setPen( const TQPen& p ); - void setBrushStyle( const BrushStyle c ); + void setBrushStyle( const Qt::BrushStyle c ); void setBrush( const TQBrush& b ); void setBrushColor( const TQColor& c ); diff --git a/kig/misc/lists.cc b/kig/misc/lists.cc index d3a4fb4d..7d2bee62 100644 --- a/kig/misc/lists.cc +++ b/kig/misc/lists.cc @@ -301,13 +301,13 @@ bool MacroList::load( const TQString& f, std::vector& ret, const KigPart TQFile file( f ); if ( ! file.open( IO_ReadOnly ) ) { - KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).arg( f ) ); + KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).tqarg( f ) ); return false; } TQDomDocument doc( "KigMacroFile" ); if ( !doc.setContent( &file ) ) { - KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).arg( f ) ); + KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).tqarg( f ) ); return false; } file.close(); @@ -318,7 +318,7 @@ bool MacroList::load( const TQString& f, std::vector& ret, const KigPart else { KMessageBox::detailedSorry( - 0, i18n( "Kig cannot open the macro file \"%1\"." ).arg( f ), + 0, i18n( "Kig cannot open the macro file \"%1\"." ).tqarg( f ), i18n( "This file was created by a very old Kig version (pre-0.4). " "Support for this format has been removed from recent Kig versions. " "You can try to import this macro using a previous Kig version " @@ -372,7 +372,7 @@ bool MacroList::loadNew( const TQDomElement& docelem, std::vector& ret, assert( hierarchy ); // if the macro has no name, we give it a bogus name... if ( name.isEmpty() ) - name = i18n( "Unnamed Macro #%1" ).arg( unnamedindex++ ); + name = i18n( "Unnamed Macro #%1" ).tqarg( unnamedindex++ ); MacroConstructor* ctor = new MacroConstructor( *hierarchy, i18n( name.latin1() ), i18n( description.latin1() ), iconfile ); delete hierarchy; diff --git a/kig/misc/object_constructor.cc b/kig/misc/object_constructor.cc index ce48a636..a5802d45 100644 --- a/kig/misc/object_constructor.cc +++ b/kig/misc/object_constructor.cc @@ -102,12 +102,12 @@ void StandardConstructorBase::handlePrelim( assert ( margsparser.check( os ) != ArgsParser::Invalid ); std::vector args = margsparser.parse( os ); p.setBrushStyle( Qt::NoBrush ); - p.setBrushColor( Qt::red ); - p.setPen( TQPen ( Qt::red, 1) ); + p.setBrushColor( TQt::red ); + p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being // drawn.. - ObjectDrawer drawer( Qt::red ); + ObjectDrawer drawer( TQt::red ); drawprelim( drawer, p, args, d ); } @@ -124,12 +124,12 @@ SimpleObjectTypeConstructor::~SimpleObjectTypeConstructor() { } -void SimpleObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, +void SimpleObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& doc ) const { Args args; using namespace std; - transform( parents.begin(), parents.end(), + transform( tqparents.begin(), tqparents.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); @@ -178,12 +178,12 @@ MultiObjectTypeConstructor::~MultiObjectTypeConstructor() { } -void MultiObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, +void MultiObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& doc ) const { Args args; using namespace std; - transform( parents.begin(), parents.end(), + transform( tqparents.begin(), tqparents.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); for ( vector::const_iterator i = mparams.begin(); i != mparams.end(); ++i ) @@ -305,7 +305,7 @@ TQString StandardConstructorBase::useText( const ObjectCalcer& o, const std::vec transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); std::string ret = margsparser.usetext( o.imp(), args ); - if ( ret.empty() ) return TQString::null; + if ( ret.empty() ) return TQString(); return i18n( ret.c_str() ); } @@ -318,7 +318,7 @@ TQString StandardConstructorBase::selectStatement( transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); std::string ret = margsparser.selectStatement( args ); - if ( ret.empty() ) return TQString::null; + if ( ret.empty() ) return TQString(); return i18n( ret.c_str() ); } @@ -331,7 +331,7 @@ TQString MergeObjectConstructor::useText( const ObjectCalcer& o, const std::vect int w = (*i)->wantArgs( args, d, v ); if ( w != ArgsParser::Invalid ) return (*i)->useText( o, sel, d, v ); }; - return TQString::null; + return TQString(); } TQString MergeObjectConstructor::selectStatement( @@ -344,7 +344,7 @@ TQString MergeObjectConstructor::selectStatement( int wa = (*i)->wantArgs( args, d, w ); if ( wa != ArgsParser::Invalid ) return (*i)->selectStatement( sel, d, w ); }; - return TQString::null; + return TQString(); } MacroConstructor::MacroConstructor( const ObjectHierarchy& hier, const TQString& name, @@ -421,7 +421,7 @@ TQString MacroConstructor::selectStatement( transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); std::string ret = mparser.selectStatement( args ); - if ( ret.empty() ) return TQString::null; + if ( ret.empty() ) return TQString(); else return i18n( ret.c_str() ); } @@ -434,7 +434,7 @@ TQString MacroConstructor::useText( const ObjectCalcer& o, const std::vector& parents, + const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& d ) const { - int index = parents[0]->imp()->propertiesInternalNames().findIndex( mpropinternalname ); + int index = tqparents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname ); assert ( index != -1 ); - ObjectImp* imp = parents[0]->imp()->property( index, d ); + ObjectImp* imp = tqparents[0]->imp()->property( index, d ); drawer.draw( *imp, p, true ); delete imp; } std::vector PropertyObjectConstructor::build( - const std::vector& parents, KigDocument&, + const std::vector& tqparents, KigDocument&, KigWidget& ) const { - int index = parents[0]->imp()->propertiesInternalNames().findIndex( mpropinternalname ); + int index = tqparents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname ); assert( index != -1 ); std::vector ret; ret.push_back( new ObjectHolder( - new ObjectPropertyCalcer( parents[0], index ) ) ); + new ObjectPropertyCalcer( tqparents[0], index ) ) ); return ret; } diff --git a/kig/misc/object_constructor.h b/kig/misc/object_constructor.h index 9b03ece0..9233426f 100644 --- a/kig/misc/object_constructor.h +++ b/kig/misc/object_constructor.h @@ -165,7 +165,7 @@ public: const KigDocument& d, const KigWidget& v ) const; - virtual void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, + virtual void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const = 0; TQString useText( const ObjectCalcer& o, const std::vector& sel, @@ -196,7 +196,7 @@ public: ~SimpleObjectTypeConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, @@ -225,7 +225,7 @@ public: ~PropertyObjectConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, @@ -265,7 +265,7 @@ public: int a, int b, int c = -999, int d = -999 ); ~MultiObjectTypeConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc index c2365aaa..7a977e63 100644 --- a/kig/misc/object_hierarchy.cc +++ b/kig/misc/object_hierarchy.cc @@ -47,14 +47,14 @@ public: // on the given objects. The dependsstack contains a set of // booleans telling which parts of the hierarchy certainly depend on // the given objects. In this function, the node should check - // whether any of its parents have true set, and if so, set its own + // whether any of its tqparents have true set, and if so, set its own // value to true. virtual void checkDependsOnGiven( std::vector& dependsstack, int loc ) const = 0; // this function is used to check whether the given objects are all - // used by one or more of the final objects. The usedstack contains + // used by one or more of the final objects. The usedstack tqcontains // a set of booleans telling which parts of the hierarchy are // certainly ancestors of the final objects. In this function, the - // node should set all of its parents' booleans to true. + // node should set all of its tqparents' booleans to true. virtual void checkArgumentsUsed( std::vector& usedstack ) const = 0; }; @@ -118,15 +118,15 @@ class ApplyTypeNode : public ObjectHierarchy::Node { const ObjectType* mtype; - std::vector mparents; + std::vector mtqparents; public: - ApplyTypeNode( const ObjectType* type, const std::vector& parents ) - : mtype( type ), mparents( parents ) {} + ApplyTypeNode( const ObjectType* type, const std::vector& tqparents ) + : mtype( type ), mtqparents( tqparents ) {} ~ApplyTypeNode(); Node* copy() const; const ObjectType* type() const { return mtype; } - const std::vector& parents() const { return mparents; } + const std::vector& tqparents() const { return mtqparents; } int id() const; void apply( std::vector& stack, @@ -141,17 +141,17 @@ int ApplyTypeNode::id() const { return ID_ApplyType; } void ApplyTypeNode::checkArgumentsUsed( std::vector& usedstack ) const { - for ( uint i = 0; i < mparents.size(); ++i ) + for ( uint i = 0; i < mtqparents.size(); ++i ) { - usedstack[mparents[i]] = true; + usedstack[mtqparents[i]] = true; } } void ApplyTypeNode::checkDependsOnGiven( std::vector& dependsstack, int loc ) const { bool result = false; - for ( uint i = 0; i < mparents.size(); ++i ) - if ( dependsstack[mparents[i]] == true ) result = true; + for ( uint i = 0; i < mtqparents.size(); ++i ) + if ( dependsstack[mtqparents[i]] == true ) result = true; dependsstack[loc] = result; } @@ -161,23 +161,23 @@ ApplyTypeNode::~ApplyTypeNode() ObjectHierarchy::Node* ApplyTypeNode::copy() const { - return new ApplyTypeNode( mtype, mparents ); + return new ApplyTypeNode( mtype, mtqparents ); } void ApplyTypeNode::apply( std::vector& stack, int loc ) const { - std::vector parents; - for ( uint i = 0; i < mparents.size(); ++i ) - parents.push_back( stack[ mparents[i] ] ); - stack[loc] = new ObjectTypeCalcer( mtype, parents ); + std::vector tqparents; + for ( uint i = 0; i < mtqparents.size(); ++i ) + tqparents.push_back( stack[ mtqparents[i] ] ); + stack[loc] = new ObjectTypeCalcer( mtype, tqparents ); } void ApplyTypeNode::apply( std::vector& stack, int loc, const KigDocument& doc ) const { Args args; - for ( uint i = 0; i < mparents.size(); ++i ) - args.push_back( stack[mparents[i]] ); + for ( uint i = 0; i < mtqparents.size(); ++i ) + args.push_back( stack[mtqparents[i]] ); args = mtype->sortArgs( args ); stack[loc] = mtype->calc( args, doc ); } @@ -186,21 +186,21 @@ class FetchPropertyNode : public ObjectHierarchy::Node { mutable int mpropid; - int mparent; + int mtqparent; const TQCString mname; public: - // propid is a cache of the location of name in the parent's + // propid is a cache of the location of name in the tqparent's // propertiesInternalNames(), just as it is in PropertyObject. We // don't want to ever save this value, since we cannot guarantee it // remains consistent if we add properties some place.. - FetchPropertyNode( const int parent, const TQCString& name, const int propid = -1 ) - : mpropid( propid ), mparent( parent ), mname( name ) {} + FetchPropertyNode( const int tqparent, const TQCString& name, const int propid = -1 ) + : mpropid( propid ), mtqparent( tqparent ), mname( name ) {} ~FetchPropertyNode(); Node* copy() const; void checkDependsOnGiven( std::vector& dependsstack, int loc ) const; void checkArgumentsUsed( std::vector& usedstack ) const; - int parent() const { return mparent; } + int tqparent() const { return mtqparent; } const TQCString& propinternalname() const { return mname; } int id() const; @@ -215,17 +215,17 @@ FetchPropertyNode::~FetchPropertyNode() void FetchPropertyNode::checkArgumentsUsed( std::vector& usedstack ) const { - usedstack[mparent] = true; + usedstack[mtqparent] = true; } void FetchPropertyNode::checkDependsOnGiven( std::vector& dependsstack, int loc ) const { - dependsstack[loc] = dependsstack[mparent]; + dependsstack[loc] = dependsstack[mtqparent]; } ObjectHierarchy::Node* FetchPropertyNode::copy() const { - return new FetchPropertyNode( mparent, mname, mpropid ); + return new FetchPropertyNode( mtqparent, mname, mpropid ); } int FetchPropertyNode::id() const @@ -236,10 +236,10 @@ int FetchPropertyNode::id() const void FetchPropertyNode::apply( std::vector& stack, int loc, const KigDocument& d ) const { - assert( stack[mparent] ); - if ( mpropid == -1 ) mpropid = stack[mparent]->propertiesInternalNames().findIndex( mname ); + assert( stack[mtqparent] ); + if ( mpropid == -1 ) mpropid = stack[mtqparent]->propertiesInternalNames().tqfindIndex( mname ); if ( mpropid != -1 ) - stack[loc] = stack[mparent]->property( mpropid, d ); + stack[loc] = stack[mtqparent]->property( mpropid, d ); else stack[loc] = new InvalidImp(); } @@ -247,9 +247,9 @@ void FetchPropertyNode::apply( std::vector& stack, void FetchPropertyNode::apply( std::vector& stack, int loc ) const { if ( mpropid == -1 ) - mpropid = stack[mparent]->imp()->propertiesInternalNames().findIndex( mname ); + mpropid = stack[mtqparent]->imp()->propertiesInternalNames().tqfindIndex( mname ); assert( mpropid != -1 ); - stack[loc] = new ObjectPropertyCalcer( stack[mparent], mpropid ); + stack[loc] = new ObjectPropertyCalcer( stack[mtqparent], mpropid ); } std::vector ObjectHierarchy::calc( const Args& a, const KigDocument& doc ) const @@ -297,23 +297,23 @@ int ObjectHierarchy::visit( const ObjectCalcer* o, std::map parents; - parents.push_back( smi->second ); - mnodes.push_back( new ApplyTypeNode( CopyObjectType::instance(), parents ) ); + std::vector tqparents; + tqparents.push_back( smi->second ); + mnodes.push_back( new ApplyTypeNode( CopyObjectType::instance(), tqparents ) ); return ret; } else return smi->second; } - std::vector p( o->parents() ); + std::vector p( o->tqparents() ); // we check if o descends from the given objects.. bool descendsfromgiven = false; - std::vector parents; - parents.resize( p.size(), -1 ); + std::vector tqparents; + tqparents.resize( p.size(), -1 ); for ( uint i = 0; i < p.size(); ++i ) { int v = visit( p[i], seenmap, false ); - parents[i] = v; + tqparents[i] = v; descendsfromgiven |= (v != -1); }; @@ -335,7 +335,7 @@ int ObjectHierarchy::visit( const ObjectCalcer* o, std::map& from, const std::v seenmap[from[i]] = i; for ( std::vector::const_iterator i = to.begin(); i != to.end(); ++i ) { - std::vector parents = (*i)->parents(); - for ( std::vector::const_iterator j = parents.begin(); - j != parents.end(); ++j ) + std::vector tqparents = (*i)->tqparents(); + for ( std::vector::const_iterator j = tqparents.begin(); + j != tqparents.end(); ++j ) visit( *j, seenmap, true ); } for ( std::vector::const_iterator i = to.begin(); i != to.end(); ++i ) @@ -408,7 +408,7 @@ ObjectHierarchy::ObjectHierarchy( const std::vector& from, const init( from, to ); } -void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) const +void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) const { int id = 1; for ( uint i = 0; i < mnumberofargs; ++i ) @@ -419,12 +419,12 @@ 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::fromLatin1(musetexts[i].c_str() ) ) ); +// ut.appendChild( doc.createTextNode( TQString::tqfromLatin1(musetexts[i].c_str() ) ) ); // e.appendChild( ut ); // TQDomElement ss = doc.createElement( "SelectStatement" ); -// ss.appendChild( doc.createTextNode( TQString::fromLatin1(mselectstatements[i].c_str() ) ) ); +// ss.appendChild( doc.createTextNode( TQString::tqfromLatin1(mselectstatements[i].c_str() ) ) ); // e.appendChild( ss ); - parent.appendChild( e ); + tqparent.appendChild( e ); } for ( uint i = 0; i < mnodes.size(); ++i ) @@ -437,12 +437,12 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons { const ApplyTypeNode* node = static_cast( mnodes[i] ); e.setAttribute( "action", "calc" ); - e.setAttribute( "type", TQString::fromLatin1( node->type()->fullName() ) ); - for ( uint i = 0; i < node->parents().size(); ++i ) + e.setAttribute( "type", TQString::tqfromLatin1( node->type()->fullName() ) ); + for ( uint i = 0; i < node->tqparents().size(); ++i ) { - int parent = node->parents()[i] + 1; + int tqparent = node->tqparents()[i] + 1; TQDomElement arge = doc.createElement( "arg" ); - arge.appendChild( doc.createTextNode( TQString::number( parent ) ) ); + arge.appendChild( doc.createTextNode( TQString::number( tqparent ) ) ); e.appendChild( arge ); }; } @@ -450,9 +450,9 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons { const FetchPropertyNode* node = static_cast( mnodes[i] ); e.setAttribute( "action", "fetch-property" ); - e.setAttribute( "property", node->propinternalname() ); + e.setAttribute( TQString("property"), TQString(node->propinternalname()) ); TQDomElement arge = doc.createElement( "arg" ); - arge.appendChild( doc.createTextNode( TQString::number( node->parent() + 1 ) ) ); + arge.appendChild( doc.createTextNode( TQString::number( node->tqparent() + 1 ) ) ); e.appendChild( arge ); } else @@ -464,7 +464,7 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons e.setAttribute( "type", type ); }; - parent.appendChild( e ); + tqparent.appendChild( e ); }; } @@ -473,12 +473,12 @@ ObjectHierarchy::ObjectHierarchy() { } -ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& parent, TQString& error ) +ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& tqparent, TQString& error ) { #define KIG_GENERIC_PARSE_ERROR \ { \ error = i18n( "An error was encountered at line %1 in file %2." ) \ - .arg( __LINE__ ).arg( __FILE__ ); \ + .tqarg( __LINE__ ).tqarg( __FILE__ ); \ return 0; \ } @@ -486,7 +486,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& bool ok = true; TQString tmp; - TQDomElement e = parent.firstChild().toElement(); + TQDomElement e = tqparent.firstChild().toElement(); for (; !e.isNull(); e = e.nextSibling().toElement() ) { if ( e.tagName() != "input" ) break; @@ -537,18 +537,18 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& { // ApplyTypeNode TQCString typen = e.attribute( "type" ).latin1(); - const ObjectType* type = ObjectTypeFactory::instance()->find( typen ); + const ObjectType* type = ObjectTypeFactory::instance()->tqfind( typen ); if ( ! type ) { error = i18n( "This Kig file uses an object of type \"%1\", " "which this Kig version does not support." "Perhaps you have compiled Kig without support " "for this object type," - "or perhaps you are using an older Kig version." ).arg( typen ); + "or perhaps you are using an older Kig version." ).tqarg( TQString(typen) ); return 0; } - std::vector parents; + std::vector tqparents; for ( TQDomNode p = e.firstChild(); !p.isNull(); p = p.nextSibling() ) { TQDomElement q = p.toElement(); @@ -556,18 +556,18 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& if ( q.tagName() != "arg" ) KIG_GENERIC_PARSE_ERROR; int pid = q.text().toInt(&ok ); if ( !ok ) KIG_GENERIC_PARSE_ERROR; - parents.push_back( pid - 1 ); + tqparents.push_back( pid - 1 ); }; - newnode = new ApplyTypeNode( type, parents ); + newnode = new ApplyTypeNode( type, tqparents ); } else if ( tmp == "fetch-property" ) { // FetchPropertyNode TQCString propname = e.attribute( "property" ).latin1(); TQDomElement arge = e.firstChild().toElement(); - int parent = arge.text().toInt( &ok ); + int tqparent = arge.text().toInt( &ok ); if ( !ok ) KIG_GENERIC_PARSE_ERROR; - newnode = new FetchPropertyNode( parent - 1, propname ); + newnode = new FetchPropertyNode( tqparent - 1, propname ); } else { @@ -640,11 +640,11 @@ ObjectHierarchy ObjectHierarchy::transformFinalObject( const Transformation& t ) ObjectHierarchy ret( *this ); ret.mnodes.push_back( new PushStackNode( new TransformationImp( t ) ) ); - std::vector parents; - parents.push_back( ret.mnodes.size() - 1); - parents.push_back( ret.mnodes.size() ); + std::vector tqparents; + tqparents.push_back( ret.mnodes.size() - 1); + tqparents.push_back( ret.mnodes.size() ); const ObjectType* type = ApplyTransformationObjectType::instance(); - ret.mnodes.push_back( new ApplyTypeNode( type, parents ) ); + ret.mnodes.push_back( new ApplyTypeNode( type, tqparents ) ); return ret; } @@ -696,7 +696,7 @@ const ObjectImpType* lowermost( const ObjectImpType* a, const ObjectImpType* b ) // this function is part of the visit procedure really. It is // factored out, because it recurses for cache ObjectImp's. What this // does is, it makes sure that object o is calcable, by putting -// appropriate Node's in mnodes.. po is o->parents() and pl contains +// appropriate Node's in mnodes.. po is o->tqparents() and pl tqcontains // the location of objects that are already in mnodes and -1 // otherwise.. -1 means we have to store their ObjectImp, unless // they're cache ObjectImp's etc. @@ -723,12 +723,12 @@ int ObjectHierarchy::storeObject( const ObjectCalcer* o, const std::vectorparents()[i]; - std::vector opl = o->parents(); + ObjectCalcer* tqparent = o->tqparents()[i]; + std::vector opl = o->tqparents(); margrequirements[pl[i]] = lowermost( margrequirements[pl[i]], - o->impRequirement( parent, opl ) ); + o->impRequirement( tqparent, opl ) ); musetexts[pl[i]] = margrequirements[pl[i]]->selectStatement(); }; }; @@ -737,12 +737,12 @@ int ObjectHierarchy::storeObject( const ObjectCalcer* o, const std::vector( o ) ) { assert( pl.size() == 1 ); - int parent = pl.front(); + int tqparent = pl.front(); ObjectCalcer* op = po.front(); assert( op ); uint propid = static_cast( o )->propId(); assert( propid < op->imp()->propertiesInternalNames().size() ); - mnodes.push_back( new FetchPropertyNode( parent, op->imp()->propertiesInternalNames()[propid], propid ) ); + mnodes.push_back( new FetchPropertyNode( tqparent, op->imp()->propertiesInternalNames()[propid], propid ) ); } else assert( false ); diff --git a/kig/misc/object_hierarchy.h b/kig/misc/object_hierarchy.h index 60df8a59..cda2615f 100644 --- a/kig/misc/object_hierarchy.h +++ b/kig/misc/object_hierarchy.h @@ -73,22 +73,22 @@ public: std::vector calc( const Args& a, const KigDocument& doc ) const; /** - * saves the ObjectHierarchy data in children xml tags of \p parent .. + * saves the ObjectHierarchy data in tqchildren xml tags of \p tqparent .. */ - void serialize( TQDomElement& parent, TQDomDocument& doc ) const; + void serialize( TQDomElement& tqparent, TQDomDocument& doc ) const; /** - * Deserialize the ObjectHierarchy data from the xml element \p parent .. + * Deserialize the ObjectHierarchy data from the xml element \p tqparent .. * Since this operation can fail for some reasons, we provide it as a * static to return 0 in case of error. */ - static ObjectHierarchy* buildSafeObjectHierarchy( const TQDomElement& parent, TQString& error ); -// ObjectHierarchy( const TQDomElement& parent ); + static ObjectHierarchy* buildSafeObjectHierarchy( const TQDomElement& tqparent, TQString& error ); +// ObjectHierarchy( const TQDomElement& tqparent ); /** * build a set of objects that interdepend according to this * ObjectHierarchy.. Only the result objects are returned. Helper * objects that connect the given objects with the returned objects, - * can only be found by following the returned objects' parents() + * can only be found by following the returned objects' tqparents() * methods.. */ std::vector buildObjects( const std::vector& os, const KigDocument& ) const; diff --git a/kig/misc/rect.cc b/kig/misc/rect.cc index 183f50f8..652fae2d 100644 --- a/kig/misc/rect.cc +++ b/kig/misc/rect.cc @@ -153,9 +153,9 @@ void Rect::scale( const double r ) } -TQRect Rect::toQRect() const +TQRect Rect::toTQRect() const { - return TQRect(mBottomLeft.toQPoint(), topRight().toQPoint()); + return TQRect(mBottomLeft.toTQPoint(), topRight().toTQPoint()); } Coordinate Rect::bottomLeft() const @@ -211,7 +211,7 @@ double Rect::height() const return mheight; } -bool Rect::contains( const Coordinate& p, double allowed_miss ) const +bool Rect::tqcontains( const Coordinate& p, double allowed_miss ) const { return p.x - left() >= - allowed_miss && p.y - bottom() >= - allowed_miss && @@ -219,7 +219,7 @@ bool Rect::contains( const Coordinate& p, double allowed_miss ) const p.y - bottom() - height() <= allowed_miss; } -bool Rect::contains( const Coordinate& p ) const +bool Rect::tqcontains( const Coordinate& p ) const { return p.x >= left() && p.y >= bottom() && @@ -253,7 +253,7 @@ Rect Rect::normalized() const return t; } -Rect Rect::fromQRect( const TQRect& r ) +Rect Rect::fromTQRect( const TQRect& r ) { return Rect( r.left(), r.top(), r.right(), r.bottom() ); } diff --git a/kig/misc/rect.h b/kig/misc/rect.h index 1fe0b071..52958dd8 100644 --- a/kig/misc/rect.h +++ b/kig/misc/rect.h @@ -103,7 +103,7 @@ public: */ Rect matchShape( const Rect& rhs, bool shrink = false ) const; - TQRect toQRect() const; + TQRect toTQRect() const; Coordinate bottomLeft() const; Coordinate bottomRight() const; Coordinate topLeft() const; @@ -115,13 +115,13 @@ public: double top() const; double width() const; double height() const; - bool contains( const Coordinate& p ) const; - bool contains( const Coordinate& p, double allowed_miss ) const; + bool tqcontains( const Coordinate& p ) const; + bool tqcontains( const Coordinate& p, double allowed_miss ) const; bool intersects( const Rect& p ) const; Rect normalized() const; friend kdbgstream& operator<<( kdbgstream& s, const Rect& t ); - static Rect fromQRect( const TQRect& ); + static Rect fromTQRect( const TQRect& ); protected: Coordinate mBottomLeft; double mwidth; diff --git a/kig/misc/special_constructors.cc b/kig/misc/special_constructors.cc index d419a546..ccb92ac6 100644 --- a/kig/misc/special_constructors.cc +++ b/kig/misc/special_constructors.cc @@ -68,7 +68,7 @@ public: ConicConicIntersectionConstructor(); ~ConicConicIntersectionConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); @@ -109,13 +109,13 @@ ConicRadicalConstructor::~ConicRadicalConstructor() } void ConicRadicalConstructor::drawprelim( - const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, const KigDocument& doc ) const + const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& doc ) const { - if ( parents.size() == 2 && parents[0]->imp()->inherits( ConicImp::stype() ) && - parents[1]->imp()->inherits( ConicImp::stype() ) ) + if ( tqparents.size() == 2 && tqparents[0]->imp()->inherits( ConicImp::stype() ) && + tqparents[1]->imp()->inherits( ConicImp::stype() ) ) { Args args; - std::transform( parents.begin(), parents.end(), + std::transform( tqparents.begin(), tqparents.end(), std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); for ( int i = -1; i < 2; i += 2 ) { @@ -170,27 +170,27 @@ LocusConstructor::~LocusConstructor() { } -void LocusConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, +void LocusConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const { // this function is rather ugly, but it is necessary to do it this // way in order to play nice with Kig's design.. - if ( parents.size() != 2 ) return; - const ObjectTypeCalcer* constrained = dynamic_cast( parents.front() ); - const ObjectCalcer* moving = parents.back(); + if ( tqparents.size() != 2 ) return; + const ObjectTypeCalcer* constrained = dynamic_cast( tqparents.front() ); + const ObjectCalcer* moving = tqparents.back(); if ( ! constrained || ! constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ) { // moving is in fact the constrained point.. swap them.. - moving = parents.front(); - constrained = dynamic_cast( parents.back() ); + moving = tqparents.front(); + constrained = dynamic_cast( tqparents.back() ); assert( constrained ); }; assert( constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ); - const ObjectImp* oimp = constrained->parents().back()->imp(); + const ObjectImp* oimp = constrained->tqparents().back()->imp(); if( !oimp->inherits( CurveImp::stype() ) ) - oimp = constrained->parents().front()->imp(); + oimp = constrained->tqparents().front()->imp(); assert( oimp->inherits( CurveImp::stype() ) ); const CurveImp* cimp = static_cast( oimp ); @@ -210,30 +210,30 @@ const int LocusConstructor::wantArgs( if ( dynamic_cast( os.front() ) && static_cast( os.front() )->type()->inherits( ObjectType::ID_ConstrainedPointType ) ) { - std::set children = getAllChildren( os.front() ); - return children.find( os.back() ) != children.end() ? ret : ArgsParser::Invalid; + std::set tqchildren = getAllChildren( os.front() ); + return tqchildren.find( os.back() ) != tqchildren.end() ? ret : ArgsParser::Invalid; } if ( dynamic_cast( os.back() ) && static_cast( os.back() )->type()->inherits( ObjectType::ID_ConstrainedPointType ) ) { - std::set children = getAllChildren( os.back() ); - return children.find( os.front() ) != children.end() ? ret : ArgsParser::Invalid; + std::set tqchildren = getAllChildren( os.back() ); + return tqchildren.find( os.front() ) != tqchildren.end() ? ret : ArgsParser::Invalid; } return ArgsParser::Invalid; } -std::vector LocusConstructor::build( const std::vector& parents, KigDocument&, KigWidget& ) const +std::vector LocusConstructor::build( const std::vector& tqparents, KigDocument&, KigWidget& ) const { std::vector ret; - assert( parents.size() == 2 ); + assert( tqparents.size() == 2 ); - ObjectTypeCalcer* constrained = dynamic_cast( parents.front() ); - ObjectCalcer* moving = parents.back(); + ObjectTypeCalcer* constrained = dynamic_cast( tqparents.front() ); + ObjectCalcer* moving = tqparents.back(); if ( ! constrained || ! constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ) { // moving is in fact the constrained point.. swap them.. - moving = parents.front(); - constrained = dynamic_cast( parents.back() ); + moving = tqparents.front(); + constrained = dynamic_cast( tqparents.back() ); assert( constrained ); }; assert( constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ); @@ -350,12 +350,12 @@ void PolygonBNPTypeConstructor::handlePrelim( std::vector args = os; p.setBrushStyle( Qt::NoBrush ); - p.setBrushColor( Qt::red ); - p.setPen( TQPen ( Qt::red, 1) ); + p.setBrushColor( TQt::red ); + p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being // drawn.. - ObjectDrawer drawer( Qt::red ); + ObjectDrawer drawer( TQt::red ); drawprelim( drawer, p, args, d ); } @@ -374,21 +374,21 @@ TQString PolygonBNPTypeConstructor::selectStatement( return i18n("Select a point to be a vertex of the new polygon..."); } -void PolygonBNPTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, +void PolygonBNPTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const { - if ( parents.size() < 2 ) return; + if ( tqparents.size() < 2 ) return; std::vector points; - for ( uint i = 0; i < parents.size(); ++i ) + for ( uint i = 0; i < tqparents.size(); ++i ) { const Coordinate vertex = - static_cast( parents[i]->imp() )->coordinate(); + static_cast( tqparents[i]->imp() )->coordinate(); points.push_back( vertex ); } - if ( parents.size() == 2 ) + if ( tqparents.size() == 2 ) { SegmentImp segment = SegmentImp( points[0], points[1] ); drawer.draw( segment, p, true ); @@ -398,12 +398,12 @@ void PolygonBNPTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPaint } } -std::vector PolygonBNPTypeConstructor::build( const std::vector& parents, KigDocument&, KigWidget& ) const +std::vector PolygonBNPTypeConstructor::build( const std::vector& tqparents, KigDocument&, KigWidget& ) const { - uint count = parents.size() - 1; + uint count = tqparents.size() - 1; assert ( count >= 3 ); std::vector args; - for ( uint i = 0; i < count; ++i ) args.push_back( parents[i] ); + for ( uint i = 0; i < count; ++i ) args.push_back( tqparents[i] ); ObjectTypeCalcer* calcer = new ObjectTypeCalcer( mtype, args ); ObjectHolder* h = new ObjectHolder( calcer ); std::vector ret; @@ -443,12 +443,12 @@ PolygonVertexTypeConstructor::~PolygonVertexTypeConstructor() { } -void PolygonVertexTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, +void PolygonVertexTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const { - if ( parents.size() != 1 ) return; + if ( tqparents.size() != 1 ) return; - const PolygonImp* polygon = dynamic_cast( parents.front()->imp() ); + const PolygonImp* polygon = dynamic_cast( tqparents.front()->imp() ); const std::vector points = polygon->points(); int sides = points.size(); @@ -459,11 +459,11 @@ void PolygonVertexTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPa } } -std::vector PolygonVertexTypeConstructor::build( const std::vector& parents, KigDocument&, KigWidget& ) const +std::vector PolygonVertexTypeConstructor::build( const std::vector& tqparents, KigDocument&, KigWidget& ) const { std::vector ret; - assert( parents.size() == 1 ); - const PolygonImp* polygon = dynamic_cast( parents.front()->imp() ); + assert( tqparents.size() == 1 ); + const PolygonImp* polygon = dynamic_cast( tqparents.front()->imp() ); const std::vector points = polygon->points(); int sides = points.size(); @@ -471,7 +471,7 @@ std::vector PolygonVertexTypeConstructor::build( const std::vecto for ( int i = 0; i < sides; ++i ) { ObjectConstCalcer* d = new ObjectConstCalcer( new IntImp( i ) ); - std::vector args( parents ); + std::vector args( tqparents ); args.push_back( d ); ret.push_back( new ObjectHolder( new ObjectTypeCalcer( mtype, args ) ) ); } @@ -510,12 +510,12 @@ PolygonSideTypeConstructor::~PolygonSideTypeConstructor() { } -void PolygonSideTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, +void PolygonSideTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const { - if ( parents.size() != 1 ) return; + if ( tqparents.size() != 1 ) return; - const PolygonImp* polygon = dynamic_cast( parents.front()->imp() ); + const PolygonImp* polygon = dynamic_cast( tqparents.front()->imp() ); const std::vector points = polygon->points(); uint sides = points.size(); @@ -527,11 +527,11 @@ void PolygonSideTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPain } } -std::vector PolygonSideTypeConstructor::build( const std::vector& parents, KigDocument&, KigWidget& ) const +std::vector PolygonSideTypeConstructor::build( const std::vector& tqparents, KigDocument&, KigWidget& ) const { std::vector ret; - assert( parents.size() == 1 ); - const PolygonImp* polygon = dynamic_cast( parents.front()->imp() ); + assert( tqparents.size() == 1 ); + const PolygonImp* polygon = dynamic_cast( tqparents.front()->imp() ); const std::vector points = polygon->points(); uint sides = points.size(); @@ -539,7 +539,7 @@ std::vector PolygonSideTypeConstructor::build( const std::vector< for ( uint i = 0; i < sides; ++i ) { ObjectConstCalcer* d = new ObjectConstCalcer( new IntImp( i ) ); - std::vector args( parents ); + std::vector args( tqparents ); args.push_back( d ); ret.push_back( new ObjectHolder( new ObjectTypeCalcer( mtype, args ) ) ); } @@ -659,12 +659,12 @@ void PolygonBCVConstructor::handlePrelim( } p.setBrushStyle( Qt::NoBrush ); - p.setBrushColor( Qt::red ); - p.setPen( TQPen ( Qt::red, 1) ); + p.setBrushColor( TQt::red ); + p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being // drawn.. - ObjectDrawer drawer( Qt::red ); + ObjectDrawer drawer( TQt::red ); drawprelim( drawer, p, args, d ); if ( moreinfo ) { @@ -682,7 +682,7 @@ void PolygonBCVConstructor::handlePrelim( ptn = PointImp( where ); ptn.draw( p ); if ( i > 5 ) continue; - text = TextImp( TQString( "(%1)" ).arg(i), where, false ); + text = TextImp( TQString( "(%1)" ).tqarg(i), where, false ); text.draw( p ); } p.setStyle( Qt::DotLine ); @@ -700,17 +700,17 @@ void PolygonBCVConstructor::handlePrelim( delete_all( args.begin() + 2, args.end() ); } -std::vector PolygonBCVConstructor::build( const std::vector& parents, KigDocument&, KigWidget& ) const +std::vector PolygonBCVConstructor::build( const std::vector& tqparents, KigDocument&, KigWidget& ) const { - assert ( parents.size() == 3 ); + assert ( tqparents.size() == 3 ); std::vector args; - Coordinate c = static_cast( parents[0]->imp() )->coordinate(); - Coordinate v = static_cast( parents[1]->imp() )->coordinate(); - Coordinate cntrl = static_cast( parents[2]->imp() )->coordinate(); + Coordinate c = static_cast( tqparents[0]->imp() )->coordinate(); + Coordinate v = static_cast( tqparents[1]->imp() )->coordinate(); + Coordinate cntrl = static_cast( tqparents[2]->imp() )->coordinate(); - args.push_back( parents[0] ); - args.push_back( parents[1] ); + args.push_back( tqparents[0] ); + args.push_back( tqparents[1] ); int winding = 0; int nsides = computeNsides( c, v, cntrl, winding ); ObjectConstCalcer* d = new ObjectConstCalcer( new IntImp( nsides ) ); @@ -752,13 +752,13 @@ TQString PolygonBCVConstructor::useText( const ObjectCalcer&, const std::vector< { TQString result = TQString( i18n( "Adjust the number of sides (%1/%2)" ) - ).arg( nsides ).arg( winding ); + ).tqarg( nsides ).tqarg( winding ); return result; } else { TQString result = TQString( i18n( "Adjust the number of sides (%1)" ) - ).arg( nsides ); + ).tqarg( nsides ); return result; } break; @@ -789,20 +789,20 @@ TQString PolygonBCVConstructor::selectStatement( return ""; } -void PolygonBCVConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, +void PolygonBCVConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& doc ) const { - if ( parents.size() < 3 || parents.size() > 4 ) return; + if ( tqparents.size() < 3 || tqparents.size() > 4 ) return; - assert ( parents[0]->imp()->inherits( PointImp::stype() ) && - parents[1]->imp()->inherits( PointImp::stype() ) && - parents[2]->imp()->inherits( IntImp::stype() ) ); + assert ( tqparents[0]->imp()->inherits( PointImp::stype() ) && + tqparents[1]->imp()->inherits( PointImp::stype() ) && + tqparents[2]->imp()->inherits( IntImp::stype() ) ); - if ( parents.size() == 4 ) - assert ( parents[3]->imp()->inherits( IntImp::stype() ) ); + if ( tqparents.size() == 4 ) + assert ( tqparents[3]->imp()->inherits( IntImp::stype() ) ); Args args; - std::transform( parents.begin(), parents.end(), + std::transform( tqparents.begin(), tqparents.end(), std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); @@ -878,16 +878,16 @@ ConicConicIntersectionConstructor::~ConicConicIntersectionConstructor() { } -void ConicConicIntersectionConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, +void ConicConicIntersectionConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const { - if ( parents.size() != 2 ) return; - assert ( parents[0]->imp()->inherits( ConicImp::stype() ) && - parents[1]->imp()->inherits( ConicImp::stype() ) ); + if ( tqparents.size() != 2 ) return; + assert ( tqparents[0]->imp()->inherits( ConicImp::stype() ) && + tqparents[1]->imp()->inherits( ConicImp::stype() ) ); const ConicCartesianData conica = - static_cast( parents[0]->imp() )->cartesianData(); + static_cast( tqparents[0]->imp() )->cartesianData(); const ConicCartesianData conicb = - static_cast( parents[1]->imp() )->cartesianData(); + static_cast( tqparents[1]->imp() )->cartesianData(); bool ok = true; for ( int wr = -1; wr < 2; wr += 2 ) { @@ -1179,23 +1179,23 @@ void MeasureTransportConstructor::handlePrelim( ) const { p.setBrushStyle( Qt::NoBrush ); - p.setBrushColor( Qt::red ); - p.setPen( TQPen ( Qt::red, 1) ); + p.setBrushColor( TQt::red ); + p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being // drawn.. - ObjectDrawer drawer( Qt::red ); + ObjectDrawer drawer( TQt::red ); drawprelim( drawer, p, os, d ); } void MeasureTransportConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, - const std::vector& parents, + const std::vector& tqparents, const KigDocument& doc ) const { Args args; using namespace std; - transform( parents.begin(), parents.end(), + transform( tqparents.begin(), tqparents.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); @@ -1236,13 +1236,13 @@ TQString MeasureTransportConstructor::selectStatement( } std::vector MeasureTransportConstructor::build( - const std::vector& parents, + const std::vector& tqparents, KigDocument&, KigWidget& ) const { - assert ( parents.size() == 3 ); + assert ( tqparents.size() == 3 ); // std::vector args; -// for ( uint i = 0; i < count; ++i ) args.push_back( parents[i] ); - ObjectTypeCalcer* calcer = new ObjectTypeCalcer( mtype, parents ); +// for ( uint i = 0; i < count; ++i ) args.push_back( tqparents[i] ); + ObjectTypeCalcer* calcer = new ObjectTypeCalcer( mtype, tqparents ); ObjectHolder* h = new ObjectHolder( calcer ); std::vector ret; ret.push_back( h ); @@ -1362,7 +1362,7 @@ TQString GenericIntersectionConstructor::useText( break; } - return TQString::null; + return TQString(); } static const ArgsParser::spec argsspecMidPointOfTwoPoints[] = @@ -1386,15 +1386,15 @@ MidPointOfTwoPointsConstructor::~MidPointOfTwoPointsConstructor() } void MidPointOfTwoPointsConstructor::drawprelim( - const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, + const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const { - if ( parents.size() != 2 ) return; - assert( parents[0]->imp()->inherits( PointImp::stype() ) ); - assert( parents[1]->imp()->inherits( PointImp::stype() ) ); + if ( tqparents.size() != 2 ) return; + assert( tqparents[0]->imp()->inherits( PointImp::stype() ) ); + assert( tqparents[1]->imp()->inherits( PointImp::stype() ) ); const Coordinate m = - ( static_cast( parents[0]->imp() )->coordinate() + - static_cast( parents[1]->imp() )->coordinate() ) / 2; + ( static_cast( tqparents[0]->imp() )->coordinate() + + static_cast( tqparents[1]->imp() )->coordinate() ) / 2; drawer.draw( PointImp( m ), p, true ); } @@ -1403,7 +1403,7 @@ std::vector MidPointOfTwoPointsConstructor::build( { ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), os ); seg->calc( d ); - int index = seg->imp()->propertiesInternalNames().findIndex( "mid-point" ); + int index = seg->imp()->propertiesInternalNames().tqfindIndex( "mid-point" ); assert( index != -1 ); ObjectPropertyCalcer* prop = new ObjectPropertyCalcer( seg, index ); prop->calc( d ); @@ -1542,7 +1542,7 @@ TQString TangentConstructor::useText( else if ( o.imp()->inherits( PointImp::stype() ) ) return i18n( "Tangent at This Point" ); // else assert( false ); - return TQString::null; + return TQString(); } //TQString TangentConstructor::selectStatement( @@ -1604,7 +1604,7 @@ TQString CocConstructor::useText( return i18n( "Center of Curvature of This Curve" ); else if ( o.imp()->inherits( PointImp::stype() ) ) return i18n( "Center of Curvature at This Point" ); - return TQString::null; + return TQString(); } bool relativePrimes( int n, int p ) diff --git a/kig/misc/special_constructors.h b/kig/misc/special_constructors.h index 5b80693c..796c8cd0 100644 --- a/kig/misc/special_constructors.h +++ b/kig/misc/special_constructors.h @@ -29,7 +29,7 @@ public: PolygonVertexTypeConstructor(); ~PolygonVertexTypeConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -44,7 +44,7 @@ public: PolygonSideTypeConstructor(); ~PolygonSideTypeConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -83,7 +83,7 @@ public: const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -121,7 +121,7 @@ public: const KigDocument& d, const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -163,7 +163,7 @@ public: const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -179,7 +179,7 @@ public: ~ConicRadicalConstructor(); TQString useText( const ObjectCalcer& o, const std::vector& sel, const KigDocument& d, const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); @@ -205,7 +205,7 @@ public: TQString useText( const ObjectCalcer& o, const std::vector& sel, const KigDocument& d, const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); @@ -259,7 +259,7 @@ class MidPointOfTwoPointsConstructor public: MidPointOfTwoPointsConstructor(); ~MidPointOfTwoPointsConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; @@ -275,7 +275,7 @@ public: TestConstructor( const ArgsParserObjectType* type, const char* descname, const char* desc, const char* iconfile ); ~TestConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& parents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector& tqparents, const KigDocument& ) const; std::vector build( const std::vector& os, KigDocument& d, KigWidget& w ) const; diff --git a/kig/modes/base_mode.cc b/kig/modes/base_mode.cc index d968566b..e470f938 100644 --- a/kig/modes/base_mode.cc +++ b/kig/modes/base_mode.cc @@ -38,7 +38,7 @@ BaseMode::~BaseMode() void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) { // touch screens don't send a mouseMoved event before a click event, - // apparently, so we simulate it. + // aptqparently, so we simulate it. mouseMoved( e, v ); // get rid of text still showing... @@ -46,9 +46,9 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - moco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); + tqmoco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); - if( moco.empty() ) + if( tqmoco.empty() ) { // clicked on an empty spot --> we show the rectangle for // selecting stuff... @@ -66,8 +66,8 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) void BaseMode::leftMouseMoved( TQMouseEvent* e, KigWidget* w ) { - if( !moco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) - dragObject( moco, mplc, *w, + if( !tqmoco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) + dragObject( tqmoco, mplc, *w, ( e->state() & (ShiftButton | ControlButton ) ) != 0 ); } @@ -79,16 +79,16 @@ void BaseMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrl = ( e->state() & ControlButton ) != 0; bool keyShift = ( e->state() & ShiftButton ) != 0; - if ( ! moco.empty() ) + if ( ! tqmoco.empty() ) { if ( keyShift ) { - int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, moco ); + int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, tqmoco ); if ( id >= 0 ) - o = moco[id]; + o = tqmoco[id]; } else - o = moco.front(); + o = tqmoco.front(); } leftClickedObject( o, e->pos(), *v, keyCtrl ); } @@ -100,7 +100,7 @@ void BaseMode::midClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - moco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); + tqmoco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); } void BaseMode::midReleased( TQMouseEvent* e, KigWidget* v ) @@ -119,15 +119,15 @@ void BaseMode::rightClicked( TQMouseEvent* e, KigWidget* w ) w->setCursor( KCursor::arrowCursor() ); mplc = e->pos(); - moco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); + tqmoco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); - rightClicked( moco, mplc, *w ); + rightClicked( tqmoco, mplc, *w ); } void BaseMode::mouseMoved( TQMouseEvent* e, KigWidget* w ) { std::vector os = mdoc.document().whatAmIOn( w->fromScreen( e->pos() ), *w ); - mouseMoved( os, e->pos(), *w, e->state() & Qt::ShiftButton ); + mouseMoved( os, e->pos(), *w, e->state() & TQt::ShiftButton ); } void BaseMode::dragRect( const TQPoint&, KigWidget& ) @@ -151,7 +151,7 @@ void BaseMode::enableActions() std::vector BaseMode::oco() { - return moco; + return tqmoco; } TQPoint BaseMode::pointLocation() diff --git a/kig/modes/base_mode.h b/kig/modes/base_mode.h index cb029abf..044b8b65 100644 --- a/kig/modes/base_mode.h +++ b/kig/modes/base_mode.h @@ -31,7 +31,7 @@ class BaseMode : public KigMode { TQPoint mplc; - std::vector moco; + std::vector tqmoco; void leftClicked( TQMouseEvent* e, KigWidget* v ); void leftMouseMoved( TQMouseEvent*, KigWidget* ); diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc index b535ee5c..67f83632 100644 --- a/kig/modes/construct_mode.cc +++ b/kig/modes/construct_mode.cc @@ -69,20 +69,20 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrlOrShift = ( e->state() & ( ControlButton | ShiftButton) ) != 0; - std::vector moco = oco(); - if ( ! moco.empty() ) + std::vector tqmoco = oco(); + if ( ! tqmoco.empty() ) { std::vector goodargs; - if ( !moco.empty() ) + if ( !tqmoco.empty() ) { std::vector::const_iterator it; - std::vector testargs = getCalcers( mparents ); - for ( std::vector::const_iterator i = moco.begin(); i != moco.end(); ++i ) + std::vector testargs = getCalcers( mtqparents ); + for ( std::vector::const_iterator i = tqmoco.begin(); i != tqmoco.end(); ++i ) { - it = std::find( mparents.begin(), mparents.end(), *i ); + it = std::find( mtqparents.begin(), mtqparents.end(), *i ); bool newdup = - ( it == mparents.end() ) || - isAlreadySelectedOK( testargs, it - mparents.begin() ); + ( it == mtqparents.end() ) || + isAlreadySelectedOK( testargs, it - mtqparents.begin() ); if ( newdup ) { testargs.push_back( ( *i )->calcer() ); @@ -103,16 +103,16 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v ) void BaseConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p, KigWidget& w, bool ) { - std::vector::iterator it = std::find( mparents.begin(), mparents.end(), o ); - std::vector nargs = getCalcers( mparents ); + std::vector::iterator it = std::find( mtqparents.begin(), mtqparents.end(), o ); + std::vector nargs = getCalcers( mtqparents ); // // mp: duplicationchecked controls whether the arguments list is // free of duplications or if a duplication is safe (asking this to // the Constructor class through the "isAlreadySelectedOK" method). // bool duplicationchecked = - ( it == mparents.end() ) || - isAlreadySelectedOK( nargs, it - mparents.begin() ); + ( it == mtqparents.end() ) || + isAlreadySelectedOK( nargs, it - mtqparents.begin() ); if ( o && duplicationchecked ) { nargs.push_back( o->calcer() ); @@ -123,7 +123,7 @@ void BaseConstructMode::leftClickedObject( } } - nargs = getCalcers( mparents ); + nargs = getCalcers( mtqparents ); nargs.push_back( mpt.get() ); if ( wantArgs( nargs, mdoc.document(), w ) ) { @@ -137,7 +137,7 @@ void BaseConstructMode::leftClickedObject( return; } - nargs = getCalcers( mparents ); + nargs = getCalcers( mtqparents ); nargs.push_back( mcursor ); if ( wantArgs( nargs, mdoc.document(), w ) ) @@ -157,7 +157,7 @@ void BaseConstructMode::leftClickedObject( void BaseConstructMode::midClicked( const TQPoint& p, KigWidget& w ) { - std::vector args = getCalcers( mparents ); + std::vector args = getCalcers( mtqparents ); args.push_back( mpt.get() ); if ( wantArgs( args, mdoc.document(), w ) ) { @@ -179,10 +179,10 @@ void BaseConstructMode::rightClicked( const std::vector&, const T void BaseConstructMode::mouseMoved( const std::vector& os, const TQPoint& p, KigWidget& w, bool shiftpressed ) { - mdoc.emitStatusBarText( selectStatement( getCalcers( mparents ), w ) ); + mdoc.emitStatusBarText( selectStatement( getCalcers( mtqparents ), w ) ); w.updateCurPix(); - KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() ); + KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); Coordinate ncoord = w.fromScreen( p ); if ( shiftpressed ) @@ -192,19 +192,19 @@ void BaseConstructMode::mouseMoved( const std::vector& os, const mcursor->move( ncoord, mdoc.document() ); mcursor->calc( mdoc.document() ); - std::vector args = getCalcers( mparents ); + std::vector args = getCalcers( mtqparents ); bool duplicationchecked = false; std::vector goodargs; if ( ! os.empty() ) { std::vector::const_iterator it; - std::vector testargs = getCalcers( mparents ); + std::vector testargs = getCalcers( mtqparents ); for ( std::vector::const_iterator i = os.begin(); i != os.end(); ++i ) { - it = std::find( mparents.begin(), mparents.end(), *i ); + it = std::find( mtqparents.begin(), mtqparents.end(), *i ); bool newdup = - ( it == mparents.end() ) || - isAlreadySelectedOK( args, it - mparents.begin() ); + ( it == mtqparents.end() ) || + isAlreadySelectedOK( args, it - mtqparents.begin() ); if ( newdup ) { testargs.push_back( ( *i )->calcer() ); @@ -229,9 +229,9 @@ void BaseConstructMode::mouseMoved( const std::vector& os, const } else { - std::vector args = getCalcers( mparents ); + std::vector args = getCalcers( mtqparents ); args.push_back( mpt.get() ); - std::vector argscursor = getCalcers( mparents ); + std::vector argscursor = getCalcers( mtqparents ); argscursor.push_back( mcursor ); bool text = true; if ( wantArgs( args, mdoc.document(), w ) ) @@ -274,15 +274,15 @@ void BaseConstructMode::mouseMoved( const std::vector& os, const void BaseConstructMode::selectObject( ObjectHolder* o, KigWidget& w ) { - mparents.push_back( o ); - std::vector args = getCalcers( mparents ); + mtqparents.push_back( o ); + std::vector args = getCalcers( mtqparents ); if ( wantArgs( args, mdoc.document(), w ) == ArgsParser::Complete ) { handleArgs( args, w ); }; - w.redrawScreen( mparents ); + w.redrawScreen( mtqparents ); } PointConstructMode::PointConstructMode( KigPart& d ) @@ -308,7 +308,7 @@ void PointConstructMode::leftClickedObject( mdoc.addObject( new ObjectHolder( mpt.get() ) ); w.redrawScreen( std::vector() ); - mdoc.emitStatusBarText( TQString::null ); + mdoc.emitStatusBarText( TQString() ); mdoc.doneMode( this ); } @@ -330,7 +330,7 @@ void PointConstructMode::mouseMoved( bool shiftpressed ) { w.updateCurPix(); - KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() ); + KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); Coordinate ncoord = w.fromScreen( p ); if ( shiftpressed ) @@ -373,7 +373,7 @@ void BaseConstructMode::selectObjects( const std::vector& os, Kig { for ( std::vector::const_iterator i = os.begin(); i != os.end(); ++i ) { - std::vector args = getCalcers( mparents ); + std::vector args = getCalcers( mtqparents ); assert( wantArgs( args, mdoc.document(), w ) != ArgsParser::Complete ); selectObject( *i, w ); }; @@ -482,22 +482,22 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p, TQPoint qloc = p + TQPoint( -40, 0 ); Coordinate loc = w.fromScreen( qloc ); - std::vector 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::fromLatin1( "%1" ) ) ) ); + std::vector tqparents; + tqparents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) ); + tqparents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) ); + tqparents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) ); assert( mresult->imp()->inherits( TestResultImp::stype() ) ); - parents.push_back( + tqparents.push_back( new ObjectPropertyCalcer( - mresult.get(), mresult->imp()->propertiesInternalNames().findIndex( "test-result" ) ) ); - parents.back()->calc( mdoc.document() ); + mresult.get(), mresult->imp()->propertiesInternalNames().tqfindIndex( "test-result" ) ) ); + tqparents.back()->calc( mdoc.document() ); - ObjectCalcer* ret = new ObjectTypeCalcer( TextType::instance(), parents ); + ObjectCalcer* ret = new ObjectTypeCalcer( TextType::instance(), tqparents ); ret->calc( mdoc.document() ); mdoc.addObject( new ObjectHolder( ret ) ); w.unsetCursor(); - mdoc.emitStatusBarText( TQString::null ); + mdoc.emitStatusBarText( TQString() ); finish(); } @@ -529,7 +529,7 @@ void TestConstructMode::mouseMoved( const std::vector& os, const w.setCursor( KCursor::blankCursor() ); w.updateCurPix(); - KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() ); + KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); TQPoint qloc = p + TQPoint( -40, 0 ); Coordinate loc = w.fromScreen( qloc ); @@ -557,7 +557,7 @@ TQString TestConstructMode::selectStatement( const std::vector& s transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); std::string ret = mtype->argsParser().selectStatement( args ); - if ( ret.empty() ) return TQString::null; + if ( ret.empty() ) return TQString(); return i18n( ret.c_str() ); } diff --git a/kig/modes/construct_mode.h b/kig/modes/construct_mode.h index be937723..67fe5e28 100644 --- a/kig/modes/construct_mode.h +++ b/kig/modes/construct_mode.h @@ -71,7 +71,7 @@ class BaseConstructMode // only sensible place where to deallocate it is in the destructor // of this class // ObjectHolder* mcursorholder; - std::vector mparents; + std::vector mtqparents; void leftReleased( TQMouseEvent* e, KigWidget* v ); diff --git a/kig/modes/dragrectmode.cc b/kig/modes/dragrectmode.cc index 3a827009..8091f8cb 100644 --- a/kig/modes/dragrectmode.cc +++ b/kig/modes/dragrectmode.cc @@ -48,7 +48,7 @@ void DragRectMode::moved( const TQPoint& p, KigWidget& w ) std::vector overlay; if ( mstartselected ) { - KigPainter pt( w.screenInfo(), &w.curPix, mdoc.document() ); + KigPainter pt( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); pt.drawFilledRect( TQRect( p, mstart ) ); overlay = pt.overlay(); }; diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc index f4ed323e..e9776204 100644 --- a/kig/modes/edittype.cc +++ b/kig/modes/edittype.cc @@ -31,8 +31,8 @@ #include #include -EditType::EditType( TQWidget* parent, TQString name, TQString desc, TQString icon ) - : EditTypeBase( parent, "edittype", true ), mname( name ), mdesc( desc ), micon( icon ) +EditType::EditType( TQWidget* tqparent, TQString name, TQString desc, TQString icon ) + : EditTypeBase( tqparent, "edittype", true ), mname( name ), mdesc( desc ), micon( icon ) { // improving GUI look'n'feel... buttonHelp->setGuiItem( KStdGuiItem::help() ); @@ -50,8 +50,8 @@ EditType::~EditType() void EditType::helpSlot() { - kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ), - TQString::fromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ), + TQString::tqfromLatin1( "kig" ) ); } void EditType::okSlot() diff --git a/kig/modes/edittype.h b/kig/modes/edittype.h index c6f40783..ac578808 100644 --- a/kig/modes/edittype.h +++ b/kig/modes/edittype.h @@ -28,12 +28,13 @@ class EditType : public EditTypeBase { Q_OBJECT + TQ_OBJECT TQString mname; TQString mdesc; TQString micon; public: - EditType( TQWidget* parent, TQString name = TQString::null, TQString desc = TQString::null, TQString icon = TQString::null ); + EditType( TQWidget* tqparent, TQString name = TQString(), TQString desc = TQString(), TQString icon = TQString() ); ~EditType(); const TQString name() const; const TQString description() const; diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui index 0dc8129d..705bc92d 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -1,10 +1,10 @@ EditTypeBase - + EditTypeBase - + 0 0 @@ -33,7 +33,7 @@ 6 - + label15 @@ -41,23 +41,23 @@ Here you can modify the name, the description and the icon of this macro type. - + - layout8 + tqlayout8 unnamed - + - layout8 + tqlayout8 unnamed - + Layout2 @@ -71,7 +71,7 @@ 6 - + label16 @@ -89,7 +89,7 @@ - + Layout1 @@ -103,7 +103,7 @@ 6 - + label17 @@ -123,9 +123,9 @@ - + - layout23 + tqlayout23 @@ -152,7 +152,7 @@ Expanding - + 20 20 @@ -177,9 +177,9 @@ Horizontal - + - layout24 + tqlayout24 @@ -212,7 +212,7 @@ Expanding - + 20 20 @@ -270,12 +270,12 @@ cancelSlot() - + helpSlot() okSlot() cancelSlot() - - + + klineedit.h klineedit.h diff --git a/kig/modes/label.cc b/kig/modes/label.cc index 578e15dd..3471d6dc 100644 --- a/kig/modes/label.cc +++ b/kig/modes/label.cc @@ -55,8 +55,8 @@ public: TQPoint plc; // the currently selected coordinate Coordinate mcoord; - // the possible parent object that defines the location of the label.. - ObjectCalcer* locationparent; + // the possible tqparent object that defines the location of the label.. + ObjectCalcer* locationtqparent; // the text is only kept in the text input widget, not here // TQString mtext; @@ -64,8 +64,8 @@ public: // the property objects we'll be using as args, we keep a reference // to them in the args object, and keep a pointer to them ( or 0 ) // in the correct order in args ( separately, because we can't use - // the order of the parents of a ReferenceObject, and certainly - // can't give 0 as a parent.. + // the order of the tqparents of a ReferenceObject, and certainly + // can't give 0 as a tqparent.. argvect args; // if we're ReallySelectingArgs, then this var points to the arg @@ -90,7 +90,7 @@ TextLabelModeBase::~TextLabelModeBase() TextLabelModeBase::TextLabelModeBase( KigPart& doc ) : KigMode( doc ), d( new Private ) { - d->locationparent = 0; + d->locationtqparent = 0; d->lpc = 0; d->mwawd = SelectingLocation; d->wiz = new TextLabelWizard( doc.widget(), this ); @@ -212,7 +212,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w ) { std::vector os = mdoc.document().whatAmIOn( w->fromScreen( e->pos() ), *w ); bool attachable = false; - d->locationparent = 0; + d->locationtqparent = 0; for ( std::vector::iterator i = os.begin(); i != os.end(); ++i ) { if( (*i)->imp()->attachPoint().valid() || @@ -220,7 +220,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w ) (*i)->imp()->inherits( CurveImp::stype() ) ) { attachable = true; - d->locationparent = (*i)->calcer(); + d->locationtqparent = (*i)->calcer(); break; }; }; @@ -228,10 +228,10 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w ) if ( attachable ) { w->setCursor( KCursor::handCursor() ); - TQString s = d->locationparent->imp()->type()->attachToThisStatement(); + TQString s = d->locationtqparent->imp()->type()->attachToThisStatement(); mdoc.emitStatusBarText( s ); - KigPainter p( w->screenInfo(), &w->curPix, mdoc.document() ); + KigPainter p( w->screenInfo(), TQT_TQPAINTDEVICE(&w->curPix), mdoc.document() ); // set the text next to the arrow cursor TQPoint point = e->pos(); @@ -296,7 +296,7 @@ void TextLabelModeBase::finishPressed() "value for. Please remove them or select enough arguments." ) ); else { - finish( d->mcoord, s, d->args, needframe, d->locationparent ); + finish( d->mcoord, s, d->args, needframe, d->locationtqparent ); killMode(); }; } @@ -376,7 +376,7 @@ void TextLabelModeBase::updateLinksLabel() } else // otherwise, we show a stub... - linktext = i18n( "argument %1" ).arg( count + 1 ); + linktext = i18n( "argument %1" ).tqarg( count + 1 ); d->wiz->myCustomWidget1->addLink( linktext, buf ); // set pos and prevpos to the next char after the last match, so @@ -391,7 +391,7 @@ void TextLabelModeBase::updateLinksLabel() d->wiz->myCustomWidget1->addText( s.mid( prevpos ), buf ); d->wiz->myCustomWidget1->applyEdit( buf ); - d->wiz->relayoutArgsPage(); + d->wiz->retqlayoutArgsPage(); d->wiz->resize( d->wiz->size() ); } @@ -406,7 +406,7 @@ void TextLabelModeBase::linkClicked( int i ) d->mwawd = ReallySelectingArgs; d->mwaaws = i; - mdoc.emitStatusBarText( i18n( "Selecting argument %1" ).arg( i + 1 ) ); + mdoc.emitStatusBarText( i18n( "Selecting argument %1" ).tqarg( i + 1 ) ); } void TextLabelModeBase::redrawScreen( KigWidget* w ) @@ -452,7 +452,7 @@ TextLabelConstructionMode::~TextLabelConstructionMode() void TextLabelConstructionMode::finish( const Coordinate& coord, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationparent ) + ObjectCalcer* locationtqparent ) { std::vector args; for ( argvect::const_iterator i = props.begin(); @@ -460,8 +460,8 @@ void TextLabelConstructionMode::finish( args.push_back( i->get() ); ObjectHolder* label = 0; - if ( locationparent ) - label = ObjectFactory::instance()->attachedLabel( s, locationparent, coord, needframe, args, mdoc.document() ); + if ( locationtqparent ) + label = ObjectFactory::instance()->attachedLabel( s, locationtqparent, coord, needframe, args, mdoc.document() ); else label = ObjectFactory::instance()->label( s, coord, needframe, args, mdoc.document() ); mdoc.addObject( label ); @@ -471,10 +471,10 @@ TextLabelRedefineMode::TextLabelRedefineMode( KigPart& d, ObjectTypeCalcer* labe : TextLabelModeBase( d ), mlabel( label ) { assert( label->imp()->inherits( TextImp::stype() ) ); - std::vector parents = label->parents(); - assert( parents.size() >= 3 ); - std::vector firstthree( parents.begin(), parents.begin() + 3 ); - std::vector rest( parents.begin() + 3, parents.end() ); + std::vector tqparents = label->tqparents(); + assert( tqparents.size() >= 3 ); + std::vector firstthree( tqparents.begin(), tqparents.begin() + 3 ); + std::vector rest( tqparents.begin() + 3, tqparents.end() ); firstthree = TextType::instance()->argParser().parse( firstthree ); assert( firstthree[0]->imp()->inherits( IntImp::stype() ) ); @@ -507,12 +507,12 @@ TextLabelRedefineMode::~TextLabelRedefineMode() void TextLabelRedefineMode::finish( const Coordinate& coord, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationparent ) + ObjectCalcer* locationtqparent ) { - std::vector parents = mlabel->parents(); - assert( parents.size() >= 3 ); - std::vector firstthree( parents.begin(), parents.begin() + 3 ); - std::vector rest( parents.begin() + 3, parents.end() ); + std::vector tqparents = mlabel->tqparents(); + assert( tqparents.size() >= 3 ); + std::vector firstthree( tqparents.begin(), tqparents.begin() + 3 ); + std::vector rest( tqparents.begin() + 3, tqparents.end() ); firstthree = TextType::instance()->argParser().parse( firstthree ); KigCommand* kc = new KigCommand( mdoc, i18n( "Change Label" ) ); @@ -538,7 +538,7 @@ void TextLabelRedefineMode::finish( static_cast( firstthree[2] )->setImp( new StringImp( s ) ); mon.finish( kc ); - std::vector oldparents = mlabel->parents(); + std::vector oldtqparents = mlabel->tqparents(); std::vector p; for ( argvect::const_iterator i = props.begin(); i != props.end(); ++i ) @@ -552,19 +552,19 @@ void TextLabelRedefineMode::finish( * take advantage of the method "getAttachPoint" that should * do all the work; it is also used when creating a new label */ - np[1] = ObjectFactory::instance()->getAttachPoint( locationparent, coord, mdoc.document() ); + np[1] = ObjectFactory::instance()->getAttachPoint( locationtqparent, coord, mdoc.document() ); /* this is the old code, just in case... */ -// if ( locationparent && locationparent->imp()->inherits( CurveImp::stype() ) ) +// if ( locationtqparent && locationtqparent->imp()->inherits( CurveImp::stype() ) ) // { -// double param = static_cast( locationparent->imp() )->getParam( coord, mdoc.document() ); -// np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationparent, param ); +// double param = static_cast( locationtqparent->imp() )->getParam( coord, mdoc.document() ); +// np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationtqparent, param ); // np[1]->calc( mdoc.document() ); // } -// else if ( locationparent ) +// else if ( locationtqparent ) // { -// assert( locationparent->imp()->inherits( PointImp::stype() ) ); -// np[1] = locationparent; +// assert( locationtqparent->imp()->inherits( PointImp::stype() ) ); +// np[1] = locationtqparent; // } // else // np[1] = new ObjectConstCalcer( new PointImp( coord ) ); @@ -585,5 +585,5 @@ void TextLabelModeBase::setFrame( bool f ) void TextLabelModeBase::setLocationParent( ObjectCalcer* o ) { - d->locationparent = o; + d->locationtqparent = o; } diff --git a/kig/modes/label.h b/kig/modes/label.h index 828c2e29..7d8f842a 100644 --- a/kig/modes/label.h +++ b/kig/modes/label.h @@ -35,7 +35,7 @@ class ObjectCalcer; /** * this is the base class for TextLabelConstructionMode and * TextLabelRedefineMode.. most of the work is done in this class, - * with some specific things delegated to the children.. Template + * with some specific things delegated to the tqchildren.. Template * method pattern, right ? :) */ class TextLabelModeBase @@ -65,14 +65,14 @@ protected: void setLocationParent( ObjectCalcer* o ); /** * objects you pass here, should be newly created property objects, - * that have no children.. + * that have no tqchildren.. */ void setPropertyObjects( const argvect& props ); void setFrame( bool f ); virtual void finish( const Coordinate& c, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationparent ) = 0; + ObjectCalcer* locationtqparent ) = 0; private: // the KigMode interface.. @@ -111,7 +111,7 @@ public: void finish( const Coordinate& coord, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationparent ); + ObjectCalcer* locationtqparent ); }; class TextLabelRedefineMode @@ -120,7 +120,7 @@ class TextLabelRedefineMode ObjectTypeCalcer* mlabel; void finish( const Coordinate& coord, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationparent ); + ObjectCalcer* locationtqparent ); public: TextLabelRedefineMode( KigPart& d, ObjectTypeCalcer* label ); ~TextLabelRedefineMode(); diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp index 96a73a8f..8d711d65 100644 --- a/kig/modes/linkslabel.cpp +++ b/kig/modes/linkslabel.cpp @@ -33,31 +33,31 @@ using namespace std; class LinksLabel::Private { public: - TQHBoxLayout* layout; + TQHBoxLayout* tqlayout; std::vector labels; std::vector urllabels; }; -LinksLabel::LinksLabel( TQWidget* parent, const char* name ) - : TQWidget( parent, name ) +LinksLabel::LinksLabel( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { p = new Private; - p->layout = new TQHBoxLayout( this ); + p->tqlayout = new TQHBoxLayout( this ); TQLabel* l = new TQLabel( TQString::fromUtf8( "Dit is een " ), this ); p->labels.push_back( l ); - p->layout->addWidget( l ); + p->tqlayout->addWidget( l ); KURLLabel* u = new KURLLabel( TQString::fromUtf8( "http://www.kde.org/" ), TQString::fromUtf8( "url"), this ); p->urllabels.push_back( u ); - p->layout->addWidget( u ); + p->tqlayout->addWidget( u ); l = new TQLabel( TQString::fromUtf8( " !" ), this ); p->labels.push_back( l ); - p->layout->addWidget(l ); + p->tqlayout->addWidget(l ); - p->layout->activate(); + p->tqlayout->activate(); } LinksLabel::~LinksLabel() @@ -67,8 +67,8 @@ LinksLabel::~LinksLabel() void LinksLabel::urlClicked() { - const TQObject* o = sender(); - std::vector::iterator i = std::find( p->urllabels.begin(), p->urllabels.end(), static_cast( o ) ); + const TQObject* o = TQT_TQOBJECT_CONST(const_cast(sender())); + std::vector::iterator i = std::find( p->urllabels.begin(), p->urllabels.end(), static_cast(TQT_TQWIDGET_CONST( o )) ); assert( i != p->urllabels.end() ); emit linkClicked( i - p->urllabels.begin() ); } @@ -89,7 +89,7 @@ void LinksLabel::addLink( const TQString& s, LinksLabelEditBuf& buf ) } namespace { - void deleteObj( TQObject* o ) { delete o; } + void deleteObj( TQWidget* o ) { delete o; } } void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) @@ -99,8 +99,8 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) p->urllabels.clear(); p->labels.clear(); - delete p->layout; - p->layout = new TQHBoxLayout( this ); + delete p->tqlayout; + p->tqlayout = new TQHBoxLayout( this ); for ( LinksLabelEditBuf::vec::iterator i = buf.data.begin(); i != buf.data.end(); ++i ) { @@ -111,7 +111,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) KURLLabel* l = new KURLLabel( TQString::fromUtf8( "http://edu.kde.org/kig" ), i->second, this ); p->urllabels.push_back( l ); - p->layout->addWidget( l ); + p->tqlayout->addWidget( l ); connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) ); } else @@ -119,15 +119,15 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) // we need a normal label... TQLabel* l = new TQLabel( i->second, this ); p->labels.push_back( l ); - p->layout->addWidget( l ); + p->tqlayout->addWidget( l ); }; }; TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - p->layout->addItem( spacer ); + p->tqlayout->addItem( spacer ); - p->layout->activate(); + p->tqlayout->activate(); std::for_each( p->urllabels.begin(), p->urllabels.end(), mem_fun( &TQWidget::show ) ); std::for_each( p->labels.begin(), p->labels.end(), mem_fun( &TQWidget::show ) ); diff --git a/kig/modes/linkslabel.h b/kig/modes/linkslabel.h index 89d1c76e..8ed8b04a 100644 --- a/kig/modes/linkslabel.h +++ b/kig/modes/linkslabel.h @@ -27,12 +27,13 @@ * this widget shows a line of text, with some links underlined, and * emits a signal if one of the links is clicked... */ -class LinksLabel : public QWidget +class LinksLabel : public TQWidget { Q_OBJECT + TQ_OBJECT public: - LinksLabel( TQWidget* parent = 0, const char* name = 0 ); + LinksLabel( TQWidget* tqparent = 0, const char* name = 0 ); ~LinksLabel(); class LinksLabelEditBuf diff --git a/kig/modes/macro.cc b/kig/modes/macro.cc index bc6f5dc5..ba6f98ab 100644 --- a/kig/modes/macro.cc +++ b/kig/modes/macro.cc @@ -167,7 +167,7 @@ void DefineMacroMode::dragRect( const TQPoint& p, KigWidget& w ) std::vector* objs = mwizard->currentPage() == mwizard->mpgiven ? &mgiven : &mfinal; DragRectMode dm( p, mdoc, w ); mdoc.runMode( &dm ); - KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); + KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); if ( ! dm.cancelled() ) { std::vector ret = dm.ret(); @@ -196,7 +196,7 @@ void DefineMacroMode::leftClickedObject( ObjectHolder* o, const TQPoint&, if ( isselected ) objs->erase( iter ); else objs->push_back( o ); - KigPainter p( w.screenInfo(), &w.stillPix, mdoc.document() ); + KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); p.drawObject( o, !isselected ); w.updateCurPix( p.overlay() ); w.updateWidget(); @@ -224,7 +224,7 @@ void DefineMacroMode::mouseMoved( const std::vector& os, const TQ // statusbar text mdoc.emitStatusBarText( selectstat ); - KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() ); + KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); // set the text next to the arrow cursor TQPoint point = pt; diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cc index 662e3a0d..4a240b74 100644 --- a/kig/modes/macrowizard.cc +++ b/kig/modes/macrowizard.cc @@ -24,8 +24,8 @@ #include #include -MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m ) - : MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m ) +MacroWizard::MacroWizard( TQWidget* tqparent, DefineMacroMode* m ) + : MacroWizardBase( tqparent, "Define Macro Wizard", false ), mmode( m ) { connect( KLineEdit2, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( nameTextChanged( const TQString& ) ) ); @@ -85,6 +85,6 @@ void MacroWizard::accept() void MacroWizard::slotHelpClicked() { - kapp->invokeHelp( TQString::fromLatin1( "defining-macros"), - TQString::fromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::tqfromLatin1( "defining-macros"), + TQString::tqfromLatin1( "kig" ) ); } diff --git a/kig/modes/macrowizard.h b/kig/modes/macrowizard.h index 96318ec9..b3b59c66 100644 --- a/kig/modes/macrowizard.h +++ b/kig/modes/macrowizard.h @@ -25,8 +25,9 @@ class DefineMacroMode; class MacroWizard : public MacroWizardBase { Q_OBJECT + TQ_OBJECT public: - MacroWizard( TQWidget* parent, DefineMacroMode* m ); + MacroWizard( TQWidget* tqparent, DefineMacroMode* m ); ~MacroWizard(); void back(); diff --git a/kig/modes/macrowizardbase.ui b/kig/modes/macrowizardbase.ui index d3929ad8..db62a8b1 100644 --- a/kig/modes/macrowizardbase.ui +++ b/kig/modes/macrowizardbase.ui @@ -1,10 +1,10 @@ MacroWizardBase - + MacroWizardBase - + 4 0 @@ -23,7 +23,7 @@ Define New Macro - + mpgiven @@ -40,7 +40,7 @@ 6 - + TextLabel1 @@ -55,13 +55,13 @@ Select the "given" objects for your new macro and press "Next". - + WordBreak|AlignVCenter - + mpfinal @@ -78,7 +78,7 @@ 6 - + TextLabel2 @@ -88,7 +88,7 @@ - + mpname @@ -105,7 +105,7 @@ 6 - + TextLabel1_2 @@ -113,7 +113,7 @@ Enter a name and description for your new type. - + Layout2 @@ -127,7 +127,7 @@ 6 - + TextLabel2_2 @@ -145,7 +145,7 @@ - + Layout1 @@ -159,7 +159,7 @@ 6 - + TextLabel2_2_2 @@ -180,7 +180,7 @@ - + klineedit.h klineedit.h diff --git a/kig/modes/mode.h b/kig/modes/mode.h index 18425d2d..e9fdd9ea 100644 --- a/kig/modes/mode.h +++ b/kig/modes/mode.h @@ -34,7 +34,7 @@ class StdConstructionMode; * document... It tells us how to respond to a certain event. */ class KigMode - : public Qt + : public TQt { public: virtual ~KigMode(); diff --git a/kig/modes/moving.cc b/kig/modes/moving.cc index 533b15d4..980a5feb 100644 --- a/kig/modes/moving.cc +++ b/kig/modes/moving.cc @@ -55,13 +55,13 @@ void MovingModeBase::initScreen( const std::vector& in ) std::inserter( notmovingobjs, notmovingobjs.begin() ) ); mview.clearStillPix(); - KigPainter p( mview.screenInfo(), &mview.stillPix, mdoc.document() ); + KigPainter p( mview.screenInfo(), TQT_TQPAINTDEVICE(&mview.stillPix), mdoc.document() ); p.drawGrid( mdoc.document().coordinateSystem(), mdoc.document().grid(), mdoc.document().axes() ); p.drawObjects( notmovingobjs.begin(), notmovingobjs.end(), false ); mview.updateCurPix(); - KigPainter p2( mview.screenInfo(), &mview.curPix, mdoc.document() ); + KigPainter p2( mview.screenInfo(), TQT_TQPAINTDEVICE(&mview.curPix), mdoc.document() ); p2.drawObjects( drawableset.begin(), drawableset.end(), true ); } @@ -86,12 +86,12 @@ void MovingModeBase::mouseMoved( TQMouseEvent* e, KigWidget* v ) v->updateCurPix(); Coordinate c = v->fromScreen( e->pos() ); - bool snaptogrid = e->state() & Qt::ShiftButton; + bool snaptogrid = e->state() & TQt::ShiftButton; moveTo( c, snaptogrid ); for ( std::vector::iterator i = mcalcable.begin(); i != mcalcable.end(); ++i ) ( *i )->calc( mdoc.document() ); - KigPainter p( v->screenInfo(), &v->curPix, mdoc.document() ); + KigPainter p( v->screenInfo(), TQT_TQPAINTDEVICE(&v->curPix), mdoc.document() ); // TODO: only draw the explicitly moving objects as selected, the // other ones as deselected.. Needs some support from the // subclasses.. @@ -129,8 +129,8 @@ MovingMode::MovingMode( const std::vector& os, const Coordinate& emo.push_back( ( *i )->calcer() ); d->refmap[( *i )->calcer()] = (*i)->moveReferencePoint(); objs.insert( ( *i )->calcer() ); - std::vector parents = ( *i )->calcer()->movableParents(); - objs.insert( parents.begin(), parents.end() ); + std::vector tqparents = ( *i )->calcer()->movableParents(); + objs.insert( tqparents.begin(), tqparents.end() ); }; emo = calcPath( emo ); @@ -143,8 +143,8 @@ MovingMode::MovingMode( const std::vector& os, const Coordinate& std::set tmp = objs; for ( std::set::const_iterator i = tmp.begin(); i != tmp.end(); ++i ) { - std::set children = getAllChildren(*i); - objs.insert( children.begin(), children.end() ); + std::set tqchildren = getAllChildren(*i); + objs.insert( tqchildren.begin(), tqchildren.end() ); } initScreen( calcPath( std::vector( objs.begin(), objs.end() ) ) ); @@ -154,7 +154,7 @@ void MovingMode::stopMove() { TQString text = d->emo.size() == 1 ? d->emo[0]->imp()->type()->moveAStatement() : - i18n( "Move %1 Objects" ).arg( d->emo.size() ); + i18n( "Move %1 Objects" ).tqarg( d->emo.size() ); KigCommand* mc = new KigCommand( mdoc, text ); d->mon->finish( mc ); mdoc.history()->addCommand( mc ); @@ -164,7 +164,7 @@ void MovingMode::moveTo( const Coordinate& o, bool snaptogrid ) { for( std::vector::iterator i = d->emo.begin(); i != d->emo.end(); ++i ) { - assert( d->refmap.find( *i ) != d->refmap.end() ); + assert( d->refmap.tqfind( *i ) != d->refmap.end() ); Coordinate nc = d->refmap[*i] + ( o - d->pwwsm ); if ( snaptogrid ) nc = mdoc.document().coordinateSystem().snapToGrid( nc, mview ); (*i)->move( nc, mdoc.document() ); @@ -176,14 +176,14 @@ PointRedefineMode::PointRedefineMode( ObjectHolder* p, KigPart& d, KigWidget& v { assert( dynamic_cast( p->calcer() ) ); moldtype = static_cast( p->calcer() )->type(); - std::vector oldparents = p->calcer()->parents(); - std::copy( oldparents.begin(), oldparents.end(), std::back_inserter( moldparents ) ); - - std::vector parents = getAllParents( mp->calcer() ); - mmon = new MonitorDataObjects( parents ); - std::vector moving = parents; - std::set children = getAllChildren( mp->calcer() ); - std::copy( children.begin(), children.end(), std::back_inserter( moving ) ); + std::vector oldtqparents = p->calcer()->tqparents(); + std::copy( oldtqparents.begin(), oldtqparents.end(), std::back_inserter( moldtqparents ) ); + + std::vector tqparents = getAllParents( mp->calcer() ); + mmon = new MonitorDataObjects( tqparents ); + std::vector moving = tqparents; + std::set tqchildren = getAllChildren( mp->calcer() ); + std::copy( tqchildren.begin(), tqchildren.end(), std::back_inserter( moving ) ); initScreen( moving ); } @@ -224,22 +224,22 @@ void PointRedefineMode::stopMove() assert( dynamic_cast( mp->calcer() ) ); ObjectTypeCalcer* mpcalc = static_cast( mp->calcer() ); - std::vector newparents = mpcalc->parents(); - std::vector newparentsref( - newparents.begin(), newparents.end() ); + std::vector newtqparents = mpcalc->tqparents(); + std::vector newtqparentsref( + newtqparents.begin(), newtqparents.end() ); const ObjectType* newtype = mpcalc->type(); - std::vector oldparents; - for( std::vector::iterator i = moldparents.begin(); - i != moldparents.end(); ++i ) - oldparents.push_back( i->get() ); + std::vector oldtqparents; + for( std::vector::iterator i = moldtqparents.begin(); + i != moldtqparents.end(); ++i ) + oldtqparents.push_back( i->get() ); mpcalc->setType( moldtype ); - mpcalc->setParents( oldparents ); + mpcalc->setParents( oldtqparents ); mp->calc( mdoc.document() ); KigCommand* command = new KigCommand( mdoc, i18n( "Redefine Point" ) ); command->addTask( - new ChangeParentsAndTypeTask( mpcalc, newparents, newtype ) ); + new ChangeParentsAndTypeTask( mpcalc, newtqparents, newtype ) ); mmon->finish( command ); mdoc.history()->addCommand( command ); } diff --git a/kig/modes/moving.h b/kig/modes/moving.h index 7c27aa4e..8a75e62a 100644 --- a/kig/modes/moving.h +++ b/kig/modes/moving.h @@ -88,7 +88,7 @@ class PointRedefineMode : public MovingModeBase { ObjectHolder* mp; - std::vector moldparents; + std::vector moldtqparents; const ObjectType* moldtype; MonitorDataObjects* mmon; void stopMove(); diff --git a/kig/modes/normal.cc b/kig/modes/normal.cc index 1fa45d00..c4dd7f4f 100644 --- a/kig/modes/normal.cc +++ b/kig/modes/normal.cc @@ -133,7 +133,7 @@ void NormalMode::dragRect( const TQPoint& p, KigWidget& w ) DragRectMode d( p, mdoc, w ); mdoc.runMode( &d ); - KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); + KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); if ( ! d.cancelled() ) { @@ -174,7 +174,7 @@ void NormalMode::dragObject( const std::vector& oco, const TQPoin void NormalMode::leftClickedObject( ObjectHolder* o, const TQPoint&, KigWidget& w, bool ctrlOrShiftDown ) { - KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); + KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); if ( ! o ) { @@ -269,7 +269,7 @@ void NormalMode::mouseMoved( const std::vector& os, // statusbar text mdoc.emitStatusBarText( stat ); - KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() ); + KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); // set the text next to the arrow cursor TQPoint point = plc; diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc index 489b4985..8a3d05e1 100644 --- a/kig/modes/popup.cc +++ b/kig/modes/popup.cc @@ -198,12 +198,12 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, else if ( single ) { if ( !objs[0]->name().isNull() ) - title = TQString::fromLatin1( "%1 %2" ).arg( objs[0]->imp()->type()->translatedName() ).arg( objs[0]->name() ); + title = TQString::tqfromLatin1( "%1 %2" ).tqarg( objs[0]->imp()->type()->translatedName() ).tqarg( objs[0]->name() ); else title = objs[0]->imp()->type()->translatedName(); } else - title = i18n( "%1 Objects" ).arg( objs.size() ); + title = i18n( "%1 Objects" ).tqarg( objs.size() ); insertTitle( title, 1 ); if ( !empty ) @@ -281,22 +281,22 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, i18n( "Set Co&lor" ), i18n( "Set &Pen Width" ), i18n( "Set St&yle" ), - TQString::null, + TQString(), i18n( "Set Coordinate S&ystem" ) }; static const TQString menuicons[NumberOfMenus] = { "centralsymmetry", "test", - TQString::null, + TQString(), "launch", "kig_text", "color_fill", // "colorize", "sizer", "paintbrush", - TQString::null, - TQString::null + TQString(), + TQString() }; int index = 1; for ( int i = 0; i < NumberOfMenus; ++i ) @@ -360,14 +360,14 @@ NormalModePopupObjects::~NormalModePopupObjects() static const TQColor* colors[] = { - &Qt::blue, - &Qt::black, - &Qt::gray, - &Qt::red, - &Qt::green, - &Qt::cyan, - &Qt::yellow, - &Qt::darkRed + &TQt::blue, + &TQt::black, + &TQt::gray, + &TQt::red, + &TQt::green, + &TQt::cyan, + &TQt::yellow, + &TQt::darkRed }; static const int numberofcolors = sizeof( colors ) / sizeof( TQColor* ); @@ -424,14 +424,14 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in point = false; if ( (*i)->drawer()->color() != color ) samecolor = false; }; - if ( ! samecolor ) color = Qt::blue; + if ( ! samecolor ) color = TQt::blue; TQPixmap p( point ? 20 : 50, 20 ); for ( int i = 1; i < 8; ++i ) { p.fill( popup.eraseColor() ); TQPainter ptr( &p ); ptr.setPen( TQPen( color, 1 ) ); - ptr.setBrush( TQBrush( color, Qt::SolidPattern ) ); + ptr.setBrush( TQBrush( color, TQt::SolidPattern ) ); if ( point ) { int size = 2*i; @@ -463,14 +463,14 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in if ( (*i)->drawer()->color() != color ) samecolor = false; }; bool point = ( npoints > nothers ); - if ( ! samecolor ) color = Qt::blue; + if ( ! samecolor ) color = TQt::blue; if ( point ) for ( int i = 0; i < 5; ++i ) { TQPixmap p( 20, 20 ); p.fill( popup.eraseColor() ); ScreenInfo si( Rect( -1, -1, 2, 2 ), p.rect() ); - KigPainter ptr( si, &p, popup.part().document(), false ); + KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); PointImp pt( Coordinate( 0, 0 ) ); ObjectDrawer d( color, -1, true, Qt::SolidLine, i ); d.draw( pt, ptr, false ); @@ -484,7 +484,7 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in TQPixmap p( 50, 20 ); p.fill( popup.eraseColor() ); ScreenInfo si( Rect( -2.5, -1, 5, 2 ), p.rect() ); - KigPainter ptr( si, &p, popup.part().document(), false ); + KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); LineImp line( Coordinate( -1, 0 ), Coordinate( 1, 0 ) ); Qt::PenStyle ps = penstyles[i]; ObjectDrawer d( color, -1, true, ps, 1 ); @@ -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::fromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() ); + TQString::tqfromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() ); doc.addObject( label ); } @@ -871,7 +871,7 @@ void PropertiesActionsProvider::fillUpMenu( NormalModePopupObjects& popup, add &= ! prop->inherits( BogusImp::stype() ); // we don't want to construct PointImp's coordinate property, // since it would construct a point at the same place as its - // parent.. + // tqparent.. add &= ! ( o->imp()->inherits( PointImp::stype() ) && prop->inherits( PointImp::stype() ) ); } @@ -909,11 +909,11 @@ bool PropertiesActionsProvider::executeAction( } int propid = mprops[menu-1][id]; assert( os.size() == 1 ); - ObjectHolder* parent = os[0]; + ObjectHolder* tqparent = os[0]; if ( menu == NormalModePopupObjects::ShowMenu ) { std::vector args; - args.push_back( new ObjectPropertyCalcer( parent->calcer(), propid ) ); + args.push_back( new ObjectPropertyCalcer( tqparent->calcer(), propid ) ); args.back()->calc( doc.document() ); // TODO: recover the cursor position somehow... the following does not work // in general... @@ -924,14 +924,14 @@ bool PropertiesActionsProvider::executeAction( // /////// Coordinate c = Coordinate::invalidCoord(); Coordinate c = w.fromScreen( popup.plc() ); ObjectHolder* label = ObjectFactory::instance()->attachedLabel( - TQString::fromLatin1( "%1" ), parent->calcer(), c, + TQString::tqfromLatin1( "%1" ), tqparent->calcer(), c, false, args, doc.document() ); doc.addObject( label ); } else { ObjectHolder* h = new ObjectHolder( - new ObjectPropertyCalcer( parent->calcer(), propid ) ); + new ObjectPropertyCalcer( tqparent->calcer(), propid ) ); h->calc( doc.document() ); doc.addObject( h ); }; @@ -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::fromLatin1( "%1 %2" ).arg( mobjs[i]->imp()->type()->translatedName() ).arg( mobjs[i]->name() ) + ? TQString::tqfromLatin1( "%1 %2" ).tqarg( mobjs[i]->imp()->type()->translatedName() ).tqarg( mobjs[i]->name() ) : mobjs[i]->imp()->type()->translatedName(), i ); } diff --git a/kig/modes/popup.h b/kig/modes/popup.h index 76574b74..4db6838f 100644 --- a/kig/modes/popup.h +++ b/kig/modes/popup.h @@ -47,6 +47,7 @@ class NormalModePopupObjects : public KPopupMenu { Q_OBJECT + TQ_OBJECT public: NormalModePopupObjects( KigPart& part, KigWidget& view, @@ -117,6 +118,7 @@ class ObjectChooserPopup : public KPopupMenu { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc index d562bbf3..70f484d8 100644 --- a/kig/modes/textlabelwizard.cc +++ b/kig/modes/textlabelwizard.cc @@ -26,8 +26,8 @@ #include -TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode ) - : TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode ) +TextLabelWizard::TextLabelWizard( TQWidget* tqparent, TextLabelModeBase* mode ) + : TextLabelWizardBase( tqparent, "TextLabelWizard", false ), mmode( mode ) { connect( labelTextInput, TQT_SIGNAL( textChanged() ), TQT_SLOT( textChanged() ) ); @@ -81,15 +81,15 @@ void TextLabelWizard::linkClicked( int which ) mmode->linkClicked( which ); } -void TextLabelWizard::relayoutArgsPage() +void TextLabelWizard::retqlayoutArgsPage() { select_arguments_pageLayout->activate(); - repaint(); + tqrepaint(); } void TextLabelWizard::slotHelpClicked() { - kapp->invokeHelp( TQString::fromLatin1( "text-labels" ), - TQString::fromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::tqfromLatin1( "text-labels" ), + TQString::tqfromLatin1( "kig" ) ); } diff --git a/kig/modes/textlabelwizard.h b/kig/modes/textlabelwizard.h index bd51c1e0..2d192e7c 100644 --- a/kig/modes/textlabelwizard.h +++ b/kig/modes/textlabelwizard.h @@ -25,8 +25,9 @@ class TextLabelModeBase; class TextLabelWizard : public TextLabelWizardBase { Q_OBJECT + TQ_OBJECT public: - TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode ); + TextLabelWizard( TQWidget* tqparent, TextLabelModeBase* mode ); ~TextLabelWizard(); void back(); @@ -34,7 +35,7 @@ public: void reject(); void accept(); - void relayoutArgsPage(); + void retqlayoutArgsPage(); private slots: void textChanged(); void linkClicked( int which ); diff --git a/kig/modes/textlabelwizardbase.ui b/kig/modes/textlabelwizardbase.ui index 4e195b0d..5cbace2c 100644 --- a/kig/modes/textlabelwizardbase.ui +++ b/kig/modes/textlabelwizardbase.ui @@ -1,10 +1,10 @@ TextLabelWizardBase - + TextLabelWizardBase - + 0 0 @@ -15,7 +15,7 @@ Construct Label - + enter_text_page @@ -26,7 +26,7 @@ unnamed - + enterTextLabel @@ -34,16 +34,16 @@ Enter the text for your label here and press "Next". If you want to show variable parts, then put %1, %2, ... at the appropriate places (e.g. "This segment is %1 units long."). - + WordBreak|AlignVCenter - + labelTextInput - + needFrameCheckBox @@ -53,7 +53,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac - + select_arguments_page @@ -64,14 +64,14 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac unnamed - + selectArgsLabel Now select the argument(s) you need. For every argument, click on it, select an object and a property in the Kig window, and click finish when you are done... - + WordBreak|AlignVCenter @@ -106,7 +106,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac 789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495 - + linkslabel.h diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index e14ceee8..0371ca7f 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -44,7 +44,7 @@ #include class MacroListElement - : public QListViewItem + : public TQListViewItem { Macro* macro; public: @@ -53,13 +53,13 @@ public: }; MacroListElement::MacroListElement( KListView* lv, Macro* m ) - : TQListViewItem( lv, TQString::null, m->action->descriptiveName(), m->action->description() ), + : TQListViewItem( lv, TQString(), m->action->descriptiveName(), m->action->description() ), macro( m ) { } -TypesDialog::TypesDialog( TQWidget* parent, KigPart& part ) - : TypesDialogBase( parent, "types_dialog", true ), mpart( part ) +TypesDialog::TypesDialog( TQWidget* tqparent, KigPart& part ) + : TypesDialogBase( tqparent, "types_dialog", true ), mpart( part ) { // improving GUI look'n'feel... buttonHelp->setGuiItem( KStdGuiItem::help() ); @@ -106,8 +106,8 @@ TypesDialog::~TypesDialog() void TypesDialog::helpSlot() { - kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ), - TQString::fromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ), + TQString::tqfromLatin1( "kig" ) ); } void TypesDialog::okSlot() @@ -171,7 +171,7 @@ void TypesDialog::exportType() TQFile fi( file_name ); if ( fi.exists() ) if ( KMessageBox::warningContinueCancel( this, i18n( "The file \"%1\" already exists. " - "Do you wish to overwrite it?" ).arg( fi.name() ), + "Do you wish to overwrite it?" ).tqarg( fi.name() ), i18n( "Overwrite File?" ), i18n("Overwrite") ) == KMessageBox::Cancel ) return; MacroList::instance()->save( types, file_name ); diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h index 2e914bcd..8275b653 100644 --- a/kig/modes/typesdialog.h +++ b/kig/modes/typesdialog.h @@ -39,13 +39,14 @@ class KigDocument; class TypesDialog : public TypesDialogBase { Q_OBJECT + TQ_OBJECT // necessary because some MacroList functions need it.. KigPart& mpart; const KIconLoader* il; TQPopupMenu* popup; public: - TypesDialog( TQWidget* parent, KigPart& ); + TypesDialog( TQWidget* tqparent, KigPart& ); ~TypesDialog(); public slots: diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui index 7cc7effb..7d3e012f 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -1,10 +1,10 @@ TypesDialogBase - + TypesDialogBase - + 0 0 @@ -28,9 +28,9 @@ 6 - + - layout1 + tqlayout1 @@ -88,17 +88,17 @@ - + - layout4 + tqlayout4 unnamed - + - layout3 + tqlayout3 @@ -138,16 +138,16 @@ Expanding - + 20 20 - + - layout4 + tqlayout4 @@ -193,7 +193,7 @@ Horizontal - + Layout1 @@ -228,7 +228,7 @@ Expanding - + 20 20 @@ -302,9 +302,9 @@ typeList - contextMenuRequested(QListViewItem*,const QPoint&,int) + contextMenuRequested(TQListViewItem*,const QPoint&,int) TypesDialogBase - contextMenuRequested(QListViewItem*,const QPoint&,int) + contextMenuRequested(TQListViewItem*,const QPoint&,int) buttonCancel @@ -313,17 +313,17 @@ cancelSlot() - + deleteType() exportType() helpSlot() importTypes() okSlot() editType() - contextMenuRequested( QListViewItem* i, const QPoint& p, int c ) + contextMenuRequested( TQListViewItem* i, const QPoint& p, int c ) cancelSlot() - - + + klistview.h kpushbutton.h diff --git a/kig/objects/angle_type.cc b/kig/objects/angle_type.cc index 7b86411b..b0dc09c1 100644 --- a/kig/objects/angle_type.cc +++ b/kig/objects/angle_type.cc @@ -65,14 +65,14 @@ const AngleType* AngleType::instance() return &t; } -ObjectImp* AngleType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* AngleType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; std::vector points; - for ( uint i = 0; i < parents.size(); ++i ) + for ( uint i = 0; i < tqparents.size(); ++i ) points.push_back( - static_cast( parents[i] )->coordinate() ); + static_cast( tqparents[i] )->coordinate() ); Coordinate lvect = points[0] - points[1]; Coordinate rvect; @@ -112,13 +112,13 @@ void AngleType::executeAction( // pretend to use this var.. (void) i; - std::vector parents = t.parents(); + std::vector tqparents = t.tqparents(); - assert( margsparser.checkArgs( parents ) ); + assert( margsparser.checkArgs( tqparents ) ); - Coordinate a = static_cast( parents[0]->imp() )->coordinate(); - Coordinate b = static_cast( parents[1]->imp() )->coordinate(); - Coordinate c = static_cast( parents[2]->imp() )->coordinate(); + Coordinate a = static_cast( tqparents[0]->imp() )->coordinate(); + Coordinate b = static_cast( tqparents[1]->imp() )->coordinate(); + Coordinate c = static_cast( tqparents[2]->imp() )->coordinate(); Coordinate lvect = a - b; Coordinate rvect = c - b; @@ -142,8 +142,8 @@ void AngleType::executeAction( Coordinate cdir( cos( newcangle ), sin( newcangle ) ); Coordinate nc = b + cdir.normalize( rvect.length() ); - MonitorDataObjects mon( getAllParents( parents ) ); - parents[2]->move( nc, d.document() ); + MonitorDataObjects mon( getAllParents( tqparents ) ); + tqparents[2]->move( nc, d.document() ); KigCommand* kc = new KigCommand( d, i18n( "Resize Angle" ) ); mon.finish( kc ); d.history()->addCommand( kc ); @@ -166,14 +166,14 @@ const HalfAngleType* HalfAngleType::instance() return &t; } -ObjectImp* HalfAngleType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* HalfAngleType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; std::vector points; - for ( uint i = 0; i < parents.size(); ++i ) + for ( uint i = 0; i < tqparents.size(); ++i ) points.push_back( - static_cast( parents[i] )->coordinate() ); + static_cast( tqparents[i] )->coordinate() ); Coordinate lvect = points[0] - points[1]; Coordinate rvect; diff --git a/kig/objects/arc_type.h b/kig/objects/arc_type.h index cdfe0294..cb0a4c5f 100644 --- a/kig/objects/arc_type.h +++ b/kig/objects/arc_type.h @@ -35,7 +35,7 @@ public: ObjectImp* calc( const Args& args, const KigDocument& ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; bool inherits( int type ) const; const ObjectImpType* resultId() const; @@ -55,7 +55,7 @@ public: ObjectImp* calc( const Args& args, const KigDocument& ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; bool inherits( int type ) const; const ObjectImpType* resultId() const; diff --git a/kig/objects/base_type.cc b/kig/objects/base_type.cc index 0f8eecec..77b9dc6a 100644 --- a/kig/objects/base_type.cc +++ b/kig/objects/base_type.cc @@ -33,13 +33,13 @@ ObjectABType::~ObjectABType() { } -ObjectImp* ObjectABType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ObjectABType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - Coordinate a = static_cast( parents[0] )->coordinate(); - Coordinate b = static_cast( parents[1] )->coordinate(); + Coordinate a = static_cast( tqparents[0] )->coordinate(); + Coordinate b = static_cast( tqparents[1] )->coordinate(); return calc( a, b ); } @@ -57,22 +57,22 @@ bool ObjectABType::canMove( const ObjectTypeCalcer& o ) const bool ObjectABType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const { - std::vector parents = o.parents(); - return parents[0]->isFreelyTranslatable() && parents[1]->isFreelyTranslatable(); + std::vector tqparents = o.tqparents(); + return tqparents[0]->isFreelyTranslatable() && tqparents[1]->isFreelyTranslatable(); } void ObjectABType::move( ObjectTypeCalcer& o, const Coordinate& to, const KigDocument& d ) const { - std::vector parents = o.parents(); - assert( margsparser.checkArgs( parents ) ); - const Coordinate a = static_cast( parents[0]->imp() )->coordinate(); - const Coordinate b = static_cast( parents[1]->imp() )->coordinate(); + std::vector tqparents = o.tqparents(); + assert( margsparser.checkArgs( tqparents ) ); + const Coordinate a = static_cast( tqparents[0]->imp() )->coordinate(); + const Coordinate b = static_cast( tqparents[1]->imp() )->coordinate(); const Coordinate dist = b - a; - if ( parents[0]->canMove() ) - parents[0]->move( to, d ); - if ( parents[1]->canMove() ) - parents[1]->move( to + dist, d ); + if ( tqparents[0]->canMove() ) + tqparents[0]->move( to, d ); + if ( tqparents[1]->canMove() ) + tqparents[1]->move( to + dist, d ); } ObjectLPType::ObjectLPType( const char* fullname, const ArgsParser::spec* spec, int n ) @@ -94,19 +94,19 @@ ObjectImp* ObjectLPType::calc( const Args& args, const KigDocument& ) const const Coordinate ObjectABType::moveReferencePoint( const ObjectTypeCalcer& o ) const { - std::vector parents = o.parents(); - assert( margsparser.checkArgs( parents ) ); - return static_cast( parents[0]->imp() )->coordinate(); + std::vector tqparents = o.tqparents(); + assert( margsparser.checkArgs( tqparents ) ); + return static_cast( tqparents[0]->imp() )->coordinate(); } std::vector ObjectABType::movableParents( const ObjectTypeCalcer& ourobj ) const { - std::vector parents = ourobj.parents(); + std::vector tqparents = ourobj.tqparents(); std::set ret; - std::vector tmp = parents[0]->movableParents(); + std::vector tmp = tqparents[0]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - tmp = parents[1]->movableParents(); + tmp = tqparents[1]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - ret.insert( parents.begin(), parents.end() ); + ret.insert( tqparents.begin(), tqparents.end() ); return std::vector( ret.begin(), ret.end() ); } diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc index b7b8f41e..6e688b1b 100644 --- a/kig/objects/bogus_imp.cc +++ b/kig/objects/bogus_imp.cc @@ -32,7 +32,7 @@ void BogusImp::draw( KigPainter& ) const { } -bool BogusImp::contains( const Coordinate&, int, const KigWidget& ) const +bool BogusImp::tqcontains( const Coordinate&, int, const KigWidget& ) const { return false; } @@ -88,22 +88,22 @@ InvalidImp::InvalidImp() void InvalidImp::fillInNextEscape( TQString& s, const KigDocument& ) const { - s = s.arg( "[invalid]" ); + s = s.tqarg( "[invalid]" ); } void DoubleImp::fillInNextEscape( TQString& s, const KigDocument& ) const { - s = s.arg( mdata ); + s = s.tqarg( mdata ); } void IntImp::fillInNextEscape( TQString& s, const KigDocument& ) const { - s = s.arg( mdata ); + s = s.tqarg( mdata ); } void StringImp::fillInNextEscape( TQString& s, const KigDocument& ) const { - s = s.arg( mdata ); + s = s.tqarg( mdata ); } HierarchyImp::HierarchyImp( const ObjectHierarchy& h ) diff --git a/kig/objects/bogus_imp.h b/kig/objects/bogus_imp.h index c8f3ee2b..3ab32809 100644 --- a/kig/objects/bogus_imp.h +++ b/kig/objects/bogus_imp.h @@ -46,7 +46,7 @@ public: Coordinate attachPoint( ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& w ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const; bool inRect( const Rect& r, int width, const KigWidget& w ) const; Rect surroundingRect() const; diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc index 38522c22..059ff592 100644 --- a/kig/objects/circle_imp.cc +++ b/kig/objects/circle_imp.cc @@ -63,7 +63,7 @@ void CircleImp::draw( KigPainter& p ) const p.drawCircle( mcenter, mradius ); } -bool CircleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const +bool CircleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const { return fabs((mcenter - p).length() - mradius) <= w.screenInfo().normalMiss( width ); } @@ -72,10 +72,10 @@ bool CircleImp::inRect( const Rect& r, int width, const KigWidget& w ) const { // first we check if the rect contains at least one of the // north/south/east/west points of the circle - if ( r.contains( mcenter + Coordinate( 0, -mradius ) ) ) return true; - if ( r.contains( mcenter + Coordinate( mradius, 0 ) ) ) return true; - if ( r.contains( mcenter + Coordinate( 0, mradius ) ) ) return true; - if ( r.contains( mcenter + Coordinate( -mradius, 0 ) ) ) return true; + if ( r.tqcontains( mcenter + Coordinate( 0, -mradius ) ) ) return true; + if ( r.tqcontains( mcenter + Coordinate( mradius, 0 ) ) ) return true; + if ( r.tqcontains( mcenter + Coordinate( 0, mradius ) ) ) return true; + if ( r.tqcontains( mcenter + Coordinate( -mradius, 0 ) ) ) return true; // we allow a miss of some pixels .. double miss = w.screenInfo().normalMiss( width ); @@ -235,8 +235,8 @@ TQString CircleImp::polarEquationString( const KigDocument& w ) const { TQString ret = i18n( "rho = %1 [centered at %2]" ); ConicPolarData data = polarData(); - ret = ret.arg( data.pdimen, 0, 'g', 3 ); - ret = ret.arg( w.coordinateSystem().fromScreen( data.focus1, w ) ); + ret = ret.tqarg( data.pdimen, 0, 'g', 3 ); + ret = ret.tqarg( w.coordinateSystem().fromScreen( data.focus1, w ) ); return ret; } @@ -244,18 +244,18 @@ TQString CircleImp::cartesianEquationString( const KigDocument& ) const { TQString ret = i18n( "x² + y² + %1 x + %2 y + %3 = 0" ); ConicCartesianData data = cartesianData(); - ret = ret.arg( data.coeffs[3], 0, 'g', 3 ); - ret = ret.arg( data.coeffs[4], 0, 'g', 3 ); - ret = ret.arg( data.coeffs[5], 0, 'g', 3 ); + ret = ret.tqarg( data.coeffs[3], 0, 'g', 3 ); + ret = ret.tqarg( data.coeffs[4], 0, 'g', 3 ); + ret = ret.tqarg( data.coeffs[5], 0, 'g', 3 ); return ret; } TQString CircleImp::simplyCartesianEquationString( const KigDocument& ) const { TQString ret = i18n( "( x - %1 )² + ( y - %2 )² = %3" ); - ret = ret.arg( mcenter.x, 0, 'g', 3 ); - ret = ret.arg( mcenter.y, 0, 'g', 3 ); - ret = ret.arg( mradius * mradius, 0, 'g', 3 ); + ret = ret.tqarg( mcenter.x, 0, 'g', 3 ); + ret = ret.tqarg( mcenter.y, 0, 'g', 3 ); + ret = ret.tqarg( mradius * mradius, 0, 'g', 3 ); return ret; } diff --git a/kig/objects/circle_imp.h b/kig/objects/circle_imp.h index 1ccede6a..98fa391d 100644 --- a/kig/objects/circle_imp.h +++ b/kig/objects/circle_imp.h @@ -46,7 +46,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc index 81331522..11e01c28 100644 --- a/kig/objects/conic_imp.cc +++ b/kig/objects/conic_imp.cc @@ -47,7 +47,7 @@ bool ConicImp::valid() const return true; } -bool ConicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const +bool ConicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -204,12 +204,12 @@ TQString ConicImp::cartesianEquationString( const KigDocument& ) const { TQString ret = i18n( "%1 x² + %2 y² + %3 xy + %4 x + %5 y + %6 = 0" ); ConicCartesianData data = cartesianData(); - ret = ret.arg( data.coeffs[0], 0, 'g', 3 ); - ret = ret.arg( data.coeffs[1], 0, 'g', 3 ); - ret = ret.arg( data.coeffs[2], 0, 'g', 3 ); - ret = ret.arg( data.coeffs[3], 0, 'g', 3 ); - ret = ret.arg( data.coeffs[4], 0, 'g', 3 ); - ret = ret.arg( data.coeffs[5], 0, 'g', 3 ); + ret = ret.tqarg( data.coeffs[0], 0, 'g', 3 ); + ret = ret.tqarg( data.coeffs[1], 0, 'g', 3 ); + ret = ret.tqarg( data.coeffs[2], 0, 'g', 3 ); + ret = ret.tqarg( data.coeffs[3], 0, 'g', 3 ); + ret = ret.tqarg( data.coeffs[4], 0, 'g', 3 ); + ret = ret.tqarg( data.coeffs[5], 0, 'g', 3 ); return ret; } @@ -218,11 +218,11 @@ TQString ConicImp::polarEquationString( const KigDocument& w ) const TQString ret = i18n( "rho = %1/(1 + %2 cos theta + %3 sin theta)\n [centered at %4]" ); const ConicPolarData data = polarData(); - ret = ret.arg( data.pdimen, 0, 'g', 3 ); - ret = ret.arg( -data.ecostheta0, 0, 'g', 3 ); - ret = ret.arg( -data.esintheta0, 0, 'g', 3 ); + ret = ret.tqarg( data.pdimen, 0, 'g', 3 ); + ret = ret.tqarg( -data.ecostheta0, 0, 'g', 3 ); + ret = ret.tqarg( -data.esintheta0, 0, 'g', 3 ); - ret = ret.arg( w.coordinateSystem().fromScreen( data.focus1, w ) ); + ret = ret.tqarg( w.coordinateSystem().fromScreen( data.focus1, w ) ); return ret; } diff --git a/kig/objects/conic_imp.h b/kig/objects/conic_imp.h index 29068a7b..d1cfa3f9 100644 --- a/kig/objects/conic_imp.h +++ b/kig/objects/conic_imp.h @@ -51,7 +51,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/conic_types.cc b/kig/objects/conic_types.cc index 34396369..58209011 100644 --- a/kig/objects/conic_types.cc +++ b/kig/objects/conic_types.cc @@ -57,12 +57,12 @@ ConicB5PType::~ConicB5PType() { } -ObjectImp* ConicB5PType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicB5PType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 1 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 1 ) ) return new InvalidImp; std::vector points; - for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) + for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) points.push_back( static_cast( *i )->coordinate() ); ConicCartesianData d = @@ -105,23 +105,23 @@ const ConicBAAPType* ConicBAAPType::instance() return &t; } -ObjectImp* ConicBAAPType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicBAAPType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const LineData la = static_cast( parents[0] )->data(); - const LineData lb = static_cast( parents[1] )->data(); - const Coordinate c = static_cast( parents[2] )->coordinate(); + const LineData la = static_cast( tqparents[0] )->data(); + const LineData lb = static_cast( tqparents[1] )->data(); + const Coordinate c = static_cast( tqparents[2] )->coordinate(); return new ConicImpCart( calcConicByAsymptotes( la, lb, c ) ); } -ObjectImp* ConicBFFPType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicBFFPType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; std::vector cs; - for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) + for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) cs.push_back( static_cast( *i )->coordinate() ); return new ConicImpPolar( calcConicBFFP( cs, type() ) ); @@ -233,17 +233,17 @@ ConicBDFPType::~ConicBDFPType() { } -ObjectImp* ConicBDFPType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicBDFPType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; - const LineData line = static_cast( parents[0] )->data(); + const LineData line = static_cast( tqparents[0] )->data(); const Coordinate focus = - static_cast( parents[1] )->coordinate(); + static_cast( tqparents[1] )->coordinate(); Coordinate point; - if ( parents.size() == 3 ) - point = static_cast( parents[2] )->coordinate(); + if ( tqparents.size() == 3 ) + point = static_cast( tqparents[2] )->coordinate(); else { /* !!!! costruisci point come punto medio dell'altezza tra fuoco e d. */ @@ -286,12 +286,12 @@ const ParabolaBTPType* ParabolaBTPType::instance() return &t; } -ObjectImp* ParabolaBTPType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ParabolaBTPType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; std::vector points; - for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) + for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) points.push_back( static_cast( *i )->coordinate() ); ConicCartesianData d = @@ -327,12 +327,12 @@ const ConicPolarPointType* ConicPolarPointType::instance() return &t; } -ObjectImp* ConicPolarPointType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicPolarPointType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const ConicCartesianData c = static_cast( parents[0] )->cartesianData(); - const LineData l = static_cast( parents[1] )->data(); + const ConicCartesianData c = static_cast( tqparents[0] )->cartesianData(); + const LineData l = static_cast( tqparents[1] )->data(); const Coordinate p = calcConicPolarPoint( c, l ); if ( p.valid() ) return new PointImp( p ); else return new InvalidImp; @@ -363,12 +363,12 @@ const ConicPolarLineType* ConicPolarLineType::instance() return &t; } -ObjectImp* ConicPolarLineType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicPolarLineType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const ConicCartesianData c = static_cast( parents[0] )->cartesianData(); - const Coordinate p = static_cast( parents[1] )->coordinate(); + const ConicCartesianData c = static_cast( tqparents[0] )->cartesianData(); + const Coordinate p = static_cast( tqparents[1] )->coordinate(); bool valid = true; const LineData l = calcConicPolarLine( c, p, valid ); if ( valid ) return new LineImp( l ); @@ -398,12 +398,12 @@ const ConicDirectrixType* ConicDirectrixType::instance() return &t; } -ObjectImp* ConicDirectrixType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicDirectrixType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; const ConicPolarData data = - static_cast( parents[0] )->polarData(); + static_cast( tqparents[0] )->polarData(); double ec = data.ecostheta0; double es = data.esintheta0; @@ -445,12 +445,12 @@ const EquilateralHyperbolaB4PType* EquilateralHyperbolaB4PType::instance() return &t; } -ObjectImp* EquilateralHyperbolaB4PType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* EquilateralHyperbolaB4PType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 1 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 1 ) ) return new InvalidImp; std::vector pts; - for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) + for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) pts.push_back( static_cast( *i )->coordinate() ); ConicCartesianData d = calcConicThroughPoints( pts, equilateral ); @@ -524,14 +524,14 @@ const ConicAsymptoteType* ConicAsymptoteType::instance() return &t; } -ObjectImp* ConicAsymptoteType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicAsymptoteType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; bool valid = true; const LineData ret = calcConicAsymptote( - static_cast( parents[0] )->cartesianData(), - static_cast( parents[1] )->data(), + static_cast( tqparents[0] )->cartesianData(), + static_cast( tqparents[1] )->data(), valid ); if ( valid ) @@ -565,18 +565,18 @@ const ConicRadicalType* ConicRadicalType::instance() return &t; } -ObjectImp* ConicRadicalType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicRadicalType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - if ( parents[0]->inherits( CircleImp::stype() ) && - parents[1]->inherits( CircleImp::stype() ) ) + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( tqparents[0]->inherits( CircleImp::stype() ) && + tqparents[1]->inherits( CircleImp::stype() ) ) { - if( static_cast( parents[2] )->data() != 1 ) + if( static_cast( tqparents[2] )->data() != 1 ) return new InvalidImp; else { - const CircleImp* c1 = static_cast( parents[0] ); - const CircleImp* c2 = static_cast( parents[1] ); + const CircleImp* c1 = static_cast( tqparents[0] ); + const CircleImp* c2 = static_cast( tqparents[1] ); const Coordinate a = calcCircleRadicalStartPoint( c1->center(), c2->center(), c1->squareRadius(), c2->squareRadius() ); @@ -588,10 +588,10 @@ ObjectImp* ConicRadicalType::calc( const Args& parents, const KigDocument& ) con { bool valid = true; const LineData l = calcConicRadical( - static_cast( parents[0] )->cartesianData(), - static_cast( parents[1] )->cartesianData(), - static_cast( parents[2] )->data(), - static_cast( parents[3] )->data(), valid ); + static_cast( tqparents[0] )->cartesianData(), + static_cast( tqparents[1] )->cartesianData(), + static_cast( tqparents[2] )->data(), + static_cast( tqparents[3] )->data(), valid ); if ( valid ) return new LineImp( l ); else @@ -674,9 +674,9 @@ void ConicRadicalType::executeAction( int i, ObjectHolder&, ObjectTypeCalcer& t, KigPart& d, KigWidget&, NormalMode& ) const { assert( i == 0 ); - std::vector parents = t.parents(); - assert( dynamic_cast( parents[3] ) ); - ObjectConstCalcer* zeroindexo = static_cast( parents[3] ); + std::vector tqparents = t.tqparents(); + assert( dynamic_cast( tqparents[3] ) ); + ObjectConstCalcer* zeroindexo = static_cast( tqparents[3] ); MonitorDataObjects mon( zeroindexo ); assert( zeroindexo->imp()->inherits( IntImp::stype() ) ); int oldzeroindex = static_cast( zeroindexo->imp() )->data(); diff --git a/kig/objects/conic_types.h b/kig/objects/conic_types.h index 858ca057..e3c44c01 100644 --- a/kig/objects/conic_types.h +++ b/kig/objects/conic_types.h @@ -27,7 +27,7 @@ class ConicB5PType ~ConicB5PType(); public: static const ConicB5PType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -38,7 +38,7 @@ class ConicBAAPType ~ConicBAAPType(); public: static const ConicBAAPType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -49,7 +49,7 @@ protected: ConicBFFPType( const char* fullname, const ArgsParser::spec*, int n ); ~ConicBFFPType(); public: - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; /** * -1 for hyperbola, 1 for ellipse.. @@ -85,7 +85,7 @@ class ConicBDFPType ~ConicBDFPType(); public: static const ConicBDFPType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -96,7 +96,7 @@ class ParabolaBTPType ~ParabolaBTPType(); public: static const ParabolaBTPType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -107,7 +107,7 @@ class EquilateralHyperbolaB4PType ~EquilateralHyperbolaB4PType(); public: static const EquilateralHyperbolaB4PType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -118,7 +118,7 @@ class ConicPolarPointType ~ConicPolarPointType(); public: static const ConicPolarPointType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -129,7 +129,7 @@ class ConicPolarLineType ~ConicPolarLineType(); public: static const ConicPolarLineType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -140,7 +140,7 @@ class ConicDirectrixType ~ConicDirectrixType(); public: static const ConicDirectrixType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -162,7 +162,7 @@ class ConicAsymptoteType ~ConicAsymptoteType(); public: static const ConicAsymptoteType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -173,7 +173,7 @@ class ConicRadicalType ~ConicRadicalType(); public: static const ConicRadicalType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; TQStringList specialActions() const; void executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& t, diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc index 3879c5d9..f727f49a 100644 --- a/kig/objects/cubic_imp.cc +++ b/kig/objects/cubic_imp.cc @@ -50,7 +50,7 @@ void CubicImp::draw( KigPainter& p ) const p.drawCurve( this ); } -bool CubicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const +bool CubicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -409,7 +409,7 @@ Rect CubicImp::surroundingRect() const TQString CubicImp::cartesianEquationString( const KigDocument& ) const { /* - * unfortunately QStrings.arg method is limited to %1, %9, so we cannot + * unfortunately TQStrings.arg method is limited to %1, %9, so we cannot * treat all 10 arguments! Let's split the equation in two parts... * Now this ends up also in the translation machinery, is this really * necessary? Otherwise we could do a little bit of tidy up on the @@ -417,21 +417,21 @@ TQString CubicImp::cartesianEquationString( const KigDocument& ) const */ TQString ret = i18n( "%6 x³ + %9 y³ + %7 x²y + %8 xy² + %5 y² + %3 x² + %4 xy + %1 x + %2 y" ); - ret = ret.arg( mdata.coeffs[1], 0, 'g', 3 ); - ret = ret.arg( mdata.coeffs[2], 0, 'g', 3 ); - ret = ret.arg( mdata.coeffs[3], 0, 'g', 3 ); - ret = ret.arg( mdata.coeffs[4], 0, 'g', 3 ); - ret = ret.arg( mdata.coeffs[5], 0, 'g', 3 ); - ret = ret.arg( mdata.coeffs[6], 0, 'g', 3 ); - ret = ret.arg( mdata.coeffs[7], 0, 'g', 3 ); - ret = ret.arg( mdata.coeffs[8], 0, 'g', 3 ); - ret = ret.arg( mdata.coeffs[9], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[1], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[2], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[3], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[4], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[5], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[6], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[7], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[8], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[9], 0, 'g', 3 ); ret.append( i18n( " + %1 = 0" ) ); - ret = ret.arg( mdata.coeffs[0], 0, 'g', 3 ); + ret = ret.tqarg( mdata.coeffs[0], 0, 'g', 3 ); // we should find a common place to do this... - ret.replace( "+ -", "- " ); - ret.replace( "+-", "-" ); + ret.tqreplace( "+ -", "- " ); + ret.tqreplace( "+-", "-" ); return ret; } diff --git a/kig/objects/cubic_imp.h b/kig/objects/cubic_imp.h index 5e9e6a2c..65dc25ad 100644 --- a/kig/objects/cubic_imp.h +++ b/kig/objects/cubic_imp.h @@ -40,7 +40,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; TQString cartesianEquationString( const KigDocument& ) const; diff --git a/kig/objects/cubic_type.cc b/kig/objects/cubic_type.cc index c322b8c3..1878128a 100644 --- a/kig/objects/cubic_type.cc +++ b/kig/objects/cubic_type.cc @@ -112,12 +112,12 @@ const CubicNodeB6PType* CubicNodeB6PType::instance() return &t; } -ObjectImp* CubicNodeB6PType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* CubicNodeB6PType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; std::vector points; - for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) + for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) points.push_back( static_cast( *i )->coordinate() ); CubicCartesianData d = calcCubicNodeThroughPoints( points ); @@ -156,12 +156,12 @@ const CubicCuspB4PType* CubicCuspB4PType::instance() return &t; } -ObjectImp* CubicCuspB4PType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* CubicCuspB4PType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; std::vector points; - for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) + for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) points.push_back( static_cast( *i )->coordinate() ); CubicCartesianData d = calcCubicCuspThroughPoints( points ); diff --git a/kig/objects/cubic_type.h b/kig/objects/cubic_type.h index 39be7387..439c7367 100644 --- a/kig/objects/cubic_type.h +++ b/kig/objects/cubic_type.h @@ -27,7 +27,7 @@ class CubicB9PType ~CubicB9PType(); public: static const CubicB9PType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -38,7 +38,7 @@ class CubicNodeB6PType ~CubicNodeB6PType(); public: static const CubicNodeB6PType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -49,7 +49,7 @@ class CubicCuspB4PType ~CubicCuspB4PType(); public: static const CubicCuspB4PType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; diff --git a/kig/objects/intersection_types.cc b/kig/objects/intersection_types.cc index 804d498d..92cbefff 100644 --- a/kig/objects/intersection_types.cc +++ b/kig/objects/intersection_types.cc @@ -55,19 +55,19 @@ const ConicLineIntersectionType* ConicLineIntersectionType::instance() return &t; } -ObjectImp* ConicLineIntersectionType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicLineIntersectionType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - int side = static_cast( parents[2] )->data(); + int side = static_cast( tqparents[2] )->data(); assert( side == 1 || side == -1 ); - const LineData line = static_cast( parents[1] )->data(); + const LineData line = static_cast( tqparents[1] )->data(); Coordinate ret; - if ( parents[0]->inherits( CircleImp::stype() ) ) + if ( tqparents[0]->inherits( CircleImp::stype() ) ) { // easy case.. - const CircleImp* c = static_cast( parents[0] ); + const CircleImp* c = static_cast( tqparents[0] ); ret = calcCircleLineIntersect( c->center(), c->squareRadius(), line, side ); } @@ -75,7 +75,7 @@ ObjectImp* ConicLineIntersectionType::calc( const Args& parents, const KigDocume { // harder case.. ret = calcConicLineIntersect( - static_cast( parents[0] )->cartesianData(), + static_cast( tqparents[0] )->cartesianData(), line, 0.0, side ); } if ( ret.valid() ) return new PointImp( ret ); @@ -109,18 +109,18 @@ const ConicLineOtherIntersectionType* ConicLineOtherIntersectionType::instance() return &t; } -ObjectImp* ConicLineOtherIntersectionType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConicLineOtherIntersectionType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - Coordinate p = static_cast( parents[2] )->coordinate(); - const LineData line = static_cast( parents[1] )->data(); + Coordinate p = static_cast( tqparents[2] )->coordinate(); + const LineData line = static_cast( tqparents[1] )->data(); Coordinate ret; -// if ( parents[0]->inherits( CircleImp::stype() ) ) +// if ( tqparents[0]->inherits( CircleImp::stype() ) ) // { // // easy case.. -// const CircleImp* c = static_cast( parents[0] ); +// const CircleImp* c = static_cast( tqparents[0] ); // ret = calcCircleLineIntersect( // c->center(), c->squareRadius(), line, side, valid ); // } @@ -133,7 +133,7 @@ ObjectImp* ConicLineOtherIntersectionType::calc( const Args& parents, const KigD double bay = line.b.y - line.a.y; double knownparam = (pax*bax + pay*bay)/(bax*bax + bay*bay); ret = calcConicLineIntersect( - static_cast( parents[0] )->cartesianData(), + static_cast( tqparents[0] )->cartesianData(), line, knownparam, 0 ); // } if ( ret.valid() ) return new PointImp( ret ); @@ -164,16 +164,16 @@ const LineLineIntersectionType* LineLineIntersectionType::instance() return &t; } -ObjectImp* LineLineIntersectionType::calc( const Args& parents, const KigDocument& d ) const +ObjectImp* LineLineIntersectionType::calc( const Args& tqparents, const KigDocument& d ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; Coordinate p = calcIntersectionPoint( - static_cast( parents[0] )->data(), - static_cast( parents[1] )->data() ); - if ( static_cast( parents[0] )->containsPoint( p, d ) && - static_cast( parents[1] )->containsPoint( p, d ) ) + static_cast( tqparents[0] )->data(), + static_cast( tqparents[1] )->data() ); + if ( static_cast( tqparents[0] )->containsPoint( p, d ) && + static_cast( tqparents[1] )->containsPoint( p, d ) ) return new PointImp( p ); else return new InvalidImp(); } @@ -204,15 +204,15 @@ const LineCubicIntersectionType* LineCubicIntersectionType::instance() return &t; } -ObjectImp* LineCubicIntersectionType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* LineCubicIntersectionType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - int which = static_cast( parents[2] )->data(); + int which = static_cast( tqparents[2] )->data(); bool valid = true; const Coordinate c = calcCubicLineIntersect( - static_cast( parents[0] )->data(), - static_cast( parents[1] )->data(), + static_cast( tqparents[0] )->data(), + static_cast( tqparents[1] )->data(), which, valid ); if ( valid ) return new PointImp( c ); else return new InvalidImp; @@ -265,14 +265,14 @@ const CircleCircleIntersectionType* CircleCircleIntersectionType::instance() return &t; } -ObjectImp* CircleCircleIntersectionType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* CircleCircleIntersectionType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - int side = static_cast( parents[2] )->data(); + int side = static_cast( tqparents[2] )->data(); assert( side == 1 || side == -1 ); - const CircleImp* c1 = static_cast( parents[0] ); - const CircleImp* c2 = static_cast( parents[1] ); + const CircleImp* c1 = static_cast( tqparents[0] ); + const CircleImp* c2 = static_cast( tqparents[1] ); const Coordinate o1 = c1->center(); const Coordinate o2 = c2->center(); const double r1sq = c1->squareRadius(); @@ -316,15 +316,15 @@ const ArcLineIntersectionType* ArcLineIntersectionType::instance() return &t; } -ObjectImp* ArcLineIntersectionType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ArcLineIntersectionType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - int side = static_cast( parents[2] )->data(); + int side = static_cast( tqparents[2] )->data(); assert( side == 1 || side == -1 ); - const LineData line = static_cast( parents[1] )->data(); + const LineData line = static_cast( tqparents[1] )->data(); - const ArcImp* c = static_cast( parents[0] ); + const ArcImp* c = static_cast( tqparents[0] ); const double r = c->radius(); Coordinate ret = calcArcLineIntersect( c->center(), r*r, c->startAngle(), c->angle(), line, side ); diff --git a/kig/objects/intersection_types.h b/kig/objects/intersection_types.h index 9e1df62e..46d60199 100644 --- a/kig/objects/intersection_types.h +++ b/kig/objects/intersection_types.h @@ -36,7 +36,7 @@ class ConicLineIntersectionType ~ConicLineIntersectionType(); public: static const ConicLineIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -51,7 +51,7 @@ class ConicLineOtherIntersectionType ~ConicLineOtherIntersectionType(); public: static const ConicLineOtherIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -62,7 +62,7 @@ class LineLineIntersectionType ~LineLineIntersectionType(); public: static const LineLineIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -73,7 +73,7 @@ class LineCubicIntersectionType ~LineCubicIntersectionType(); public: static const LineCubicIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -84,7 +84,7 @@ class CircleCircleIntersectionType ~CircleCircleIntersectionType(); public: static const CircleCircleIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -98,7 +98,7 @@ class ArcLineIntersectionType ~ArcLineIntersectionType(); public: static const ArcLineIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc index a49078a1..0cb8a985 100644 --- a/kig/objects/line_imp.cc +++ b/kig/objects/line_imp.cc @@ -186,8 +186,8 @@ const TQString AbstractLineImp::equationString() const TQString::fromUtf8( r > 0 ? "+" : "-" ) + TQString::fromUtf8( " %2" ); - ret = ret.arg( m, 0, 'g', 3 ); - ret = ret.arg( abs( r ), 0, 'g', 3 ); + ret = ret.tqarg( m, 0, 'g', 3 ); + ret = ret.tqarg( abs( r ), 0, 'g', 3 ); return ret; } @@ -197,7 +197,7 @@ void SegmentImp::draw( KigPainter& p ) const p.drawSegment( mdata ); } -bool SegmentImp::contains( const Coordinate& p, int width, const KigWidget& w ) const +bool SegmentImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -207,7 +207,7 @@ void RayImp::draw( KigPainter& p ) const p.drawRay( mdata ); } -bool RayImp::contains( const Coordinate& p, int width, const KigWidget& w ) const +bool RayImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -217,7 +217,7 @@ void LineImp::draw( KigPainter& p ) const p.drawLine( mdata ); } -bool LineImp::contains( const Coordinate& p, int width, const KigWidget& w ) const +bool LineImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } diff --git a/kig/objects/line_imp.h b/kig/objects/line_imp.h index b12c045d..c52d8afd 100644 --- a/kig/objects/line_imp.h +++ b/kig/objects/line_imp.h @@ -99,7 +99,7 @@ public: SegmentImp( const LineData& d ); void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& si ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -154,7 +154,7 @@ public: RayImp( const LineData& d ); void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& si ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -195,7 +195,7 @@ public: */ LineImp( const LineData& d ); void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& si ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; diff --git a/kig/objects/line_type.cc b/kig/objects/line_type.cc index a02cc80b..84deb46e 100644 --- a/kig/objects/line_type.cc +++ b/kig/objects/line_type.cc @@ -232,11 +232,11 @@ void SegmentABType::executeAction( int i, ObjectHolder&, ObjectTypeCalcer& c, // pretend to use this var.. (void) i; - std::vector parents = c.parents(); - assert( margsparser.checkArgs( parents ) ); + std::vector tqparents = c.tqparents(); + assert( margsparser.checkArgs( tqparents ) ); - Coordinate a = static_cast( parents[0]->imp() )->coordinate(); - Coordinate b = static_cast( parents[1]->imp() )->coordinate(); + Coordinate a = static_cast( tqparents[0]->imp() )->coordinate(); + Coordinate b = static_cast( tqparents[1]->imp() )->coordinate(); bool ok = true; double length = getDoubleFromUser( @@ -246,8 +246,8 @@ void SegmentABType::executeAction( int i, ObjectHolder&, ObjectTypeCalcer& c, Coordinate nb = a + ( b - a ).normalize( length ); - MonitorDataObjects mon( getAllParents( parents ) ); - parents[1]->move( nb, d.document() ); + MonitorDataObjects mon( getAllParents( tqparents ) ); + tqparents[1]->move( nb, d.document() ); KigCommand* cd = new KigCommand( d, i18n( "Resize Segment" ) ); mon.finish( cd ); d.history()->addCommand( cd ); diff --git a/kig/objects/locus_imp.cc b/kig/objects/locus_imp.cc index edbdc88b..3bf85a9e 100644 --- a/kig/objects/locus_imp.cc +++ b/kig/objects/locus_imp.cc @@ -49,7 +49,7 @@ void LocusImp::draw( KigPainter& p ) const p.drawCurve( this ); } -bool LocusImp::contains( const Coordinate& p, int width, const KigWidget& w ) const +bool LocusImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ), w.document() ); } diff --git a/kig/objects/locus_imp.h b/kig/objects/locus_imp.h index 568e0e7c..b2100634 100644 --- a/kig/objects/locus_imp.h +++ b/kig/objects/locus_imp.h @@ -24,7 +24,7 @@ /** * LocusImp is an imp that consists of a copy of the curveimp that the * moving point moves over, and an ObjectHierarchy that can calc ( - * given a point, and optionally some more parent objects the position + * given a point, and optionally some more tqparent objects the position * of the moving point. The hierarchy should take the moving point as * its *first* argument and all others after that. The others are * used to make it possible for Locus to be updated when some of the @@ -33,9 +33,9 @@ * * This may seem rather complicated, but I think it is absolutely * necessary to support locuses using Kig's object system. It would - * be very bad for LocusImp to have to keep references to its parents + * be very bad for LocusImp to have to keep references to its tqparents * as Objects ( since only the objects know how they are related to - * their parents ). This is how we used to do it, but the current + * their tqparents ). This is how we used to do it, but the current * method is far superior. First and foremost because the separation * between ObjectImp and Object is something that Kig depends on very * much, and because every ObjectImp should contain all the data it @@ -66,7 +66,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; Rect surroundingRect() const; bool inRect( const Rect& r, int width, const KigWidget& ) const; double getParam( const Coordinate& point, const KigDocument& ) const; diff --git a/kig/objects/object_calcer.cc b/kig/objects/object_calcer.cc index 40545ed1..ae442aae 100644 --- a/kig/objects/object_calcer.cc +++ b/kig/objects/object_calcer.cc @@ -29,8 +29,8 @@ void ObjectTypeCalcer::calc( const KigDocument& doc ) { Args a; - a.reserve( mparents.size() ); - std::transform( mparents.begin(), mparents.end(), + a.reserve( mtqparents.size() ); + std::transform( mtqparents.begin(), mtqparents.end(), std::back_inserter( a ), std::mem_fun( &ObjectCalcer::imp ) ); ObjectImp* n = mtype->calc( a, doc ); delete mimp; @@ -38,10 +38,10 @@ void ObjectTypeCalcer::calc( const KigDocument& doc ) } ObjectTypeCalcer::ObjectTypeCalcer( const ObjectType* type, - const std::vector& parents, bool sort ) - : mparents( ( sort )?type->sortArgs( parents ):parents ), mtype( type ), mimp( 0 ) + const std::vector& tqparents, bool sort ) + : mtqparents( ( sort )?type->sortArgs( tqparents ):tqparents ), mtype( type ), mimp( 0 ) { - std::for_each( mparents.begin(), mparents.end(), + std::for_each( mtqparents.begin(), mtqparents.end(), std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) ); } @@ -68,9 +68,9 @@ void ObjectConstCalcer::calc( const KigDocument& ) { } -std::vector ObjectConstCalcer::parents() const +std::vector ObjectConstCalcer::tqparents() const { - // we have no parents.. + // we have no tqparents.. return std::vector(); } @@ -99,29 +99,29 @@ const ObjectImp* ObjectTypeCalcer::imp() const return mimp; } -std::vector ObjectTypeCalcer::parents() const +std::vector ObjectTypeCalcer::tqparents() const { - return mparents; + return mtqparents; } void ObjectCalcer::addChild( ObjectCalcer* c ) { - mchildren.push_back( c ); + mtqchildren.push_back( c ); ref(); } void ObjectCalcer::delChild( ObjectCalcer* c ) { - std::vector::iterator i = std::find( mchildren.begin(), mchildren.end(), c ); - assert( i != mchildren.end() ); + std::vector::iterator i = std::find( mtqchildren.begin(), mtqchildren.end(), c ); + assert( i != mtqchildren.end() ); - mchildren.erase( i ); + mtqchildren.erase( i ); deref(); } ObjectTypeCalcer::~ObjectTypeCalcer() { - std::for_each( mparents.begin(), mparents.end(), + std::for_each( mtqparents.begin(), mtqparents.end(), std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) ); delete mimp; } @@ -131,21 +131,21 @@ const ObjectType* ObjectTypeCalcer::type() const return mtype; } -ObjectPropertyCalcer::ObjectPropertyCalcer( ObjectCalcer* parent, int propid ) - : mimp( 0 ), mparent( parent ), mpropid( propid ) +ObjectPropertyCalcer::ObjectPropertyCalcer( ObjectCalcer* tqparent, int propid ) + : mimp( 0 ), mtqparent( tqparent ), mpropid( propid ) { // Some weird C++ thing prevents me from calling protected members - // of ObjectCalcer on mparent.. This is an ugly workaround.. - ( mparent->*&ObjectCalcer::addChild )( this ); - //mparent->addChild( this ); + // of ObjectCalcer on mtqparent.. This is an ugly workaround.. + ( mtqparent->*&ObjectCalcer::addChild )( this ); + //mtqparent->addChild( this ); } ObjectPropertyCalcer::~ObjectPropertyCalcer() { // Some weird C++ thing prevents me from calling protected members - // of ObjectCalcer on mparent.. This is an ugly workaround.. - ( mparent->*&ObjectCalcer::delChild )( this ); - //mparent->delChild( this ); + // of ObjectCalcer on mtqparent.. This is an ugly workaround.. + ( mtqparent->*&ObjectCalcer::delChild )( this ); + //mtqparent->delChild( this ); delete mimp; } @@ -154,16 +154,16 @@ const ObjectImp* ObjectPropertyCalcer::imp() const return mimp; } -std::vector ObjectPropertyCalcer::parents() const +std::vector ObjectPropertyCalcer::tqparents() const { std::vector ret; - ret.push_back( mparent ); + ret.push_back( mtqparent ); return ret; } void ObjectPropertyCalcer::calc( const KigDocument& doc ) { - ObjectImp* n = mparent->imp()->property( mpropid, doc ); + ObjectImp* n = mtqparent->imp()->property( mpropid, doc ); delete mimp; mimp = n; } @@ -175,15 +175,15 @@ ObjectImp* ObjectConstCalcer::switchImp( ObjectImp* newimp ) return ret; } -std::vector ObjectCalcer::children() const +std::vector ObjectCalcer::tqchildren() const { - return mchildren; + return mtqchildren; } const ObjectImpType* ObjectPropertyCalcer::impRequirement( ObjectCalcer*, const std::vector& ) const { - return mparent->imp()->impRequirementForProperty( mpropid ); + return mtqparent->imp()->impRequirementForProperty( mpropid ); } const ObjectImpType* ObjectConstCalcer::impRequirement( @@ -197,12 +197,12 @@ const ObjectImpType* ObjectTypeCalcer::impRequirement( ObjectCalcer* o, const std::vector& os ) const { Args args; - args.reserve( mparents.size() ); + args.reserve( mtqparents.size() ); std::transform( os.begin(), os.end(), std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); - assert( std::find( args.begin(), args.end(), o->imp() ) != args.end() ); + assert( std::tqfind( args.begin(), args.end(), o->imp() ) != args.end() ); return mtype->impRequirement( o->imp(), args ); } @@ -220,9 +220,9 @@ void ObjectTypeCalcer::setParents( const std::vector np ) { std::for_each( np.begin(), np.end(), std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) ); - std::for_each( mparents.begin(), mparents.end(), + std::for_each( mtqparents.begin(), mtqparents.end(), std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) ); - mparents = np; + mtqparents = np; } void ObjectTypeCalcer::setType( const ObjectType* t ) @@ -270,15 +270,15 @@ void ObjectTypeCalcer::move( const Coordinate& to, const KigDocument& doc ) { // we need to check if type can in fact move, because this check is // not done for us in all circumstances ( e.g. LineABType::move uses - // move on its parents to move them ), and the ObjectType's depend + // move on its tqparents to move them ), and the ObjectType's depend // on move only being called if canMove() returns true.. if ( mtype->canMove( *this ) ) mtype->move( *this, to, doc ); } -ObjectCalcer* ObjectPropertyCalcer::parent() const +ObjectCalcer* ObjectPropertyCalcer::tqparent() const { - return mparent; + return mtqparent; } ObjectCalcer::ObjectCalcer() @@ -303,16 +303,16 @@ bool ObjectConstCalcer::isDefinedOnOrThrough( const ObjectCalcer* ) const bool ObjectPropertyCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const { - return o == mparent && - mparent->imp()->isPropertyDefinedOnOrThroughThisImp( propId() ); + return o == mtqparent && + mtqparent->imp()->isPropertyDefinedOnOrThroughThisImp( propId() ); } bool ObjectTypeCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const { Args args; - args.reserve( mparents.size() ); + args.reserve( mtqparents.size() ); std::transform( - mparents.begin(), mparents.end(), + mtqparents.begin(), mtqparents.end(), std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); if ( std::find( args.begin(), args.end(), o->imp() ) == args.end() ) diff --git a/kig/objects/object_calcer.h b/kig/objects/object_calcer.h index 6df94fe8..1aa83db4 100644 --- a/kig/objects/object_calcer.h +++ b/kig/objects/object_calcer.h @@ -33,12 +33,12 @@ void intrusive_ptr_release( ObjectCalcer* p ); * be calculated from the two PointImp's it has to go through; every * time either of them moves, this calculation is redone. In this * case, there would be an ObjectCalcer that keeps a reference to its - * two parents ( the ObjectCalcer's representing the points ), and + * two tqparents ( the ObjectCalcer's representing the points ), and * that will calculate its ObjectImp value every time it is asked to - * do so ( i.e. every time one of its parents moves.. ). + * do so ( i.e. every time one of its tqparents moves.. ). * * Each ObjectHolder keeps its ObjectImp itself, and recalculates it - * from its parents in its calc() method ( if necessary ). + * from its tqparents in its calc() method ( if necessary ). * * Because of the complex relations that ObjectCalcer's hold to other * ObjectCalcer's and to other classes, they have been made @@ -46,12 +46,12 @@ void intrusive_ptr_release( ObjectCalcer* p ); * how much times a pointer to them is held. If this count reaches 0, * this means that nobody needs them anymore, and they delete * themselves. E.g. an ObjectCalcer always keeps a reference to its - * parents, to ensure that those aren't deleted before it is deleted. + * tqparents, to ensure that those aren't deleted before it is deleted. * * At runtime, there will be an entire graph of ObjectCalcer that - * depend on their parents.. At the bottom, there are Calcer's that + * depend on their tqparents.. At the bottom, there are Calcer's that * the user is aware of, and that are held by ObjectHolder's. At the - * top, there are Calcer's without parents that serve only to hold + * top, there are Calcer's without tqparents that serve only to hold * some data. Those are most likely ObjectConstCalcer's. There are * some algorithms to work with the dependency graph in various ways * in ../misc/calcpath.h @@ -67,7 +67,7 @@ class ObjectCalcer protected: /** * ObjectCalcer's are reference counted.. They all take a reference - * to their parents, and some other classes like ObjectHolder take a + * to their tqparents, and some other classes like ObjectHolder take a * reference to some ObjectCalcer's that they don't want to see * deleted.. */ @@ -77,10 +77,10 @@ protected: void ref(); void deref(); - // we keep track of our children, so algorithms can easily walk over + // we keep track of our tqchildren, so algorithms can easily walk over // the dependency graph.. - std::vector mchildren; + std::vector mtqchildren; ObjectCalcer(); public: @@ -90,7 +90,7 @@ public: */ void addChild( ObjectCalcer* c ); /** - * a calcer should call this in its destructor, to inform its parent + * a calcer should call this in its destructor, to inform its tqparent * that it is no longer a child of this calcer. This will release * the reference taken in addChild.. */ @@ -102,29 +102,29 @@ public: /** * Returns the child ObjectCalcer's of this ObjectCalcer. */ - std::vector children() const; + std::vector tqchildren() const; virtual ~ObjectCalcer(); /** - * Returns the parent ObjectCalcer's of this ObjectCalcer. + * Returns the tqparent ObjectCalcer's of this ObjectCalcer. */ - virtual std::vector parents() const = 0; + virtual std::vector tqparents() const = 0; /** * Returns the ObjectImp of this ObjectCalcer. */ virtual const ObjectImp* imp() const = 0; /** * Makes the ObjectCalcer recalculate its ObjectImp from its - * parents. + * tqparents. */ virtual void calc( const KigDocument& ) = 0; /** - * An ObjectCalcer expects its parents to have an ObjectImp of a + * An ObjectCalcer expects its tqparents to have an ObjectImp of a * certain type. This method returns the ObjectImpType that \p o - * should have. \p os is a list of all the parents in order, and + * should have. \p os is a list of all the tqparents in order, and * \p o is part of it. This method will return the ObjectImpType - * that the parent should *at least* be. For example, a Translated + * that the tqparent should *at least* be. For example, a Translated * object can translate any sort of object, so it will return * ObjectImp::stype() here ( the topmost ObjectImpType, that all * other ObjectImpType's inherit ). @@ -144,7 +144,7 @@ public: virtual bool isFreelyTranslatable() const; /** * Moving an object most of the time signifies invoking changes in - * some of its parents. This method returns the set of parents that + * some of its tqparents. This method returns the set of tqparents that * will be changed in the move() method. The object itself should * not be included. */ @@ -182,30 +182,30 @@ public: class ObjectTypeCalcer : public ObjectCalcer { - std::vector mparents; + std::vector mtqparents; const ObjectType* mtype; ObjectImp* mimp; public: typedef myboost::intrusive_ptr shared_ptr; /** - * Construct a new ObjectTypeCalcer with a given type and parents. + * Construct a new ObjectTypeCalcer with a given type and tqparents. */ -// ObjectTypeCalcer( const ObjectType* type, const std::vector& parents ); +// ObjectTypeCalcer( const ObjectType* type, const std::vector& tqparents ); /** * the sort boolean tells whether the sortArgs method should be invoked or not; * if not present */ - ObjectTypeCalcer( const ObjectType* type, const std::vector& parents, bool sort=true ); + ObjectTypeCalcer( const ObjectType* type, const std::vector& tqparents, bool sort=true ); ~ObjectTypeCalcer(); const ObjectImp* imp() const; - std::vector parents() const; + std::vector tqparents() const; void calc( const KigDocument& doc ); /** - * Set the parents of this ObjectTypeCalcer to np. This object will - * release the reference it had to its old parents, and take a new - * one on the new parents. + * Set the tqparents of this ObjectTypeCalcer to np. This object will + * release the reference it had to its old tqparents, and take a new + * one on the new tqparents. */ void setParents( const std::vector np ); void setType( const ObjectType* t ); @@ -248,7 +248,7 @@ public: const ObjectImp* imp() const; void calc( const KigDocument& doc ); - std::vector parents() const; + std::vector tqparents() const; /** * Set the ObjectImp of this ObjectConstCalcer to the given @@ -267,7 +267,7 @@ public: }; /** - * This is an ObjectCalcer that has a single parent, and gets a + * This is an ObjectCalcer that has a single tqparent, and gets a * certain property from it in its calc() method. * * \see ObjectImp::property @@ -276,22 +276,22 @@ class ObjectPropertyCalcer : public ObjectCalcer { ObjectImp* mimp; - ObjectCalcer* mparent; + ObjectCalcer* mtqparent; int mpropid; public: /** * Construct a new ObjectPropertyCalcer, that will get the property - * from parent with number propid. + * from tqparent with number propid. */ - ObjectPropertyCalcer( ObjectCalcer* parent, int propid ); + ObjectPropertyCalcer( ObjectCalcer* tqparent, int propid ); ~ObjectPropertyCalcer(); const ObjectImp* imp() const; - std::vector parents() const; + std::vector tqparents() const; void calc( const KigDocument& doc ); int propId() const; - ObjectCalcer* parent() const; + ObjectCalcer* tqparent() const; const ObjectImpType* impRequirement( ObjectCalcer* o, const std::vector& os ) const; diff --git a/kig/objects/object_drawer.cc b/kig/objects/object_drawer.cc index f92fabe7..1fc0f2e0 100644 --- a/kig/objects/object_drawer.cc +++ b/kig/objects/object_drawer.cc @@ -32,8 +32,8 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const if ( mshown || nv ) { p.setBrushStyle( Qt::NoBrush ); - p.setBrushColor( sel ? Qt::red : ( mshown?mcolor:Qt::gray ) ); - p.setPen( TQPen ( sel ? Qt::red : ( mshown?mcolor:Qt::gray ), 1) ); + p.setBrushColor( sel ? TQt::red : ( mshown?mcolor:TQt::gray ) ); + p.setPen( TQPen ( sel ? TQt::red : ( mshown?mcolor:TQt::gray ), 1) ); p.setWidth( mwidth ); p.setStyle( mstyle ); p.setPointStyle( mpointstyle ); @@ -41,10 +41,10 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const } } -bool ObjectDrawer::contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const +bool ObjectDrawer::tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const { bool shownornv = mshown || nv; - return shownornv && imp.contains( pt, mwidth, w ); + return shownornv && imp.tqcontains( pt, mwidth, w ); } bool ObjectDrawer::shown( ) const @@ -133,7 +133,7 @@ ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, Qt::Pen } ObjectDrawer::ObjectDrawer() - : mcolor( Qt::blue ), mshown( true ), mwidth( -1 ), mstyle( Qt::SolidLine ), mpointstyle( 0 ) + : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( Qt::SolidLine ), mpointstyle( 0 ) { } @@ -170,7 +170,7 @@ TQString ObjectDrawer::pointStyleToString() const else if ( mpointstyle == 4 ) return "Cross"; assert( false ); - return TQString::null; + return TQString(); } Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style ) @@ -190,15 +190,15 @@ Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style ) TQString ObjectDrawer::styleToString() const { - if ( mstyle == Qt::SolidLine ) + if ( mstyle == TQt::SolidLine ) return "SolidLine"; - else if ( mstyle == Qt::DashLine ) + else if ( mstyle == TQt::DashLine ) return "DashLine"; - else if ( mstyle == Qt::DotLine ) + else if ( mstyle == TQt::DotLine ) return "DotLine"; - else if ( mstyle == Qt::DashDotLine ) + else if ( mstyle == TQt::DashDotLine ) return "DashDotLine"; - else if ( mstyle == Qt::DashDotDotLine ) + else if ( mstyle == TQt::DashDotDotLine ) return "DashDotDotLine"; return "SolidLine"; } diff --git a/kig/objects/object_drawer.h b/kig/objects/object_drawer.h index 6206522e..7fca8d4e 100644 --- a/kig/objects/object_drawer.h +++ b/kig/objects/object_drawer.h @@ -52,8 +52,8 @@ class ObjectDrawer int mpointstyle; public: /** - * Construct a new ObjectDrawer with a default color ( Qt::blue ), - * width ( -1 ), shown state ( true ), PenStyle ( Qt::SolidLine ), + * Construct a new ObjectDrawer with a default color ( TQt::blue ), + * width ( -1 ), shown state ( true ), PenStyle ( TQt::SolidLine ), * and pointstyle ( 0 ) */ ObjectDrawer(); @@ -68,7 +68,7 @@ public: * dependent on whether it is shown ( when it will never contain * anything ), and on its width.. */ - bool contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const; + bool tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const; /** * returns whether the object \p imp is in the rectangle \p r . This is * dependent on whether it is shown and on its width.. diff --git a/kig/objects/object_factory.cc b/kig/objects/object_factory.cc index f2957a7e..5b1a6add 100644 --- a/kig/objects/object_factory.cc +++ b/kig/objects/object_factory.cc @@ -109,21 +109,21 @@ ObjectTypeCalcer* ObjectFactory::relativePointCalcer( x = loc.x - reference.x; y = loc.y - reference.y; } - std::vector parents; - parents.push_back( new ObjectConstCalcer( new DoubleImp( x ) ) ); - parents.push_back( new ObjectConstCalcer( new DoubleImp( y ) ) ); - parents.push_back( o ); - return new ObjectTypeCalcer( RelativePointType::instance(), parents ); + std::vector tqparents; + tqparents.push_back( new ObjectConstCalcer( new DoubleImp( x ) ) ); + tqparents.push_back( new ObjectConstCalcer( new DoubleImp( y ) ) ); + tqparents.push_back( o ); + return new ObjectTypeCalcer( RelativePointType::instance(), tqparents ); } ObjectTypeCalcer* ObjectFactory::constrainedPointCalcer( ObjectCalcer* curve, double param ) const { assert( curve->imp()->inherits( CurveImp::stype() ) ); - std::vector parents; - parents.push_back( new ObjectConstCalcer( new DoubleImp( param ) ) ); - parents.push_back( curve ); - return new ObjectTypeCalcer( ConstrainedPointType::instance(), parents ); + std::vector tqparents; + tqparents.push_back( new ObjectConstCalcer( new DoubleImp( param ) ) ); + tqparents.push_back( curve ); + return new ObjectTypeCalcer( ConstrainedPointType::instance(), tqparents ); } ObjectHolder* ObjectFactory::constrainedPoint( @@ -152,24 +152,24 @@ ObjectTypeCalcer* ObjectFactory::locusCalcer( assert( dynamic_cast( a ) ); ObjectTypeCalcer* constrained = static_cast( a ); assert( constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ); - assert( constrained->parents().size() == 2 ); - ObjectCalcer* curve = a->parents().back(); + assert( constrained->tqparents().size() == 2 ); + ObjectCalcer* curve = a->tqparents().back(); const ObjectCalcer* moving = b; - std::vector hierparents; - hierparents.push_back( constrained ); - std::vector sideOfTree = sideOfTreePath( hierparents, moving ); - std::copy( sideOfTree.begin(), sideOfTree.end(), std::back_inserter( hierparents ) ); + std::vector hiertqparents; + hiertqparents.push_back( constrained ); + std::vector sideOfTree = sideOfTreePath( hiertqparents, moving ); + std::copy( sideOfTree.begin(), sideOfTree.end(), std::back_inserter( hiertqparents ) ); - ObjectHierarchy hier( hierparents, moving ); + ObjectHierarchy hier( hiertqparents, moving ); - std::vector realparents( 2 + sideOfTree.size(), 0 ); - realparents[0] = new ObjectConstCalcer( new HierarchyImp( hier ) ); - realparents[1] = curve; - copy( sideOfTree.begin(), sideOfTree.end(), realparents.begin() + 2 ); + std::vector realtqparents( 2 + sideOfTree.size(), 0 ); + realtqparents[0] = new ObjectConstCalcer( new HierarchyImp( hier ) ); + realtqparents[1] = curve; + copy( sideOfTree.begin(), sideOfTree.end(), realtqparents.begin() + 2 ); - return new ObjectTypeCalcer( LocusType::instance(), realparents ); + return new ObjectTypeCalcer( LocusType::instance(), realtqparents ); } ObjectHolder* ObjectFactory::locus( ObjectCalcer* a, ObjectCalcer* b ) const @@ -179,35 +179,35 @@ ObjectHolder* ObjectFactory::locus( ObjectCalcer* a, ObjectCalcer* b ) const ObjectHolder* ObjectFactory::label( const TQString& s, const Coordinate& loc, - bool needframe, const std::vector& parents, + bool needframe, const std::vector& tqparents, const KigDocument& doc ) const { - return new ObjectHolder( labelCalcer( s, loc, needframe, parents, doc ) ); + return new ObjectHolder( labelCalcer( s, loc, needframe, tqparents, doc ) ); } ObjectTypeCalcer* ObjectFactory::labelCalcer( const TQString& s, const Coordinate& loc, - bool needframe, const std::vector& parents, + bool needframe, const std::vector& tqparents, const KigDocument& doc ) const { - return attachedLabelCalcer( s, 0, loc, needframe, parents, doc ); + return attachedLabelCalcer( s, 0, loc, needframe, tqparents, doc ); } ObjectTypeCalcer* ObjectFactory::attachedLabelCalcer( const TQString& s, ObjectCalcer* p, const Coordinate& loc, bool needframe, - const std::vector& nparents, + const std::vector& ntqparents, const KigDocument& doc ) const { - std::vector parents; - parents.reserve( nparents.size() + 3 ); - parents.push_back( new ObjectConstCalcer( new IntImp( needframe ? 1 : 0 ) ) ); + std::vector tqparents; + tqparents.reserve( ntqparents.size() + 3 ); + tqparents.push_back( new ObjectConstCalcer( new IntImp( needframe ? 1 : 0 ) ) ); - parents.push_back( getAttachPoint( p, loc, doc ) ); + tqparents.push_back( getAttachPoint( p, loc, doc ) ); - parents.push_back( new ObjectConstCalcer( new StringImp( s ) ) ); - std::copy( nparents.begin(), nparents.end(), std::back_inserter( parents ) ); - ObjectTypeCalcer* ret = new ObjectTypeCalcer( TextType::instance(), parents ); + tqparents.push_back( new ObjectConstCalcer( new StringImp( s ) ) ); + std::copy( ntqparents.begin(), ntqparents.end(), std::back_inserter( tqparents ) ); + ObjectTypeCalcer* ret = new ObjectTypeCalcer( TextType::instance(), tqparents ); ret->calc( doc ); return ret; } @@ -266,18 +266,18 @@ ObjectCalcer* ObjectFactory::getAttachPoint( } ObjectHolder* ObjectFactory::attachedLabel( - const TQString& s, ObjectCalcer* locationparent, + const TQString& s, ObjectCalcer* locationtqparent, const Coordinate& loc, bool needframe, - const std::vector& parents, + const std::vector& tqparents, const KigDocument& doc ) const { - return new ObjectHolder( attachedLabelCalcer( s, locationparent, loc, needframe, parents, doc ) ); + return new ObjectHolder( attachedLabelCalcer( s, locationtqparent, loc, needframe, tqparents, doc ) ); } ObjectPropertyCalcer* ObjectFactory::propertyObjectCalcer( ObjectCalcer* o, const char* p ) const { - int wp = o->imp()->propertiesInternalNames().findIndex( p ); + int wp = o->imp()->propertiesInternalNames().tqfindIndex( p ); if ( wp == -1 ) return 0; return new ObjectPropertyCalcer( o, wp ); } @@ -299,12 +299,12 @@ void ObjectFactory::redefinePoint( std::mem_fun( calcmeth ) ); ObjectCalcer* v = 0; - // we don't want one of our children as a parent... - std::set children = getAllChildren( point ); + // we don't want one of our tqchildren as a tqparent... + std::set tqchildren = getAllChildren( point ); for ( std::vector::iterator i = os.begin(); i != os.end(); ++i ) if ( (*i)->imp()->inherits( CurveImp::stype() ) && - children.find( *i ) == children.end() ) + tqchildren.find( *i ) == tqchildren.end() ) { v = *i; break; @@ -321,15 +321,15 @@ void ObjectFactory::redefinePoint( // point already was constrained -> simply update the param // DataObject and make sure point is on the right curve... ObjectCalcer* dataobj = 0; - std::vector parents = point->parents(); - assert( parents.size() == 2 ); - assert ( parents[0]->imp()->inherits( DoubleImp::stype() ) ); - dataobj = parents[0]; - - parents.clear(); - parents.push_back( dataobj ); - parents.push_back( v ); - point->setParents( parents ); + std::vector tqparents = point->tqparents(); + assert( tqparents.size() == 2 ); + assert ( tqparents[0]->imp()->inherits( DoubleImp::stype() ) ); + dataobj = tqparents[0]; + + tqparents.clear(); + tqparents.push_back( dataobj ); + tqparents.push_back( v ); + point->setParents( tqparents ); assert( dynamic_cast( dataobj ) ); static_cast( dataobj )->setImp( diff --git a/kig/objects/object_factory.h b/kig/objects/object_factory.h index 30f080d9..f3a28d66 100644 --- a/kig/objects/object_factory.h +++ b/kig/objects/object_factory.h @@ -94,26 +94,26 @@ public: ObjectHolder* locus( ObjectCalcer* a, ObjectCalcer* b ) const; /** - * returns a label with text \p s at point \p c .. It ( and its parents ) + * returns a label with text \p s at point \p c .. It ( and its tqparents ) * is calced already... */ ObjectHolder* label( const TQString& s, const Coordinate& loc, - bool needframe, const std::vector& parents, + bool needframe, const std::vector& tqparents, const KigDocument& doc ) const; ObjectTypeCalcer* labelCalcer( const TQString& s, const Coordinate& loc, - bool needframe, const std::vector& parents, + bool needframe, const std::vector& tqparents, const KigDocument& doc ) const; /** * this one does the same as the above, only that the new label is - * attached to locationparent if it is non-null.. + * attached to locationtqparent if it is non-null.. */ ObjectTypeCalcer* attachedLabelCalcer( - const TQString& s, ObjectCalcer* locationparent, + const TQString& s, ObjectCalcer* locationtqparent, const Coordinate& loc, bool needframe, - const std::vector& parents, + const std::vector& tqparents, const KigDocument& doc ) const; /** * this has been added because it comes handy when redefining @@ -121,13 +121,13 @@ public: * attach point from the method above */ ObjectCalcer* getAttachPoint( - ObjectCalcer* locationparent, + ObjectCalcer* locationtqparent, const Coordinate& loc, const KigDocument& doc ) const; ObjectHolder* attachedLabel( - const TQString& s, ObjectCalcer* locationparent, + const TQString& s, ObjectCalcer* locationtqparent, const Coordinate& loc, bool needframe, - const std::vector& parents, + const std::vector& tqparents, const KigDocument& doc ) const; /** diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cc index 70e1100b..49e6da9d 100644 --- a/kig/objects/object_holder.cc +++ b/kig/objects/object_holder.cc @@ -80,9 +80,9 @@ void ObjectHolder::draw( KigPainter& p, bool selected ) const mdrawer->draw( *imp(), p, selected ); } -bool ObjectHolder::contains( const Coordinate& pt, const KigWidget& w, bool nv ) const +bool ObjectHolder::tqcontains( const Coordinate& pt, const KigWidget& w, bool nv ) const { - return mdrawer->contains( *imp(), pt, w, nv ); + return mdrawer->tqcontains( *imp(), pt, w, nv ); } bool ObjectHolder::inRect( const Rect& r, const KigWidget& w ) const @@ -145,7 +145,7 @@ const TQString ObjectHolder::name() const return static_cast( mnamecalcer->imp() )->data(); } else - return TQString::null; + return TQString(); } void ObjectHolder::setNameCalcer( ObjectConstCalcer* namecalcer ) @@ -160,5 +160,5 @@ TQString ObjectHolder::selectStatement() const if ( n.isEmpty() ) return i18n( imp()->type()->selectStatement() ); else - return i18n( imp()->type()->selectNameStatement() ).arg( n ); + return i18n( imp()->type()->selectNameStatement() ).tqarg( n ); } diff --git a/kig/objects/object_holder.h b/kig/objects/object_holder.h index 0afd3892..0666fef1 100644 --- a/kig/objects/object_holder.h +++ b/kig/objects/object_holder.h @@ -77,7 +77,7 @@ public: void setNameCalcer( ObjectConstCalcer* namecalcer ); /** - * returns TQString::null if no name is set. + * returns TQString() if no name is set. */ const TQString name() const; /** @@ -103,7 +103,7 @@ public: /** * Returns whether this object contains the point \p p . */ - bool contains( const Coordinate& p, const KigWidget& w, bool nv = false ) const; + bool tqcontains( const Coordinate& p, const KigWidget& w, bool nv = false ) const; /** * Returns whether this object is in the rectangle \p r . */ diff --git a/kig/objects/object_imp.cc b/kig/objects/object_imp.cc index 9a3ee679..7b2498a3 100644 --- a/kig/objects/object_imp.cc +++ b/kig/objects/object_imp.cc @@ -178,7 +178,7 @@ bool ObjectImp::canFillInNextEscape() const return false; } -ObjectImpType::ObjectImpType( const ObjectImpType* parent, +ObjectImpType::ObjectImpType( const ObjectImpType* tqparent, const char* internalname, const char* translatedname, const char* selectstatement, @@ -189,7 +189,7 @@ ObjectImpType::ObjectImpType( const ObjectImpType* parent, const char* attachtothisstatement, const char* showastatement, const char* hideastatement ) - : mparent( parent ), minternalname( internalname ), + : mtqparent( tqparent ), minternalname( internalname ), mtranslatedname( translatedname ), mselectstatement( selectstatement ), mselectnamestatement( selectnamestatement ), mremoveastatement( removeastatement ), maddastatement( addastatement ), @@ -207,7 +207,7 @@ ObjectImpType::~ObjectImpType() bool ObjectImpType::inherits( const ObjectImpType* t ) const { - return t == this || (mparent && mparent->inherits( t ) ); + return t == this || (mtqparent && mtqparent->inherits( t ) ); } const char* ObjectImpType::internalName() const diff --git a/kig/objects/object_imp.h b/kig/objects/object_imp.h index eaf29328..20484ecf 100644 --- a/kig/objects/object_imp.h +++ b/kig/objects/object_imp.h @@ -87,7 +87,7 @@ typedef unsigned int uint; */ class ObjectImpType { - const ObjectImpType* mparent; + const ObjectImpType* mtqparent; const char* minternalname; const char* mtranslatedname; const char* mselectstatement; @@ -126,12 +126,12 @@ public: * hideastatement is a translatable string like "Hide a Segment" * * All translatable strings should have - * I18N_NOOP around them ! @param parent is the ObjectImpType of - * your parent ObjectImp type. Never give 0 as parent, except for + * I18N_NOOP around them ! @param tqparent is the ObjectImpType of + * your tqparent ObjectImp type. Never give 0 as tqparent, except for * the top ObjectImp ObjectImpType.. */ ObjectImpType( - const ObjectImpType* parent, const char* internalname, + const ObjectImpType* tqparent, const char* internalname, const char* translatedname, const char* selectstatement, const char* selectnamestatement, @@ -170,7 +170,7 @@ public: * Returns a translatable string of the form "Select point %1". %1 * will be filled in by whomever calls this function with the name * of the object in question. This function should be used as - * follows: i18n( x->selectNameStatement() ).arg( xname ). + * follows: i18n( x->selectNameStatement() ).tqarg( xname ). */ const char* selectNameStatement() const; @@ -268,7 +268,7 @@ public: virtual ObjectImp* transform( const Transformation& t ) const = 0; virtual void draw( KigPainter& p ) const = 0; - virtual bool contains( const Coordinate& p, int width, + virtual bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const = 0; virtual bool inRect( const Rect& r, int width, const KigWidget& si ) const = 0; diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc index 65cd9c94..116f0d0d 100644 --- a/kig/objects/object_imp_factory.cc +++ b/kig/objects/object_imp_factory.cc @@ -48,25 +48,25 @@ ObjectImpFactory::~ObjectImpFactory() { } -static void addXYElements( const Coordinate& c, TQDomElement& parent, TQDomDocument& doc ) +static void addXYElements( const Coordinate& c, TQDomElement& tqparent, TQDomDocument& doc ) { TQDomElement xe = doc.createElement( "x" ); xe.appendChild( doc.createTextNode( TQString::number( c.x ) ) ); - parent.appendChild( xe ); + tqparent.appendChild( xe ); TQDomElement ye = doc.createElement( "y" ); ye.appendChild( doc.createTextNode( TQString::number( c.y ) ) ); - parent.appendChild( ye ); + tqparent.appendChild( ye ); } -static void addDoubleElement( const char* name, double d, TQDomElement& parent, TQDomDocument& doc ) +static void addDoubleElement( const char* name, double d, TQDomElement& tqparent, TQDomDocument& doc ) { TQDomElement e = doc.createElement( name ); e.appendChild( doc.createTextNode( TQString::number( d ) ) ); - parent.appendChild( e ); + tqparent.appendChild( e ); } static void addCoordinateElement( const char* name, const Coordinate& d, TQDomElement& p, TQDomDocument& doc ) @@ -76,41 +76,41 @@ static void addCoordinateElement( const char* name, const Coordinate& d, TQDomEl p.appendChild( e ); } -TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, +TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent, TQDomDocument& doc ) const { if( d.inherits( IntImp::stype() ) ) { - parent.appendChild( + tqparent.appendChild( doc.createTextNode( TQString::number( static_cast( d ).data() ) ) ); - return TQString::fromLatin1( "int" ); + return TQString::tqfromLatin1( "int" ); } else if ( d.inherits( DoubleImp::stype() ) ) { - parent.appendChild( + tqparent.appendChild( doc.createTextNode( TQString::number( static_cast( d ).data() ) ) ); - return TQString::fromLatin1( "double" ); + return TQString::tqfromLatin1( "double" ); } else if( d.inherits( StringImp::stype() ) ) { - parent.appendChild( + tqparent.appendChild( doc.createTextNode( static_cast( d ).data() ) ); - return TQString::fromLatin1( "string" ); + return TQString::tqfromLatin1( "string" ); } else if ( d.inherits( TestResultImp::stype() ) ) { - parent.appendChild( + tqparent.appendChild( doc.createTextNode( static_cast( d ).data() ) ); - return TQString::fromLatin1( "testresult" ); + return TQString::tqfromLatin1( "testresult" ); } else if( d.inherits( HierarchyImp::stype() ) ) { - static_cast( d ).data().serialize( parent, doc ); - return TQString::fromLatin1( "hierarchy" ); + static_cast( d ).data().serialize( tqparent, doc ); + return TQString::tqfromLatin1( "hierarchy" ); } else if ( d.inherits( TransformationImp::stype() ) ) { @@ -128,58 +128,58 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, matrixe.appendChild( elel ); }; } - parent.appendChild( matrixe ); + tqparent.appendChild( matrixe ); TQDomElement homothetye = doc.createElement( "homothetic" ); const char* ishomothety = trans.isHomothetic() ? "true" : "false"; homothetye.appendChild( doc.createTextNode( ishomothety ) ); - parent.appendChild( homothetye ); + tqparent.appendChild( homothetye ); - return TQString::fromLatin1( "transformation" ); + return TQString::tqfromLatin1( "transformation" ); } else if( d.inherits( AbstractLineImp::stype() ) ) { LineData l = static_cast( d ).data(); - addCoordinateElement( "a", l.a, parent, doc ); - addCoordinateElement( "b", l.b, parent, doc ); + addCoordinateElement( "a", l.a, tqparent, doc ); + addCoordinateElement( "b", l.b, tqparent, doc ); if( d.inherits( SegmentImp::stype() ) ) - return TQString::fromLatin1( "segment" ); + return TQString::tqfromLatin1( "segment" ); else if( d.inherits( RayImp::stype() ) ) - return TQString::fromLatin1( "ray" ); - else return TQString::fromLatin1( "line" ); + return TQString::tqfromLatin1( "ray" ); + else return TQString::tqfromLatin1( "line" ); } else if( d.inherits( PointImp::stype() ) ) { addXYElements( static_cast( d ).coordinate(), - parent, doc ); - return TQString::fromLatin1( "point" ); + tqparent, doc ); + return TQString::tqfromLatin1( "point" ); } else if( d.inherits( TextImp::stype() ) ) { TQString text = static_cast( d ).text(); - parent.appendChild( + tqparent.appendChild( doc.createTextNode( text ) ); - return TQString::fromLatin1( "text" ); + return TQString::tqfromLatin1( "text" ); } else if( d.inherits( AngleImp::stype() ) ) { - addDoubleElement( "size", static_cast( d ).size(), parent, doc ); - return TQString::fromLatin1( "angle" ); + addDoubleElement( "size", static_cast( d ).size(), tqparent, doc ); + return TQString::tqfromLatin1( "angle" ); } else if ( d.inherits( ArcImp::stype() ) ) { const ArcImp& a = static_cast( d ); - addCoordinateElement( "center", a.center(), parent, doc ); - addDoubleElement( "radius", a.radius(), parent, doc ); - addDoubleElement( "startangle", a.startAngle(), parent, doc ); - addDoubleElement( "angle", a.angle(), parent, doc ); - return TQString::fromLatin1( "arc" ); + addCoordinateElement( "center", a.center(), tqparent, doc ); + addDoubleElement( "radius", a.radius(), tqparent, doc ); + addDoubleElement( "startangle", a.startAngle(), tqparent, doc ); + addDoubleElement( "angle", a.angle(), tqparent, doc ); + return TQString::tqfromLatin1( "arc" ); } else if( d.inherits( VectorImp::stype() ) ) { Coordinate dir = static_cast( d ).dir(); - addXYElements( dir, parent, doc ); - return TQString::fromLatin1( "vector" ); + addXYElements( dir, tqparent, doc ); + return TQString::tqfromLatin1( "vector" ); } else if( d.inherits( LocusImp::stype() ) ) { @@ -190,30 +190,30 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, const CurveImp& curveimp = *locus.curve(); TQString type = serialize( curveimp, curve, doc ); curve.setAttribute( "type", type ); - parent.appendChild( curve ); + tqparent.appendChild( curve ); // serialize the hierarchy.. TQDomElement hier = doc.createElement( "calculation" ); locus.hierarchy().serialize( hier, doc ); - parent.appendChild( hier ); + tqparent.appendChild( hier ); - return TQString::fromLatin1( "locus" ); + return TQString::tqfromLatin1( "locus" ); } else if( d.inherits( CircleImp::stype() ) ) { const CircleImp& c = static_cast( d ); - addCoordinateElement( "center", c.center(), parent, doc ); - addDoubleElement( "radius", c.radius(), parent, doc ); - return TQString::fromLatin1( "circle" ); + addCoordinateElement( "center", c.center(), tqparent, doc ); + addDoubleElement( "radius", c.radius(), tqparent, doc ); + return TQString::tqfromLatin1( "circle" ); } else if( d.inherits( ConicImp::stype() ) ) { const ConicPolarData data = static_cast( d ).polarData(); - addCoordinateElement( "focus1", data.focus1, parent, doc ); - addDoubleElement( "pdimen", data.pdimen, parent, doc ); - addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc ); - addDoubleElement( "esintheta0", data.esintheta0, parent, doc ); - return TQString::fromLatin1( "conic" ); + addCoordinateElement( "focus1", data.focus1, tqparent, doc ); + addDoubleElement( "pdimen", data.pdimen, tqparent, doc ); + addDoubleElement( "ecostheta0", data.ecostheta0, tqparent, doc ); + addDoubleElement( "esintheta0", data.esintheta0, tqparent, doc ); + return TQString::tqfromLatin1( "conic" ); } else if( d.inherits( CubicImp::stype() ) ) { @@ -229,11 +229,11 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, addDoubleElement( "a112", data.coeffs[7], coeffs, doc ); addDoubleElement( "a122", data.coeffs[8], coeffs, doc ); addDoubleElement( "a222", data.coeffs[9], coeffs, doc ); - parent.appendChild( coeffs ); - return TQString::fromLatin1( "cubic" ); + tqparent.appendChild( coeffs ); + return TQString::tqfromLatin1( "cubic" ); } assert( false ); - return TQString::null; + return TQString(); } static Coordinate readXYElements( const TQDomElement& e, bool& ok ) @@ -285,40 +285,40 @@ static double readDoubleElement( TQDomNode n, bool& ok, } ObjectImp* ObjectImpFactory::deserialize( const TQString& type, - const TQDomElement& parent, + const TQDomElement& tqparent, TQString& error ) const { #define KIG_GENERIC_PARSE_ERROR \ { \ error = i18n( "An error was encountered at line %1 in file %2." ) \ - .arg( __LINE__ ).arg( __FILE__ ); \ + .tqarg( __LINE__ ).tqarg( __FILE__ ); \ return 0; \ } bool ok = true; if ( type == "int" ) { - int ret = parent.text().toInt( &ok ); + int ret = tqparent.text().toInt( &ok ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new IntImp( ret ); } else if ( type == "double" ) { - double ret = parent.text().toDouble( &ok ); + double ret = tqparent.text().toDouble( &ok ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new DoubleImp( ret ); } else if ( type == "string" ) { - return new StringImp( parent.text() ); + return new StringImp( tqparent.text() ); } else if ( type == "testresult" ) { - return new TestResultImp( parent.text() ); + return new TestResultImp( tqparent.text() ); } else if ( type == "hierarchy" ) { - ObjectHierarchy* hier = ObjectHierarchy::buildSafeObjectHierarchy( parent, error ); + ObjectHierarchy* hier = ObjectHierarchy::buildSafeObjectHierarchy( tqparent, error ); if ( ! hier ) return 0; HierarchyImp* imp = new HierarchyImp( *hier ); delete hier; @@ -328,7 +328,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, { double data[3][3]; bool homothetic = false; - for ( TQDomElement childe = parent.firstChild().toElement(); + for ( TQDomElement childe = tqparent.firstChild().toElement(); ! childe.isNull(); childe = childe.nextSibling().toElement() ) { if ( childe.tagName() == "matrix" ) @@ -357,13 +357,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if ( type == "point" ) { - Coordinate ret = readXYElements( parent, ok ); + Coordinate ret = readXYElements( tqparent, ok ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new PointImp( ret ); } else if ( type == "line" || type == "segment" || type == "ray" ) { - TQDomNode n = parent.firstChild(); + TQDomNode n = tqparent.firstChild(); Coordinate a = readCoordinateElement( n, ok, "a" ); if ( !ok ) KIG_GENERIC_PARSE_ERROR; n = n.nextSibling(); @@ -375,13 +375,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "angle" ) { - double size = readDoubleElement( parent.firstChild(), ok, "size" ); + double size = readDoubleElement( tqparent.firstChild(), ok, "size" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new AngleImp( Coordinate(), 0, size ); } else if ( type == "arc" ) { - TQDomNode n = parent.firstChild(); + TQDomNode n = tqparent.firstChild(); Coordinate center = readCoordinateElement( n, ok, "center" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; n = n.nextSibling(); @@ -397,13 +397,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "vector" ) { - Coordinate dir = readXYElements( parent, ok ); + Coordinate dir = readXYElements( tqparent, ok ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new VectorImp( Coordinate(), dir ); } else if( type == "locus" ) { - TQDomElement curvee = parent.firstChild().toElement(); + TQDomElement curvee = tqparent.firstChild().toElement(); if ( curvee.isNull() || curvee.tagName() != "curve" ) KIG_GENERIC_PARSE_ERROR; TQString type = curvee.attribute( "type" ); ObjectImp* oi = deserialize( type, curvee, error ); @@ -417,7 +417,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "circle" ) { - TQDomNode n = parent.firstChild(); + TQDomNode n = tqparent.firstChild(); Coordinate center = readCoordinateElement( n, ok, "center" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; @@ -429,7 +429,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "conic" ) { - TQDomNode n = parent.firstChild(); + TQDomNode n = tqparent.firstChild(); Coordinate focus1 = readCoordinateElement( n, ok, "focus1" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; @@ -450,7 +450,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "cubic" ) { - TQDomElement coeffse = parent.firstChild().toElement(); + TQDomElement coeffse = tqparent.firstChild().toElement(); if ( coeffse.isNull() || coeffse.tagName() != "coefficients" ) KIG_GENERIC_PARSE_ERROR; @@ -504,7 +504,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, "which this Kig version does not support." "Perhaps you have compiled Kig without support " "for this object type," - "or perhaps you are using an older Kig version." ).arg( type ); + "or perhaps you are using an older Kig version." ).tqarg( type ); return 0; } diff --git a/kig/objects/object_imp_factory.h b/kig/objects/object_imp_factory.h index 1ac08dde..6056f45d 100644 --- a/kig/objects/object_imp_factory.h +++ b/kig/objects/object_imp_factory.h @@ -27,14 +27,14 @@ class ObjectImpFactory public: static const ObjectImpFactory* instance(); /** - * loads data from \p parent , and returns a new ObjectImp from the type + * loads data from \p tqparent , and returns a new ObjectImp from the type * string \p type . */ - ObjectImp* deserialize( const TQString& type, const TQDomElement& parent, TQString& error ) const; + ObjectImp* deserialize( const TQString& type, const TQDomElement& tqparent, TQString& error ) const; /** - * adds data to \p parent , and returns a type string.. + * adds data to \p tqparent , and returns a type string.. */ - TQString serialize( const ObjectImp& d, TQDomElement& parent, TQDomDocument& doc ) const; + TQString serialize( const ObjectImp& d, TQDomElement& tqparent, TQDomDocument& doc ) const; }; #endif diff --git a/kig/objects/object_type.cc b/kig/objects/object_type.cc index ea85e4f8..93634b63 100644 --- a/kig/objects/object_type.cc +++ b/kig/objects/object_type.cc @@ -71,9 +71,9 @@ ArgsParserObjectType::ArgsParserObjectType( const char fulltypename[], { } -const ObjectImpType* ArgsParserObjectType::impRequirement( const ObjectImp* o, const Args& parents ) const +const ObjectImpType* ArgsParserObjectType::impRequirement( const ObjectImp* o, const Args& tqparents ) const { - return margsparser.impRequirement( o, parents ); + return margsparser.impRequirement( o, tqparents ); } const ArgsParser& ArgsParserObjectType::argsParser() const @@ -118,8 +118,8 @@ std::vector ObjectType::movableParents( const ObjectTypeCalcer& ) return std::vector(); } -bool ArgsParserObjectType::isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const +bool ArgsParserObjectType::isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const { - return margsparser.isDefinedOnOrThrough( o, parents ); + return margsparser.isDefinedOnOrThrough( o, tqparents ); } diff --git a/kig/objects/object_type.h b/kig/objects/object_type.h index 54471e46..60b32026 100644 --- a/kig/objects/object_type.h +++ b/kig/objects/object_type.h @@ -45,7 +45,7 @@ public: virtual bool inherits( int type ) const; - virtual ObjectImp* calc( const Args& parents, const KigDocument& d ) const = 0; + virtual ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const = 0; virtual bool canMove( const ObjectTypeCalcer& ourobj ) const; virtual bool isFreelyTranslatable( const ObjectTypeCalcer& ourobj ) const; @@ -57,19 +57,19 @@ public: const char* fullName() const; /** - * Supposing that \p parents would be given as parents to + * Supposing that \p tqparents would be given as tqparents to * this type's calc function, this function returns the ObjectImp id - * that \p o should at least have.. ( \p o should be part of \p parents ) + * that \p o should at least have.. ( \p o should be part of \p tqparents ) */ - virtual const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const = 0; + virtual const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const = 0; /** - * Supposing that \p parents would be given as parents to this type's + * Supposing that \p tqparents would be given as tqparents to this type's * calc function, this function returns whether the returned * ObjectImp will be, by construction, on \p o ( if \p o is a curve ), or * through \p o ( if \p o is a point ). */ - virtual bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const = 0; + virtual bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const = 0; /** * returns the ObjectImp id of the ObjectImp's produced by this @@ -108,7 +108,7 @@ public: /** * This is a convenience subclass of ObjectType that a type should - * inherit from if its parents can be specified in an ArgsParser.. + * inherit from if its tqparents can be specified in an ArgsParser.. */ class ArgsParserObjectType : public ObjectType @@ -119,8 +119,8 @@ protected: const struct ArgsParser::spec argsspec[], int n ); public: - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; const ArgsParser& argsParser() const; std::vector sortArgs( const std::vector& args ) const; diff --git a/kig/objects/object_type_factory.cc b/kig/objects/object_type_factory.cc index a6d527ce..aa69f958 100644 --- a/kig/objects/object_type_factory.cc +++ b/kig/objects/object_type_factory.cc @@ -56,11 +56,11 @@ ObjectTypeFactory* ObjectTypeFactory::instance() void ObjectTypeFactory::add( const ObjectType* type ) { - assert( mmap.find( std::string( type->fullName() ) ) == mmap.end() ); + assert( mmap.tqfind( std::string( type->fullName() ) ) == mmap.end() ); mmap[std::string( type->fullName() )] = type; } -const ObjectType* ObjectTypeFactory::find( const char* name ) const +const ObjectType* ObjectTypeFactory::tqfind( const char* name ) const { maptype::const_iterator i = mmap.find( std::string( name ) ); if ( i == mmap.end() ) return 0; diff --git a/kig/objects/object_type_factory.h b/kig/objects/object_type_factory.h index c1371d67..97f4f0c3 100644 --- a/kig/objects/object_type_factory.h +++ b/kig/objects/object_type_factory.h @@ -34,7 +34,7 @@ class ObjectTypeFactory public: static ObjectTypeFactory* instance(); void add( const ObjectType* type ); - const ObjectType* find( const char* name ) const; + const ObjectType* tqfind( const char* name ) const; }; #endif diff --git a/kig/objects/other_imp.cc b/kig/objects/other_imp.cc index 137a3e93..66da40a9 100644 --- a/kig/objects/other_imp.cc +++ b/kig/objects/other_imp.cc @@ -56,7 +56,7 @@ AngleImp::AngleImp( const Coordinate& pt, double start_angle_in_radials, { } -bool AngleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const +bool AngleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const { double radius = 50*w.screenInfo().pixelWidth(); @@ -73,7 +73,7 @@ bool AngleImp::contains( const Coordinate& p, int width, const KigWidget& w ) co bool AngleImp::inRect( const Rect& r, int width, const KigWidget& w ) const { // TODO ? - return r.contains( mpoint, w.screenInfo().normalMiss( width ) ); + return r.tqcontains( mpoint, w.screenInfo().normalMiss( width ) ); } Coordinate AngleImp::attachPoint() const @@ -179,7 +179,7 @@ void VectorImp::draw( KigPainter& p ) const p.drawVector( mdata.a, mdata.b ); } -bool VectorImp::contains( const Coordinate& o, int width, const KigWidget& w ) const +bool VectorImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -340,7 +340,7 @@ void ArcImp::draw( KigPainter& p ) const p.drawArc( mcenter, mradius, msa, ma ); } -bool ArcImp::contains( const Coordinate& p, int width, const KigWidget& w ) const +bool ArcImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } diff --git a/kig/objects/other_imp.h b/kig/objects/other_imp.h index 8e716fa6..56e8c387 100644 --- a/kig/objects/other_imp.h +++ b/kig/objects/other_imp.h @@ -49,7 +49,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; @@ -113,7 +113,7 @@ public: double getParam( const Coordinate&, const KigDocument& ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; @@ -186,7 +186,7 @@ public: ObjectImp* transform( const Transformation& t ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& w ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const; bool inRect( const Rect& r, int width, const KigWidget& si ) const; Rect surroundingRect() const; bool valid() const; diff --git a/kig/objects/other_type.cc b/kig/objects/other_type.cc index 27787986..7d632524 100644 --- a/kig/objects/other_type.cc +++ b/kig/objects/other_type.cc @@ -103,10 +103,10 @@ bool CopyObjectType::inherits( int ) const return false; } -ObjectImp* CopyObjectType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* CopyObjectType::calc( const Args& tqparents, const KigDocument& ) const { - assert( parents.size() == 1 ); - return parents[0]->copy(); + assert( tqparents.size() == 1 ); + return tqparents[0]->copy(); } const ObjectImpType* CopyObjectType::impRequirement( const ObjectImp*, const Args& ) const @@ -120,19 +120,19 @@ const ObjectImpType* CopyObjectType::resultId() const return ObjectImp::stype(); } -const ObjectImpType* LocusType::impRequirement( const ObjectImp* o, const Args& parents ) const +const ObjectImpType* LocusType::impRequirement( const ObjectImp* o, const Args& tqparents ) const { - assert( parents.size() >= 2 ); - Args firsttwo( parents.begin(), parents.begin() + 2 ); - if ( o == parents[0] || o == parents[1] ) + assert( tqparents.size() >= 2 ); + Args firsttwo( tqparents.begin(), tqparents.begin() + 2 ); + if ( o == tqparents[0] || o == tqparents[1] ) return margsparser.impRequirement( o, firsttwo ); else { - const HierarchyImp* h = dynamic_cast( parents[0] ); + const HierarchyImp* h = dynamic_cast( tqparents[0] ); if ( h ) { PointImp* p = new PointImp( Coordinate() ); - Args hargs( parents.begin()+ 2, parents.end() ); + Args hargs( tqparents.begin()+ 2, tqparents.end() ); hargs.push_back( p ); ArgsParser hparser = h->data().argParser(); const ObjectImpType* ret = hparser.impRequirement( o, hargs ); @@ -182,7 +182,7 @@ Args CopyObjectType::sortArgs( const Args& args ) const bool CopyObjectType::isDefinedOnOrThrough( const ObjectImp*, const Args& ) const { - // TODO: vragen aan parent ? + // TODO: vragen aan tqparent ? // TODO: translate the above TODO ? return false; } diff --git a/kig/objects/other_type.h b/kig/objects/other_type.h index 6bbcead1..f8f24209 100644 --- a/kig/objects/other_type.h +++ b/kig/objects/other_type.h @@ -32,7 +32,7 @@ public: ObjectImp* calc( const Args& args, const KigDocument& ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; bool inherits( int type ) const; const ObjectImpType* resultId() const; @@ -50,9 +50,9 @@ protected: public: static CopyObjectType* instance(); bool inherits( int type ) const; - ObjectImp* calc( const Args& parents, const KigDocument& d ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; const ObjectImpType* resultId() const; std::vector sortArgs( const std::vector& os ) const; Args sortArgs( const Args& args ) const; diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc index 539f98b3..b2f9b1c1 100644 --- a/kig/objects/point_imp.cc +++ b/kig/objects/point_imp.cc @@ -42,7 +42,7 @@ void PointImp::draw( KigPainter& p ) const p.drawFatPoint( mc ); } -bool PointImp::contains( const Coordinate& p, int width, const KigWidget& w ) const +bool PointImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const { int twidth = width == -1 ? 5 : width; return (p - mc).length() - twidth*w.screenInfo().pixelWidth() < 0; @@ -51,7 +51,7 @@ bool PointImp::contains( const Coordinate& p, int width, const KigWidget& w ) co bool PointImp::inRect( const Rect& r, int width, const KigWidget& w ) const { double am = w.screenInfo().normalMiss( width ); - return r.contains( mc, am ); + return r.tqcontains( mc, am ); } const uint PointImp::numberOfProperties() const @@ -137,7 +137,7 @@ void PointImp::setCoordinate( const Coordinate& c ) void PointImp::fillInNextEscape( TQString& s, const KigDocument& doc ) const { - s = s.arg( doc.coordinateSystem().fromScreen( mc, doc ) ); + s = s.tqarg( doc.coordinateSystem().fromScreen( mc, doc ) ); } void PointImp::visit( ObjectImpVisitor* vtor ) const diff --git a/kig/objects/point_imp.h b/kig/objects/point_imp.h index dac0576c..6a2db06f 100644 --- a/kig/objects/point_imp.h +++ b/kig/objects/point_imp.h @@ -54,7 +54,7 @@ public: void setCoordinate( const Coordinate& c ); void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; const uint numberOfProperties() const; diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc index 2acd8479..74fc9d37 100644 --- a/kig/objects/point_type.cc +++ b/kig/objects/point_type.cc @@ -52,12 +52,12 @@ FixedPointType::~FixedPointType() { } -ObjectImp* FixedPointType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* FixedPointType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - double a = static_cast( parents[0] )->data(); - double b = static_cast( parents[1] )->data(); + double a = static_cast( tqparents[0] )->data(); + double b = static_cast( tqparents[1] )->data(); return new PointImp( Coordinate( a, b ) ); } @@ -80,14 +80,14 @@ RelativePointType::~RelativePointType() { } -ObjectImp* RelativePointType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* RelativePointType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - if ( ! parents[2]->attachPoint().valid() ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! tqparents[2]->attachPoint().valid() ) return new InvalidImp; - Coordinate reference = static_cast( parents[2] )->attachPoint(); - double a = static_cast( parents[0] )->data(); - double b = static_cast( parents[1] )->data(); + Coordinate reference = static_cast( tqparents[2] )->attachPoint(); + double a = static_cast( tqparents[0] )->data(); + double b = static_cast( tqparents[1] )->data(); return new PointImp( reference + Coordinate( a, b ) ); } @@ -109,12 +109,12 @@ const CursorPointType* CursorPointType::instance() return &t; } -ObjectImp* CursorPointType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* CursorPointType::calc( const Args& tqparents, const KigDocument& ) const { - assert ( parents[0]->inherits( DoubleImp::stype() ) ); - assert ( parents[1]->inherits( DoubleImp::stype() ) ); - double a = static_cast( parents[0] )->data(); - double b = static_cast( parents[1] )->data(); + assert ( tqparents[0]->inherits( DoubleImp::stype() ) ); + assert ( tqparents[1]->inherits( DoubleImp::stype() ) ); + double a = static_cast( tqparents[0] )->data(); + double b = static_cast( tqparents[1] )->data(); return new BogusPointImp( Coordinate( a, b ) ); } @@ -124,12 +124,12 @@ const ObjectImpType* CursorPointType::resultId() const return BogusPointImp::stype(); } -ObjectImp* ConstrainedPointType::calc( const Args& parents, const KigDocument& doc ) const +ObjectImp* ConstrainedPointType::calc( const Args& tqparents, const KigDocument& doc ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - double param = static_cast( parents[0] )->data(); - const Coordinate nc = static_cast( parents[1] )->getPoint( param, doc ); + double param = static_cast( tqparents[0] )->data(); + const Coordinate nc = static_cast( tqparents[1] )->getPoint( param, doc ); if ( nc.valid() ) return new PointImp( nc ); else return new InvalidImp; } @@ -155,7 +155,7 @@ void FixedPointType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, const KigDocument& ) const { // fetch the old coord..; - std::vector pa = ourobj.parents(); + std::vector pa = ourobj.tqparents(); assert( margsparser.checkArgs( pa ) ); assert( dynamic_cast( pa.front() ) ); assert( dynamic_cast( pa.back() ) ); @@ -173,7 +173,7 @@ void RelativePointType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, // fetch the attach point..; // this routine is tightly paired with what moveReferencePoint returns! // right now moveReferencePoint always returns the origin - std::vector pa = ourobj.parents(); + std::vector pa = ourobj.tqparents(); assert( margsparser.checkArgs( pa ) ); assert( dynamic_cast( pa[0] ) ); assert( dynamic_cast( pa[1] ) ); @@ -192,7 +192,7 @@ void CursorPointType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, { // fetch the old coord..; - std::vector pa = ourobj.parents(); + std::vector pa = ourobj.tqparents(); assert( pa.size() == 2 ); assert( dynamic_cast( pa.front() ) ); assert( dynamic_cast( pa.back() ) ); @@ -208,12 +208,12 @@ void ConstrainedPointType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, const KigDocument& d ) const { // fetch the CurveImp.. - std::vector parents = ourobj.parents(); - assert( margsparser.checkArgs( parents ) ); + std::vector tqparents = ourobj.tqparents(); + assert( margsparser.checkArgs( tqparents ) ); - assert( dynamic_cast( parents[0] ) ); - ObjectConstCalcer* paramo = static_cast( parents[0] ); - const CurveImp* ci = static_cast( parents[1]->imp() ); + assert( dynamic_cast( tqparents[0] ) ); + ObjectConstCalcer* paramo = static_cast( tqparents[0] ); + const CurveImp* ci = static_cast( tqparents[1]->imp() ); // fetch the new param.. const double np = ci->getParam( to, d ); @@ -395,7 +395,7 @@ void FixedPointType::executeAction( Coordinate oldc = static_cast( o.imp() )->coordinate(); KigInputDialog::getCoordinate( i18n( "Set Coordinate" ), - i18n( "Enter the new coordinate." ) + TQString::fromLatin1( "
" ) + + i18n( "Enter the new coordinate." ) + TQString::tqfromLatin1( "
" ) + d.document().coordinateSystem().coordinateFormatNoticeMarkup(), &w, &ok, d.document(), &oldc ); if ( ! ok ) break; @@ -427,11 +427,11 @@ void ConstrainedPointType::executeAction( break; case 0: { - std::vector parents = o.parents(); - assert( dynamic_cast( parents[0] ) && - parents[0]->imp()->inherits( DoubleImp::stype() ) ); + std::vector tqparents = o.tqparents(); + assert( dynamic_cast( tqparents[0] ) && + tqparents[0]->imp()->inherits( DoubleImp::stype() ) ); - ObjectConstCalcer* po = static_cast( parents[0] ); + ObjectConstCalcer* po = static_cast( tqparents[0] ); double oldp = static_cast( po->imp() )->data(); bool ok = true; @@ -440,7 +440,7 @@ void ConstrainedPointType::executeAction( oldp, &w, &ok, 0, 1, 4 ); if ( ! ok ) return; - MonitorDataObjects mon( parents ); + MonitorDataObjects mon( tqparents ); po->setImp( new DoubleImp( newp ) ); KigCommand* kc = new KigCommand( d, i18n( "Change Parameter of Constrained Point" ) ); mon.finish( kc ); @@ -473,46 +473,46 @@ const Coordinate ConstrainedPointType::moveReferencePoint( const ObjectTypeCalce std::vector FixedPointType::movableParents( const ObjectTypeCalcer& ourobj ) const { - return ourobj.parents(); + return ourobj.tqparents(); } std::vector RelativePointType::movableParents( const ObjectTypeCalcer& ourobj ) const { std::vector ret; - ret.push_back( ourobj.parents()[0] ); - ret.push_back( ourobj.parents()[1] ); + ret.push_back( ourobj.tqparents()[0] ); + ret.push_back( ourobj.tqparents()[1] ); return ret; } std::vector ConstrainedPointType::movableParents( const ObjectTypeCalcer& ourobj ) const { std::vector ret; - ret.push_back( ourobj.parents()[0] ); + ret.push_back( ourobj.tqparents()[0] ); return ret; } /* ----------------- Transport of measure ------------------------------ */ -ObjectImp* MeasureTransportType::calc( const Args& parents, const KigDocument& doc ) const +ObjectImp* MeasureTransportType::calc( const Args& tqparents, const KigDocument& doc ) const { double measure; - if ( parents.size() != 3 ) return new InvalidImp; + if ( tqparents.size() != 3 ) return new InvalidImp; - if ( parents[0]->inherits (SegmentImp::stype()) ) + if ( tqparents[0]->inherits (SegmentImp::stype()) ) { - const SegmentImp* s = static_cast( parents[0] ); + const SegmentImp* s = static_cast( tqparents[0] ); measure = s->length(); - } else if ( parents[0]->inherits (ArcImp::stype()) ) + } else if ( tqparents[0]->inherits (ArcImp::stype()) ) { - const ArcImp* s = static_cast( parents[0] ); + const ArcImp* s = static_cast( tqparents[0] ); measure = s->radius()*s->angle(); } else return new InvalidImp; - const Coordinate& p = static_cast( parents[2] )->coordinate(); - if ( parents[1]->inherits (LineImp::stype()) ) + const Coordinate& p = static_cast( tqparents[2] )->coordinate(); + if ( tqparents[1]->inherits (LineImp::stype()) ) { - const LineImp* c = static_cast( parents[1] ); + const LineImp* c = static_cast( tqparents[1] ); if ( !c->containsPoint( p, doc ) ) return new InvalidImp; @@ -523,9 +523,9 @@ ObjectImp* MeasureTransportType::calc( const Args& parents, const KigDocument& d if ( nc.valid() ) return new PointImp( nc ); else return new InvalidImp; - } else if ( parents[1]->inherits (CircleImp::stype()) ) + } else if ( tqparents[1]->inherits (CircleImp::stype()) ) { - const CircleImp* c = static_cast( parents[1] ); + const CircleImp* c = static_cast( tqparents[1] ); if ( !c->containsPoint( p, doc ) ) return new InvalidImp; @@ -607,17 +607,17 @@ Args MeasureTransportType::sortArgs( const Args& args ) const /* - transport of measure (old, for compatibility with prev. kig files) - */ -ObjectImp* MeasureTransportTypeOld::calc( const Args& parents, const KigDocument& doc ) const +ObjectImp* MeasureTransportTypeOld::calc( const Args& tqparents, const KigDocument& doc ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const CircleImp* c = static_cast( parents[0] ); - const Coordinate& p = static_cast( parents[1] )->coordinate(); + const CircleImp* c = static_cast( tqparents[0] ); + const Coordinate& p = static_cast( tqparents[1] )->coordinate(); if ( !c->containsPoint( p, doc ) ) return new InvalidImp; - const SegmentImp* s = static_cast( parents[2] ); + const SegmentImp* s = static_cast( tqparents[2] ); double param = c->getParam( p, doc ); double measure = s->length(); measure /= 2*c->radius()*M_PI; diff --git a/kig/objects/point_type.h b/kig/objects/point_type.h index 69a7e2e8..d1fb7674 100644 --- a/kig/objects/point_type.h +++ b/kig/objects/point_type.h @@ -34,7 +34,7 @@ public: bool inherits( int type ) const; - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; bool canMove( const ObjectTypeCalcer& ourobj ) const; bool isFreelyTranslatable( const ObjectTypeCalcer& ourobj ) const; std::vector movableParents( const ObjectTypeCalcer& ourobj ) const; @@ -58,7 +58,7 @@ class RelativePointType public: static const RelativePointType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; bool canMove( const ObjectTypeCalcer& ourobj ) const; bool isFreelyTranslatable( const ObjectTypeCalcer& ourobj ) const; std::vector movableParents( const ObjectTypeCalcer& ourobj ) const; @@ -80,10 +80,10 @@ class CursorPointType public: static const CursorPointType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; std::vector sortArgs( const std::vector& args ) const; Args sortArgs( const Args& args ) const; bool canMove( const ObjectTypeCalcer& ourobj ) const; @@ -102,7 +102,7 @@ public: bool inherits( int type ) const; - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; bool canMove( const ObjectTypeCalcer& ourobj ) const; bool isFreelyTranslatable( const ObjectTypeCalcer& ourobj ) const; @@ -136,10 +136,10 @@ class MeasureTransportType public: static const MeasureTransportType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; std::vector sortArgs( const std::vector& args )const; Args sortArgs( const Args& args ) const; }; @@ -152,7 +152,7 @@ class MeasureTransportTypeOld public: static const MeasureTransportTypeOld* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc index 08215bfb..c9c8fb11 100644 --- a/kig/objects/polygon_imp.cc +++ b/kig/objects/polygon_imp.cc @@ -159,12 +159,12 @@ bool PolygonImp::isInPolygon( const Coordinate& p ) const } #define selectpolygonwithinside 1 #ifdef selectpolygonwithinside -bool PolygonImp::contains( const Coordinate& p, int, const KigWidget& ) const +bool PolygonImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const { return isInPolygon( p ); } #else -bool PolygonImp::contains( const Coordinate& p, int width, const KigWidget& w ) const +bool PolygonImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const { bool ret = false; uint reduceddim = mpoints.size() - 1; diff --git a/kig/objects/polygon_imp.h b/kig/objects/polygon_imp.h index 9a25d516..506ca245 100644 --- a/kig/objects/polygon_imp.h +++ b/kig/objects/polygon_imp.h @@ -53,7 +53,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/polygon_type.cc b/kig/objects/polygon_type.cc index bca867da..55aa4cd8 100644 --- a/kig/objects/polygon_type.cc +++ b/kig/objects/polygon_type.cc @@ -60,13 +60,13 @@ const TriangleB3PType* TriangleB3PType::instance() return &s; } -ObjectImp* TriangleB3PType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* TriangleB3PType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents, 1 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents, 1 ) ) return new InvalidImp; std::vector points; Coordinate centerofmass3 = Coordinate( 0, 0 ); - for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) + for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) { Coordinate point = static_cast( *i )->coordinate(); centerofmass3 += point; @@ -87,46 +87,46 @@ bool TriangleB3PType::canMove( const ObjectTypeCalcer& o ) const bool TriangleB3PType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const { - std::vector parents = o.parents(); - return parents[0]->isFreelyTranslatable() && - parents[1]->isFreelyTranslatable() && - parents[2]->isFreelyTranslatable(); + std::vector tqparents = o.tqparents(); + return tqparents[0]->isFreelyTranslatable() && + tqparents[1]->isFreelyTranslatable() && + tqparents[2]->isFreelyTranslatable(); } void TriangleB3PType::move( ObjectTypeCalcer& o, const Coordinate& to, const KigDocument& d ) const { - std::vector parents = o.parents(); - assert( margsparser.checkArgs( parents ) ); - const Coordinate a = static_cast( parents[0]->imp() )->coordinate(); - const Coordinate b = static_cast( parents[1]->imp() )->coordinate(); - const Coordinate c = static_cast( parents[2]->imp() )->coordinate(); - if ( parents[0]->canMove() ) - parents[0]->move( to, d ); - if ( parents[1]->canMove() ) - parents[1]->move( to + b - a, d ); - if ( parents[2]->canMove() ) - parents[2]->move( to + c - a, d ); + std::vector tqparents = o.tqparents(); + assert( margsparser.checkArgs( tqparents ) ); + const Coordinate a = static_cast( tqparents[0]->imp() )->coordinate(); + const Coordinate b = static_cast( tqparents[1]->imp() )->coordinate(); + const Coordinate c = static_cast( tqparents[2]->imp() )->coordinate(); + if ( tqparents[0]->canMove() ) + tqparents[0]->move( to, d ); + if ( tqparents[1]->canMove() ) + tqparents[1]->move( to + b - a, d ); + if ( tqparents[2]->canMove() ) + tqparents[2]->move( to + c - a, d ); } const Coordinate TriangleB3PType::moveReferencePoint( const ObjectTypeCalcer& o ) const { - std::vector parents = o.parents(); - assert( margsparser.checkArgs( parents ) ); - return static_cast( parents[0]->imp() )->coordinate(); + std::vector tqparents = o.tqparents(); + assert( margsparser.checkArgs( tqparents ) ); + return static_cast( tqparents[0]->imp() )->coordinate(); } std::vector TriangleB3PType::movableParents( const ObjectTypeCalcer& ourobj ) const { - std::vector parents = ourobj.parents(); + std::vector tqparents = ourobj.tqparents(); std::set ret; - std::vector tmp = parents[0]->movableParents(); + std::vector tmp = tqparents[0]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - tmp = parents[1]->movableParents(); + tmp = tqparents[1]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - tmp = parents[2]->movableParents(); + tmp = tqparents[2]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - ret.insert( parents.begin(), parents.end() ); + ret.insert( tqparents.begin(), tqparents.end() ); return std::vector( ret.begin(), ret.end() ); } @@ -151,11 +151,11 @@ const PolygonBNPType* PolygonBNPType::instance() return &s; } -ObjectImp* PolygonBNPType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* PolygonBNPType::calc( const Args& tqparents, const KigDocument& ) const { - uint count = parents.size(); + uint count = tqparents.size(); assert (count >= 3); /* non sono ammessi poligoni con meno di tre lati */ -// if ( parents[0] != parents[count] ) return new InvalidImp; +// if ( tqparents[0] != tqparents[count] ) return new InvalidImp; std::vector points; uint npoints = 0; @@ -164,8 +164,8 @@ ObjectImp* PolygonBNPType::calc( const Args& parents, const KigDocument& ) const for ( uint i = 0; i < count; ++i ) { npoints++; - if ( ! parents[i]->inherits( PointImp::stype() ) ) return new InvalidImp; - Coordinate point = static_cast( parents[i] )->coordinate(); + if ( ! tqparents[i]->inherits( PointImp::stype() ) ) return new InvalidImp; + Coordinate point = static_cast( tqparents[i] )->coordinate(); centerofmassn += point; points.push_back( point ); } @@ -204,10 +204,10 @@ bool PolygonBNPType::canMove( const ObjectTypeCalcer& o ) const bool PolygonBNPType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const { - std::vector parents = o.parents(); - for ( uint i = 0; i < parents.size(); ++i ) + std::vector tqparents = o.tqparents(); + for ( uint i = 0; i < tqparents.size(); ++i ) { - if ( !parents[i]->isFreelyTranslatable() ) return false; + if ( !tqparents[i]->isFreelyTranslatable() ) return false; } return true; } @@ -215,32 +215,32 @@ bool PolygonBNPType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const void PolygonBNPType::move( ObjectTypeCalcer& o, const Coordinate& to, const KigDocument& d ) const { - std::vector parents = o.parents(); - const Coordinate ref = static_cast( parents[0]->imp() )->coordinate(); - for ( uint i = 0; i < parents.size(); ++i ) + std::vector tqparents = o.tqparents(); + const Coordinate ref = static_cast( tqparents[0]->imp() )->coordinate(); + for ( uint i = 0; i < tqparents.size(); ++i ) { - const Coordinate a = static_cast( parents[i]->imp() )->coordinate(); - parents[i]->move( to + a - ref, d ); + const Coordinate a = static_cast( tqparents[i]->imp() )->coordinate(); + tqparents[i]->move( to + a - ref, d ); } } const Coordinate PolygonBNPType::moveReferencePoint( const ObjectTypeCalcer& o ) const { - std::vector parents = o.parents(); - return static_cast( parents[0]->imp() )->coordinate(); + std::vector tqparents = o.tqparents(); + return static_cast( tqparents[0]->imp() )->coordinate(); } std::vector PolygonBNPType::movableParents( const ObjectTypeCalcer& ourobj ) const { - std::vector parents = ourobj.parents(); + std::vector tqparents = ourobj.tqparents(); std::set ret; - for ( uint i = 0; i < parents.size(); ++i ) + for ( uint i = 0; i < tqparents.size(); ++i ) { - std::vector tmp = parents[i]->movableParents(); + std::vector tmp = tqparents[i]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); } - ret.insert( parents.begin(), parents.end() ); + ret.insert( tqparents.begin(), tqparents.end() ); return std::vector( ret.begin(), ret.end() ); } @@ -281,26 +281,26 @@ const PolygonBCVType* PolygonBCVType::instance() return &s; } -ObjectImp* PolygonBCVType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* PolygonBCVType::calc( const Args& tqparents, const KigDocument& ) const { - if ( parents.size() < 3 || parents.size() > 4 ) return new InvalidImp; + if ( tqparents.size() < 3 || tqparents.size() > 4 ) return new InvalidImp; - if ( ( ! parents[0]->inherits( PointImp::stype() ) ) || - ( ! parents[1]->inherits( PointImp::stype() ) ) || - ( ! parents[2]->inherits( IntImp::stype() ) ) ) + if ( ( ! tqparents[0]->inherits( PointImp::stype() ) ) || + ( ! tqparents[1]->inherits( PointImp::stype() ) ) || + ( ! tqparents[2]->inherits( IntImp::stype() ) ) ) return new InvalidImp; const Coordinate center = - static_cast( parents[0] )->coordinate(); + static_cast( tqparents[0] )->coordinate(); const Coordinate vertex = - static_cast( parents[1] )->coordinate(); + static_cast( tqparents[1] )->coordinate(); const int sides = - static_cast( parents[2] )->data(); + static_cast( tqparents[2] )->data(); int twist = 1; - if ( parents.size() == 4 ) + if ( tqparents.size() == 4 ) { - if ( ! parents[3]->inherits( IntImp::stype() ) ) return new InvalidImp; - twist = static_cast( parents[3] )->data(); + if ( ! tqparents[3]->inherits( IntImp::stype() ) ) return new InvalidImp; + twist = static_cast( tqparents[3] )->data(); } std::vector vertexes; @@ -359,43 +359,43 @@ bool PolygonBCVType::canMove( const ObjectTypeCalcer& o ) const bool PolygonBCVType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const { - std::vector parents = o.parents(); - return parents[0]->isFreelyTranslatable() && - parents[1]->isFreelyTranslatable(); + std::vector tqparents = o.tqparents(); + return tqparents[0]->isFreelyTranslatable() && + tqparents[1]->isFreelyTranslatable(); } void PolygonBCVType::move( ObjectTypeCalcer& o, const Coordinate& to, const KigDocument& d ) const { - std::vector parents = o.parents(); - // assert( margsparser.checkArgs( parents ) ); - if ( ! parents[0]->imp()->inherits( PointImp::stype() ) || - ! parents[1]->imp()->inherits( PointImp::stype() ) ) return; + std::vector tqparents = o.tqparents(); + // assert( margsparser.checkArgs( tqparents ) ); + if ( ! tqparents[0]->imp()->inherits( PointImp::stype() ) || + ! tqparents[1]->imp()->inherits( PointImp::stype() ) ) return; - const Coordinate a = static_cast( parents[0]->imp() )->coordinate(); - const Coordinate b = static_cast( parents[1]->imp() )->coordinate(); - parents[0]->move( to, d ); - parents[1]->move( to + b - a, d ); + const Coordinate a = static_cast( tqparents[0]->imp() )->coordinate(); + const Coordinate b = static_cast( tqparents[1]->imp() )->coordinate(); + tqparents[0]->move( to, d ); + tqparents[1]->move( to + b - a, d ); } const Coordinate PolygonBCVType::moveReferencePoint( const ObjectTypeCalcer& o) const { - std::vector parents = o.parents(); - // assert( margsparser.checkArgs( parents ) ); - if ( ! parents[0]->imp()->inherits( PointImp::stype() ) ) return Coordinate::invalidCoord(); + std::vector tqparents = o.tqparents(); + // assert( margsparser.checkArgs( tqparents ) ); + if ( ! tqparents[0]->imp()->inherits( PointImp::stype() ) ) return Coordinate::invalidCoord(); - return static_cast( parents[0]->imp() )->coordinate(); + return static_cast( tqparents[0]->imp() )->coordinate(); } std::vector PolygonBCVType::movableParents( const ObjectTypeCalcer& ourobj ) const { - std::vector parents = ourobj.parents(); + std::vector tqparents = ourobj.tqparents(); std::set ret; - std::vector tmp = parents[0]->movableParents(); + std::vector tmp = tqparents[0]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - tmp = parents[1]->movableParents(); + tmp = tqparents[1]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - ret.insert( &parents[0], &parents[1] ); + ret.insert( &tqparents[0], &tqparents[1] ); return std::vector( ret.begin(), ret.end() ); } @@ -443,23 +443,23 @@ const PolygonLineIntersectionType* PolygonLineIntersectionType::instance() * vertex of the polygon. */ -ObjectImp* PolygonLineIntersectionType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* PolygonLineIntersectionType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const PolygonImp* polygon = static_cast( parents[0] ); + const PolygonImp* polygon = static_cast( tqparents[0] ); const std::vector ppoints = polygon->points(); - const LineData line = static_cast( parents[1] )->data(); + const LineData line = static_cast( tqparents[1] )->data(); Coordinate intersections[2]; uint whichintersection = 0; bool boundleft = false; bool boundright = false; - if ( parents[1]->inherits( SegmentImp::stype() ) ) + if ( tqparents[1]->inherits( SegmentImp::stype() ) ) { boundleft = boundright = true; } - if ( parents[1]->inherits( RayImp::stype() ) ) + if ( tqparents[1]->inherits( RayImp::stype() ) ) { boundleft = true; } @@ -562,12 +562,12 @@ const PolygonVertexType* PolygonVertexType::instance() return &t; } -ObjectImp* PolygonVertexType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* PolygonVertexType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const std::vector ppoints = static_cast( parents[0] )->points(); - const uint i = static_cast( parents[1] )->data(); + const std::vector ppoints = static_cast( tqparents[0] )->points(); + const uint i = static_cast( tqparents[1] )->data(); if ( i >= ppoints.size() ) return new InvalidImp; @@ -605,12 +605,12 @@ const PolygonSideType* PolygonSideType::instance() return &t; } -ObjectImp* PolygonSideType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* PolygonSideType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const std::vector ppoints = static_cast( parents[0] )->points(); - const uint i = static_cast( parents[1] )->data(); + const std::vector ppoints = static_cast( tqparents[0] )->points(); + const uint i = static_cast( tqparents[1] )->data(); if ( i >= ppoints.size() ) return new InvalidImp; @@ -650,11 +650,11 @@ const ConvexHullType* ConvexHullType::instance() return &t; } -ObjectImp* ConvexHullType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConvexHullType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const std::vector ppoints = static_cast( parents[0] )->points(); + const std::vector ppoints = static_cast( tqparents[0] )->points(); if ( ppoints.size() < 3 ) return new InvalidImp; diff --git a/kig/objects/polygon_type.h b/kig/objects/polygon_type.h index a49100bd..09a77da8 100644 --- a/kig/objects/polygon_type.h +++ b/kig/objects/polygon_type.h @@ -31,7 +31,7 @@ class TriangleB3PType public: static const TriangleB3PType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; bool canMove( const ObjectTypeCalcer& o ) const; bool isFreelyTranslatable( const ObjectTypeCalcer& o ) const; @@ -52,10 +52,10 @@ class PolygonBNPType public: static const PolygonBNPType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; std::vector sortArgs( const std::vector& args ) const; Args sortArgs( const Args& args ) const; @@ -78,11 +78,11 @@ class PolygonBCVType public: static const PolygonBCVType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; std::vector sortArgs( const std::vector& args ) const; Args sortArgs( const Args& args ) const; bool canMove( const ObjectTypeCalcer& o ) const; @@ -100,7 +100,7 @@ class PolygonLineIntersectionType ~PolygonLineIntersectionType(); public: static const PolygonLineIntersectionType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -111,7 +111,7 @@ class PolygonVertexType ~PolygonVertexType(); public: static const PolygonVertexType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -122,7 +122,7 @@ class PolygonSideType ~PolygonSideType(); public: static const PolygonSideType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -133,7 +133,7 @@ class ConvexHullType ~ConvexHullType(); public: static const ConvexHullType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; #endif diff --git a/kig/objects/special_calcers.cc b/kig/objects/special_calcers.cc index e70bd4e9..281017b5 100644 --- a/kig/objects/special_calcers.cc +++ b/kig/objects/special_calcers.cc @@ -26,7 +26,7 @@ static const ArgsParser::spec argsspecMeasureTransport[] = static ArgsParser measuretransportargsparser( argsspecMeasureTransport, 3 ); -std::vector MeasureTransportCalcer::parents() const +std::vector MeasureTransportCalcer::tqparents() const { std::vector ret; ret.push_back( mcircle ); @@ -46,7 +46,7 @@ MeasureTransportCalcer::~MeasureTransportCalcer() void MeasureTransportCalcer::calc( const KigDocument& ) { - if ( ! measuretransportargsparser.checkArgs( parents() ) ) + if ( ! measuretransportargsparser.checkArgs( tqparents() ) ) return new InvalidImp(); if ( ! isPointOnCurve( mpoint, mcircle ) ) diff --git a/kig/objects/special_calcers.h b/kig/objects/special_calcers.h index 640587cc..812d7ee5 100644 --- a/kig/objects/special_calcers.h +++ b/kig/objects/special_calcers.h @@ -29,7 +29,7 @@ public: MeasureTransportCalcer(ObjectCalcer* circle, ObjectCalcer* point, ObjectCalcer* segment ); ~MeasureTransportCalcer(); - std::vector parents() const; + std::vector tqparents() const; void calc( const KigDocument& ); const ObjectImpType* impRequirement( ObjectCalcer* o, const std::vector& os ) const; diff --git a/kig/objects/tests_type.cc b/kig/objects/tests_type.cc index e85c111e..a0a072bf 100644 --- a/kig/objects/tests_type.cc +++ b/kig/objects/tests_type.cc @@ -51,11 +51,11 @@ const AreParallelType* AreParallelType::instance() return &t; } -ObjectImp* AreParallelType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* AreParallelType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const LineData& l1 = static_cast( parents[0] )->data(); - const LineData& l2 = static_cast( parents[1] )->data(); + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + const LineData& l1 = static_cast( tqparents[0] )->data(); + const LineData& l2 = static_cast( tqparents[1] )->data(); if ( l1.isParallelTo( l2 ) ) return new TestResultImp( i18n( "These lines are parallel." ) ); @@ -95,11 +95,11 @@ const AreOrthogonalType* AreOrthogonalType::instance() return &t; } -ObjectImp* AreOrthogonalType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* AreOrthogonalType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const LineData& l1 = static_cast( parents[0] )->data(); - const LineData& l2 = static_cast( parents[1] )->data(); + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + const LineData& l1 = static_cast( tqparents[0] )->data(); + const LineData& l2 = static_cast( tqparents[1] )->data(); if ( l1.isOrthogonalTo( l2 ) ) return new TestResultImp( i18n( "These lines are orthogonal." ) ); @@ -141,12 +141,12 @@ const AreCollinearType* AreCollinearType::instance() return &t; } -ObjectImp* AreCollinearType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* AreCollinearType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const Coordinate& p1 = static_cast( parents[0] )->coordinate(); - const Coordinate& p2 = static_cast( parents[1] )->coordinate(); - const Coordinate& p3 = static_cast( parents[2] )->coordinate(); + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + const Coordinate& p1 = static_cast( tqparents[0] )->coordinate(); + const Coordinate& p2 = static_cast( tqparents[1] )->coordinate(); + const Coordinate& p3 = static_cast( tqparents[2] )->coordinate(); if ( areCollinear( p1, p2, p3 ) ) return new TestResultImp( i18n( "These points are collinear." ) ); @@ -184,11 +184,11 @@ const ContainsTestType* ContainsTestType::instance() return &t; } -ObjectImp* ContainsTestType::calc( const Args& parents, const KigDocument& doc ) const +ObjectImp* ContainsTestType::calc( const Args& tqparents, const KigDocument& doc ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const Coordinate& p = static_cast( parents[0] )->coordinate(); - const CurveImp* c = static_cast( parents[1] ); + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + const Coordinate& p = static_cast( tqparents[0] )->coordinate(); + const CurveImp* c = static_cast( tqparents[1] ); if ( c->containsPoint( p, doc ) ) return new TestResultImp( i18n( "This curve contains the point." ) ); @@ -230,11 +230,11 @@ const InPolygonTestType* InPolygonTestType::instance() return &t; } -ObjectImp* InPolygonTestType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* InPolygonTestType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const Coordinate& p = static_cast( parents[0] )->coordinate(); - const PolygonImp* pol = static_cast( parents[1] ); + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + const Coordinate& p = static_cast( tqparents[0] )->coordinate(); + const PolygonImp* pol = static_cast( tqparents[1] ); if ( pol->isInPolygon( p ) ) return new TestResultImp( i18n( "This polygon contains the point." ) ); @@ -274,10 +274,10 @@ const ConvexPolygonTestType* ConvexPolygonTestType::instance() return &t; } -ObjectImp* ConvexPolygonTestType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* ConvexPolygonTestType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const PolygonImp* pol = static_cast( parents[0] ); + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + const PolygonImp* pol = static_cast( tqparents[0] ); if ( pol->isConvex() ) return new TestResultImp( i18n( "This polygon is convex." ) ); @@ -321,12 +321,12 @@ const SameDistanceType* SameDistanceType::instance() return &t; } -ObjectImp* SameDistanceType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* SameDistanceType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const Coordinate& p1 = static_cast( parents[0] )->coordinate(); - const Coordinate& p2 = static_cast( parents[1] )->coordinate(); - const Coordinate& p3 = static_cast( parents[2] )->coordinate(); + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + const Coordinate& p1 = static_cast( tqparents[0] )->coordinate(); + const Coordinate& p2 = static_cast( tqparents[1] )->coordinate(); + const Coordinate& p3 = static_cast( tqparents[2] )->coordinate(); if ( fabs( ( p1 - p2 ).length() - ( p1 - p3 ).length() ) < 10e-5 ) return new TestResultImp( i18n( "The two distances are the same." ) ); @@ -364,11 +364,11 @@ const VectorEqualityTestType* VectorEqualityTestType::instance() return &t; } -ObjectImp* VectorEqualityTestType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* VectorEqualityTestType::calc( const Args& tqparents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const Coordinate& v1 = static_cast( parents[0] )->dir(); - const Coordinate& v2 = static_cast( parents[1] )->dir(); + if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + const Coordinate& v1 = static_cast( tqparents[0] )->dir(); + const Coordinate& v2 = static_cast( tqparents[1] )->dir(); if ( ( v1 - v2 ).length() < 10e-5 ) return new TestResultImp( i18n( "The two vectors are the same." ) ); diff --git a/kig/objects/tests_type.h b/kig/objects/tests_type.h index 7498fc4f..4bc96f8c 100644 --- a/kig/objects/tests_type.h +++ b/kig/objects/tests_type.h @@ -27,7 +27,7 @@ class AreParallelType ~AreParallelType(); public: static const AreParallelType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -38,7 +38,7 @@ class AreOrthogonalType ~AreOrthogonalType(); public: static const AreOrthogonalType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -49,7 +49,7 @@ class AreCollinearType ~AreCollinearType(); public: static const AreCollinearType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -60,7 +60,7 @@ class ContainsTestType ~ContainsTestType(); public: static const ContainsTestType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -71,7 +71,7 @@ class InPolygonTestType ~InPolygonTestType(); public: static const InPolygonTestType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -82,7 +82,7 @@ class ConvexPolygonTestType ~ConvexPolygonTestType(); public: static const ConvexPolygonTestType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -93,7 +93,7 @@ class SameDistanceType ~SameDistanceType(); public: static const SameDistanceType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -104,7 +104,7 @@ class VectorEqualityTestType ~VectorEqualityTestType(); public: static const VectorEqualityTestType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; diff --git a/kig/objects/text_imp.cc b/kig/objects/text_imp.cc index 32591c16..e8feb7f0 100644 --- a/kig/objects/text_imp.cc +++ b/kig/objects/text_imp.cc @@ -51,9 +51,9 @@ void TextImp::draw( KigPainter& p ) const p.drawTextFrame( mboundrect, mtext, mframe ); } -bool TextImp::contains( const Coordinate& p, int, const KigWidget& ) const +bool TextImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const { - return mboundrect.contains( p ); + return mboundrect.tqcontains( p ); } bool TextImp::inRect( const Rect& r, int, const KigWidget& ) const diff --git a/kig/objects/text_imp.h b/kig/objects/text_imp.h index 54e33f79..54eb7647 100644 --- a/kig/objects/text_imp.h +++ b/kig/objects/text_imp.h @@ -30,7 +30,7 @@ class TextImp Coordinate mloc; bool mframe; // with this var, we keep track of the place we drew in, for use in - // the contains() function.. + // the tqcontains() function.. mutable Rect mboundrect; public: typedef ObjectImp Parent; @@ -44,7 +44,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool contains( const Coordinate& p, int width, const KigWidget& ) const; + bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cc index 214b35c2..5fc637bd 100644 --- a/kig/objects/text_type.cc +++ b/kig/objects/text_type.cc @@ -76,11 +76,11 @@ const ObjectImpType* TextType::impRequirement( const ObjectImp* o, const Args& a return ObjectImp::stype(); } -ObjectImp* TextType::calc( const Args& parents, const KigDocument& doc ) const +ObjectImp* TextType::calc( const Args& tqparents, const KigDocument& doc ) const { - if( parents.size() < 3 ) return new InvalidImp; - Args firstthree( parents.begin(), parents.begin() + 3 ); - Args varargs( parents.begin() + 3, parents.end() ); + if( tqparents.size() < 3 ) return new InvalidImp; + Args firstthree( tqparents.begin(), tqparents.begin() + 3 ); + Args varargs( tqparents.begin() + 3, tqparents.end() ); if ( ! mparser.checkArgs( firstthree ) ) return new InvalidImp; @@ -108,9 +108,9 @@ bool TextType::isFreelyTranslatable( const ObjectTypeCalcer& ) const void TextType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, const KigDocument& d ) const { - const std::vector parents = ourobj.parents(); - assert( parents.size() >= 3 ); - const std::vector firstthree( parents.begin(), parents.begin() + 3 ); + const std::vector tqparents = ourobj.tqparents(); + assert( tqparents.size() >= 3 ); + const std::vector firstthree( tqparents.begin(), tqparents.begin() + 3 ); if( dynamic_cast( firstthree[1] ) ) { ObjectConstCalcer* c = static_cast( firstthree[1] ); @@ -133,10 +133,10 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, KigPart& doc, KigWidget&, NormalMode& ) const { - std::vector parents = c.parents(); - assert( parents.size() >= 3 ); + std::vector tqparents = c.tqparents(); + assert( tqparents.size() >= 3 ); - std::vector firstthree( parents.begin(), parents.begin() + 3 ); + std::vector firstthree( tqparents.begin(), tqparents.begin() + 3 ); assert( mparser.checkArgs( firstthree ) ); assert( dynamic_cast( firstthree[0] ) ); @@ -144,11 +144,11 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, if ( i == 0 ) { - QClipboard* cb = kapp->clipboard(); + TQClipboard* cb = kapp->tqclipboard(); // copy the text into the clipboard const TextImp* ti = static_cast( c.imp() ); - cb->setText( ti->text(), QClipboard::Clipboard ); + cb->setText( ti->text(), TQClipboard::Clipboard ); } else if ( i == 1 ) { @@ -201,10 +201,10 @@ Args TextType::sortArgs( const Args& args ) const std::vector TextType::movableParents( const ObjectTypeCalcer& ourobj ) const { - const std::vector parents = ourobj.parents(); - assert( parents.size() >= 3 ); - std::vector ret = parents[1]->movableParents(); - ret.push_back( parents[1] ); + const std::vector tqparents = ourobj.tqparents(); + assert( tqparents.size() >= 3 ); + std::vector ret = tqparents[1]->movableParents(); + ret.push_back( tqparents[1] ); return ret; } diff --git a/kig/objects/text_type.h b/kig/objects/text_type.h index 8f97d4ea..5968e040 100644 --- a/kig/objects/text_type.h +++ b/kig/objects/text_type.h @@ -29,11 +29,11 @@ class TextType public: static const TextType* instance(); - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; const ObjectImpType* resultId() const; - ObjectImp* calc( const Args& parents, const KigDocument& d ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; std::vector sortArgs( const std::vector& os ) const; Args sortArgs( const Args& args ) const; diff --git a/kig/pykig/pykig.py b/kig/pykig/pykig.py index 106c8a0c..3e2a5cdf 100755 --- a/kig/pykig/pykig.py +++ b/kig/pykig/pykig.py @@ -457,9 +457,9 @@ class Property(PropObj): genealogia: Property <- PropObj <- KigDOP <- object """ - def __init__(self, type, parent, shown, name, internal, + def __init__(self, type, tqparent, shown, name, internal, width, pointstyle, linestyle, color): - PropObj.__init__(self, True, type, (parent,), shown, name, internal, + PropObj.__init__(self, True, type, (tqparent,), shown, name, internal, width, pointstyle, linestyle, color) # print shown @@ -491,7 +491,7 @@ data=(\ def convstr(s): for o, n in DICT: - s=s.replace(o, n) + s=s.tqreplace(o, n) return s def databuild(nomeclasse, nomekig, v="val"): diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc index de959ce2..cc3e1771 100644 --- a/kig/scripting/newscriptwizard.cc +++ b/kig/scripting/newscriptwizard.cc @@ -56,8 +56,8 @@ NewScriptWizard::~NewScriptWizard() } } -NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ) - : NewScriptWizardBase( parent, "New Script Wizard" ), +NewScriptWizard::NewScriptWizard( TQWidget* tqparent, ScriptModeBase* mode ) + : NewScriptWizardBase( tqparent, "New Script Wizard" ), mmode( mode ) { document = KTextEditor::EditorChooser::createDocument( 0, "KTextEditor::Document" ); @@ -97,11 +97,11 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ) KPopupMenu* pm = new KPopupMenu( editor ); // creating the actions for the code editor... KActionCollection* ac = new KActionCollection( editor ); - KAction* undoAction = KStdAction::undo( this, TQT_SLOT( slotUndo() ), ac ); - KAction* redoAction = KStdAction::redo( this, TQT_SLOT( slotRedo() ), ac ); - KAction* cutAction = KStdAction::cut( this, TQT_SLOT( slotCut() ), ac ); - KAction* copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), ac ); - KAction* pasteAction = KStdAction::paste( this, TQT_SLOT( slotPaste() ), ac ); + KAction* undoAction = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( slotUndo() ), ac ); + KAction* redoAction = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( slotRedo() ), ac ); + KAction* cutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), ac ); + KAction* copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), ac ); + KAction* pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), ac ); // ... and plugging them into the popup menu (to build it, of course :) ) undoAction->plug( pm ); redoAction->plug( pm ); @@ -159,8 +159,8 @@ void NewScriptWizard::accept() void NewScriptWizard::slotHelpClicked() { - kapp->invokeHelp( TQString::fromLatin1( "scripting" ), - TQString::fromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::tqfromLatin1( "scripting" ), + TQString::tqfromLatin1( "kig" ) ); } void NewScriptWizard::setText( const TQString& text ) diff --git a/kig/scripting/newscriptwizard.h b/kig/scripting/newscriptwizard.h index d1831b96..403236ee 100644 --- a/kig/scripting/newscriptwizard.h +++ b/kig/scripting/newscriptwizard.h @@ -35,9 +35,10 @@ class NewScriptWizard : public NewScriptWizardBase { Q_OBJECT + TQ_OBJECT ScriptModeBase* mmode; public: - NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ); + NewScriptWizard( TQWidget* tqparent, ScriptModeBase* mode ); ~NewScriptWizard(); void back(); diff --git a/kig/scripting/newscriptwizardbase.ui b/kig/scripting/newscriptwizardbase.ui index 30117961..b71565d0 100644 --- a/kig/scripting/newscriptwizardbase.ui +++ b/kig/scripting/newscriptwizardbase.ui @@ -1,10 +1,10 @@ NewScriptWizardBase - + NewScriptWizardBase - + 0 0 @@ -15,7 +15,7 @@ New Script - + mpargs @@ -26,7 +26,7 @@ unnamed - + textLabel1 @@ -34,13 +34,13 @@ Select the argument objects ( if any ) in the Kig window and press "Next". - + AlignCenter - + mpcode @@ -51,7 +51,7 @@ in the Kig window and press "Next". unnamed - + gridLayout @@ -59,7 +59,7 @@ in the Kig window and press "Next". unnamed - + labelFillCode @@ -74,7 +74,7 @@ in the Kig window and press "Next". - + ktextedit.h diff --git a/kig/scripting/python_type.cc b/kig/scripting/python_type.cc index cc5a00ea..0b73cda4 100644 --- a/kig/scripting/python_type.cc +++ b/kig/scripting/python_type.cc @@ -108,12 +108,12 @@ const ObjectImpType* PythonCompileType::resultId() const return PythonCompiledScriptImp::stype(); } -ObjectImp* PythonCompileType::calc( const Args& parents, const KigDocument& ) const +ObjectImp* PythonCompileType::calc( const Args& tqparents, const KigDocument& ) const { - assert( parents.size() == 1 ); - if ( !parents[0]->inherits( StringImp::stype() ) ) return new InvalidImp; + assert( tqparents.size() == 1 ); + if ( !tqparents[0]->inherits( StringImp::stype() ) ) return new InvalidImp; - const StringImp* si = static_cast( parents[0] ); + const StringImp* si = static_cast( tqparents[0] ); TQString s = si->data(); CompiledPythonScript cs = PythonScripter::instance()->compile( s.latin1() ); @@ -141,20 +141,20 @@ const PythonExecuteType* PythonExecuteType::instance() return &t; } -ObjectImp* PythonExecuteType::calc( const Args& parents, const KigDocument& d ) const +ObjectImp* PythonExecuteType::calc( const Args& tqparents, const KigDocument& d ) const { - assert( parents.size() >= 1 ); - if( !parents[0]->inherits( PythonCompiledScriptImp::stype() ) ) return new InvalidImp; + assert( tqparents.size() >= 1 ); + if( !tqparents[0]->inherits( PythonCompiledScriptImp::stype() ) ) return new InvalidImp; - CompiledPythonScript& script = static_cast( parents[0] )->data(); + CompiledPythonScript& script = static_cast( tqparents[0] )->data(); - Args args( parents.begin() + 1, parents.end() ); + Args args( tqparents.begin() + 1, tqparents.end() ); return script.calc( args, d ); } -const ObjectImpType* PythonExecuteType::impRequirement( const ObjectImp* o, const Args& parents ) const +const ObjectImpType* PythonExecuteType::impRequirement( const ObjectImp* o, const Args& tqparents ) const { - if ( o == parents[0] ) return PythonCompiledScriptImp::stype(); + if ( o == tqparents[0] ) return PythonCompiledScriptImp::stype(); else return ObjectImp::stype(); } diff --git a/kig/scripting/python_type.h b/kig/scripting/python_type.h index db623ab6..871cfc17 100644 --- a/kig/scripting/python_type.h +++ b/kig/scripting/python_type.h @@ -28,10 +28,10 @@ class PythonCompileType public: static const PythonCompileType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& d ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; const ObjectImpType* resultId() const; std::vector sortArgs( const std::vector& args ) const; @@ -46,10 +46,10 @@ class PythonExecuteType public: static const PythonExecuteType* instance(); - ObjectImp* calc( const Args& parents, const KigDocument& d ) const; + ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; const ObjectImpType* resultId() const; std::vector sortArgs( const std::vector& args ) const; diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cc index 2eb2da81..1f5d8c4a 100644 --- a/kig/scripting/script-common.cc +++ b/kig/scripting/script-common.cc @@ -44,7 +44,7 @@ TQString ScriptType::templateCode( ScriptType::Type type, std::listname(); - tempcode += n.isEmpty() ? temparg.arg( id ) : n; + tempcode += n.isEmpty() ? temparg.tqarg( id ) : n; id++; }; tempcode += diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc index adbcc857..2c6f4d80 100644 --- a/kig/scripting/script_mode.cc +++ b/kig/scripting/script_mode.cc @@ -45,7 +45,7 @@ void ScriptModeBase::dragRect( const TQPoint& p, KigWidget& w ) mdoc.runMode( &dm ); std::vector ret = dm.ret(); - KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); + KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); if ( dm.needClear() ) { std::vector tmp( margs.begin(), margs.begin() ); @@ -67,7 +67,7 @@ void ScriptModeBase::leftClickedObject( ObjectHolder* o, const TQPoint&, if ( mwawd != SelectingArgs ) return; - KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); + KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); if ( (dup_o = std::find( margs.begin(), margs.end(), o )) != margs.end() ) { @@ -105,7 +105,7 @@ void ScriptModeBase::mouseMoved( const std::vector& os, // statusbar text mdoc.emitStatusBarText( selectstat ); - KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() ); + KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); // set the text next to the arrow cursor TQPoint point = pt; @@ -204,7 +204,7 @@ bool ScriptCreationMode::queryFinish() KMessageBox::detailedSorry( mwizard, i18n( "The Python interpreter caught an error during the execution of your " "script. Please fix the script and click the Finish button again." ), - i18n( "The Python Interpreter generated the following error output:\n%1").arg( errtrace ) ); + i18n( "The Python Interpreter generated the following error output:\n%1").tqarg( errtrace.data() ) ); } else { @@ -246,7 +246,7 @@ void ScriptModeBase::setScriptType( ScriptType::Type type ) void ScriptModeBase::addArgs( const std::vector& obj, KigWidget& w ) { - KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); + KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); std::copy( obj.begin(), obj.end(), std::inserter( margs, margs.begin() ) ); pter.drawObjects( obj, true ); @@ -275,10 +275,10 @@ ScriptEditMode::ScriptEditMode( ObjectTypeCalcer* exec_calc, KigPart& doc ) { mwawd = EnteringCode; - mexecargs = mexecuted->parents(); + mexecargs = mexecuted->tqparents(); assert( mexecargs.size() >= 1 ); - mcompiledargs = mexecargs[0]->parents(); + mcompiledargs = mexecargs[0]->tqparents(); assert( mcompiledargs.size() == 1 ); const ObjectImp* imp = static_cast( mcompiledargs[0] )->imp(); @@ -322,7 +322,7 @@ bool ScriptEditMode::queryFinish() KMessageBox::detailedSorry( mpart.widget(), i18n( "The Python interpreter caught an error during the execution of your " "script. Please fix the script." ), - i18n( "The Python Interpreter generated the following error output:\n%1").arg( errtrace ) ); + i18n( "The Python Interpreter generated the following error output:\n%1").tqarg( errtrace.data() ) ); } else { diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp index 7829e44c..df1d4d87 100644 --- a/kiten/configdictionaries.cpp +++ b/kiten/configdictionaries.cpp @@ -26,8 +26,8 @@ #include "configdictionaries.moc" -ConfigDictionaries::ConfigDictionaries(TQWidget *parent, const char* name, WFlags f) : - ConfigDictionariesBase(parent, name, f) +ConfigDictionaries::ConfigDictionaries(TQWidget *tqparent, const char* name, WFlags f) : + ConfigDictionariesBase(tqparent, name, f) { changed = false; config = Config::self(); @@ -141,7 +141,7 @@ void ConfigDictionaries::slotDelSelKanjidic() { delSel(kanjidicList); } void ConfigDictionaries::add(KListView* list) { TQListViewItem *item = list->firstChild(); - TQString filename = KFileDialog::getOpenFileName(item? TQFileInfo(item->text(1)).dirPath(true).append("/") : TQString::null); + TQString filename = KFileDialog::getOpenFileName(item? TQFileInfo(item->text(1)).dirPath(true).append("/") : TQString()); TQString name = TQFileInfo(filename).fileName(); (void) new TQListViewItem(list, name, filename); diff --git a/kiten/configdictionaries.h b/kiten/configdictionaries.h index 48089fe9..5340ea0b 100644 --- a/kiten/configdictionaries.h +++ b/kiten/configdictionaries.h @@ -27,8 +27,9 @@ class ConfigDictionaries : public ConfigDictionariesBase { Q_OBJECT + TQ_OBJECT public: - ConfigDictionaries(TQWidget *parent = 0, const char* name = 0, WFlags f = 0); + ConfigDictionaries(TQWidget *tqparent = 0, const char* name = 0, WFlags f = 0); void readDictionaries(); // KConfig stuff diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui index faf52680..c3e7f353 100644 --- a/kiten/configdictionariesbase.ui +++ b/kiten/configdictionariesbase.ui @@ -1,10 +1,10 @@ ConfigDictionariesBase - + ConfigDictionariesBase - + 0 0 @@ -19,11 +19,11 @@ unnamed - + tabWidget3 - + tab @@ -34,9 +34,9 @@ unnamed - + - layout52_2 + tqlayout52_2 @@ -45,15 +45,15 @@ 0 - + - layout43_2 + tqlayout43_2 unnamed - + kcfg_edict__useGlobal @@ -71,7 +71,7 @@ Expanding - + 40 20 @@ -80,9 +80,9 @@ - + - layout51_2 + tqlayout51_2 @@ -115,15 +115,15 @@ edictList - + - layout50_2 + tqlayout50_2 unnamed - + addEdictButton @@ -131,7 +131,7 @@ Add... - + delSelEdictButton @@ -149,7 +149,7 @@ Expanding - + 20 120 @@ -164,7 +164,7 @@ - + tab @@ -175,23 +175,23 @@ unnamed - + - layout52 + tqlayout52 unnamed - + - layout43 + tqlayout43 unnamed - + kcfg_kanjidic__useGlobal @@ -209,7 +209,7 @@ Expanding - + 40 20 @@ -218,9 +218,9 @@ - + - layout51 + tqlayout51 @@ -253,15 +253,15 @@ kanjidicList - + - layout50 + tqlayout50 unnamed - + addKanjidicButton @@ -269,7 +269,7 @@ Add... - + delSelKanjidicButton @@ -287,7 +287,7 @@ Expanding - + 20 120 @@ -305,7 +305,7 @@ - + klistview.h klistview.h diff --git a/kiten/configfont.ui b/kiten/configfont.ui index 9ad6936c..865e3098 100644 --- a/kiten/configfont.ui +++ b/kiten/configfont.ui @@ -1,10 +1,10 @@ ConfigFont - + ConfigFont - + 0 0 @@ -26,7 +26,7 @@ - + kfontdialog.h diff --git a/kiten/configlearn.ui b/kiten/configlearn.ui index b101de38..a83ffb3e 100644 --- a/kiten/configlearn.ui +++ b/kiten/configlearn.ui @@ -1,10 +1,10 @@ ConfigLearn - + ConfigLearn - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout12 + tqlayout12 unnamed - + kcfg_startLearn @@ -45,14 +45,14 @@ Expanding - + 20 40 - + groupBox1 @@ -63,15 +63,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -79,7 +79,7 @@ Clue: - + Kanji @@ -99,7 +99,7 @@ kcfg_QuizOn - + textLabel2 @@ -107,7 +107,7 @@ Possible answers: - + Kanji @@ -141,7 +141,7 @@ Expanding - + 20 40 @@ -157,5 +157,5 @@ kcfg_QuizOn kcfg_GuessOn - + diff --git a/kiten/configsearching.ui b/kiten/configsearching.ui index c11665c1..7c40c09f 100644 --- a/kiten/configsearching.ui +++ b/kiten/configsearching.ui @@ -1,10 +1,10 @@ ConfigSearching - + ConfigSearching - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout9 + tqlayout9 unnamed - + kcfg_caseSensitive @@ -35,7 +35,7 @@ Case sensitive searches - + kcfg_wholeWord @@ -53,7 +53,7 @@ Expanding - + 20 40 @@ -64,5 +64,5 @@ - + diff --git a/kiten/deinf.cpp b/kiten/deinf.cpp index 52d1f8f2..3f9585a9 100644 --- a/kiten/deinf.cpp +++ b/kiten/deinf.cpp @@ -74,7 +74,7 @@ void Deinf::Index::load() Conjugation conj; conj.ending = things.first(); - conj.replace = (*things.at(1)); + conj.tqreplace = (*things.at(1)); conj.num = things.last().toUInt(); list.append(conj); @@ -110,10 +110,10 @@ TQStringList Deinf::Index::deinflect(const TQString &text, TQStringList &name) { name.append(names[(*it).num]); - //kdDebug() << "match ending: " << (*it).ending << "; replace: " << (*it).replace << "; name: " << names[(*it).num] << endl; + //kdDebug() << "match ending: " << (*it).ending << "; tqreplace: " << (*it).tqreplace << "; name: " << names[(*it).num] << endl; TQString tmp(text); - tmp.replace(TQRegExp((*it).ending + "*", false, true), (*it).replace); + tmp.tqreplace(TQRegExp((*it).ending + "*", false, true), (*it).tqreplace); ret.append(tmp); } } diff --git a/kiten/deinf.h b/kiten/deinf.h index ca776289..28e18d1f 100644 --- a/kiten/deinf.h +++ b/kiten/deinf.h @@ -30,7 +30,7 @@ namespace Deinf struct Conjugation { TQString ending; - TQString replace; + TQString tqreplace; unsigned int num; }; diff --git a/kiten/dict.cpp b/kiten/dict.cpp index 23da1a9e..7d01fbd2 100644 --- a/kiten/dict.cpp +++ b/kiten/dict.cpp @@ -37,11 +37,11 @@ namespace { -void msgerr(const TQString &msg, const TQString &dict = TQString::null) +void msgerr(const TQString &msg, const TQString &dict = TQString()) { TQString output = msg; if (!dict.isNull()) - output = msg.arg(dict); + output = msg.tqarg(dict); KMessageBox::error(0, output); } } @@ -50,7 +50,7 @@ using namespace Dict; TextType Dict::textType(const TQString &text) { - ushort first = text.at(0).unicode(); + ushort first = text.tqat(0).tqunicode(); if (first < 0x3000) return Text_Latin; @@ -198,7 +198,7 @@ TQCString File::lookup(unsigned i) // get the whole word while(pos <= size && dictPtr[pos] != 0 && dictPtr[pos] != 0x0a) ++pos; - // put the word in the QCString + // put the word in the TQCString TQCString retval((const char *)(dictPtr + start), pos - start); // tack on a null char null = 0; @@ -342,7 +342,7 @@ SearchResult Index::scanResults(TQRegExp regexp, TQStringList results, bool comm if (found >= 0) { ++fullNum; - if ((*itr).find(TQString("(P)")) >= 0 || !common) + if ((*itr).tqfind(TQString("(P)")) >= 0 || !common) { // we append HERE, so we get the exact // results we have in ret.list @@ -398,7 +398,7 @@ SearchResult Index::scanKanjiResults(TQRegExp regexp, TQStringList results, bool ++fullNum; // common entries have G[1-8] (jouyou) TQRegExp comregexp(jmyCount ? "G[1-9]" : "G[1-8]"); - if ((*itr).find(comregexp) >= 0 || !common) + if ((*itr).tqfind(comregexp) >= 0 || !common) { ret.list.append(kanjiParse(*itr)); ++num; @@ -487,7 +487,7 @@ TQRegExp Dict::Index::createRegExp(SearchType type, const TQString &text, Dictio regExp = "%1"; } - return TQRegExp(regExp.arg(text), caseSensitive); + return TQRegExp(regExp.tqarg(text), caseSensitive); } int Index::stringCompare(File &file, int index, TQCString str) @@ -769,8 +769,8 @@ TQString Dict::firstEntryText(Dict::SearchResult result) /////////////////////////////////////////////////////////////// Entry::Entry(const TQString & kanji, const TQString & reading, const TQStringList &meanings) - : DictName(TQString::fromLatin1("__NOTSET")) - , Header(TQString::fromLatin1("__NOTSET")) + : DictName(TQString::tqfromLatin1("__NOTSET")) + , Header(TQString::tqfromLatin1("__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::fromLatin1("__NOTSET")) - , Header(TQString::fromLatin1("__NOTSET")) + : DictName(TQString::tqfromLatin1("__NOTSET")) + , Header(TQString::tqfromLatin1("__NOTSET")) , Meanings(meanings) , Kanji(kanji) , KanaOnly(false) @@ -806,7 +806,7 @@ Entry::Entry(const TQString &dictname) } Entry::Entry(const TQString &headername, bool) - : DictName(TQString::fromLatin1("__NOTSET")) + : DictName(TQString::tqfromLatin1("__NOTSET")) , Header(headername) , KanaOnly(true) , ExtendedKanjiInfo(false) diff --git a/kiten/dict.h b/kiten/dict.h index f510d0c1..80a762d8 100644 --- a/kiten/dict.h +++ b/kiten/dict.h @@ -114,7 +114,7 @@ public: // Kanjidict ctor Entry(const TQString &, TQStringList &, TQStringList &, unsigned int grade, unsigned int freq, unsigned int strokes, unsigned int miscount); // default (for containers) - Entry(const TQString & = TQString::null); + Entry(const TQString & = TQString()); // for a heading Entry(const TQString &, bool header); @@ -161,9 +161,10 @@ struct SearchResult enum SearchType { Search_Beginning, Search_FullWord, Search_Anywhere }; enum DictionaryType { Edict, Kanjidict }; -class KDE_EXPORT Index : public QObject +class KDE_EXPORT Index : public TQObject { Q_OBJECT + TQ_OBJECT public: Index(); diff --git a/kiten/edict b/kiten/edict index 9d2b964a..b33f698d 100644 --- a/kiten/edict +++ b/kiten/edict @@ -115,7 +115,7 @@ ¤¢¤ó¤Ê¤Ë /(exp) to that extent/to that degree/ ¤¢¤ó¤ÊÉ÷¤Ë [¤¢¤ó¤Ê¤Õ¤¦¤Ë] /(exp) (uk) in that way/like that/that way/ ¤¤¤¤²Ã¸º [¤¤¤¤¤«¤²¤ó] /(adj-na,adv,exp,n) moderate/right/random/not thorough/vague/irresponsible/halfhearted/(P)/ -¤¤¤¤²Ã¸º¤Ë¤·¤Ê¤µ¤¤ [¤¤¤¤¤«¤²¤ó¤Ë¤·¤Ê¤µ¤¤] /shape up!/act properly!/ +¤¤¤¤²Ã¸º¤Ë¤·¤Ê¤µ¤¤ [¤¤¤¤¤«¤²¤ó¤Ë¤·¤Ê¤µ¤¤] /tqshape up!/act properly!/ ¤¤¤¤²Ã¸º¤Ë¤¹¤ë [¤¤¤¤¤«¤²¤ó¤Ë¤¹¤ë] /(exp) to put an end to something/to get something over with/to quit something one has been engaged in too long or to an excessive degree/ ¤¤¤¤Ç¯¤ò¤·¤Æ [¤¤¤¤¤È¤·¤ò¤·¤Æ] /(in spite of) being old enough to know better/ ¤¤¤«¤¹ /(v5s) smart/cool/sharp/stylish/ @@ -504,10 +504,10 @@ ¤ªÌܸ«ÆÀ [¤ª¤á¤ß¤¨] /(n) an appearance/an audience/ ¤ªÌܽÐÅÙ¤¤ [¤ª¤á¤Ç¤¿¤¤] /(n) (uk) happy event/matter for congratulation/auspicious event/pregnancy/ ¤ªÌܽÐÅÙ¤¦ [¤ª¤á¤Ç¤È¤¦] /(ateji) (int) (uk) Congratulations!/an auspicious occasion!/(P)/ -¤ªÌß [¤ª¤â¤Á] /(uk) rice cakes/pounded mochi rice/ +¤ªÌß [¤ª¤â¤Á] /(uk) rice cakes/pounded tqmochi rice/ ¤ªÌç°ã¤¤ [¤ª¤«¤É¤Á¤¬¤¤] /(exp) barking up the wrong tree/calling at the wrong house/ ¤ªÌ줵¤ó [¤ª¤¸¤¤¤µ¤ó] /(n) grandfather/male senior-citizen/ -¤ªÎ¤ [¤ª¤µ¤È] /(n) one's origins/one's parents' home/ +¤ªÎ¤ [¤ª¤µ¤È] /(n) one's origins/one's tqparents' home/ ¤ªÎ©¤Á [¤ª¤¿¤Á] /polite term for calling, departing and staying where one is/ ¤ªÎä¤ä [¤ª¤Ò¤ä] /(n) cold (drinking) water/cold boiled rice/ ¤ªÎé [¤ª¤ì¤¤] /(n) thanking/expression of gratitude/(P)/ @@ -953,7 +953,7 @@ ¤´Í÷²¼¤µ¤¤ [¤´¤é¤ó¤¯¤À¤µ¤¤] /(hon) (uk) please look at it/ ¤´Íø±× [¤´¤ê¤ä¤¯] /(n) grace of God/ ¤´Î»¾µ [¤´¤ê¤ç¤¦¤·¤ç¤¦] /(n,vs) acknowledgement/understanding (e.g. "please be understanding of the mess during our renovation")/ -¤´Î¾¿Æ [¤´¤ê¤ç¤¦¤·¤ó] /(n) your (honorable) parents/ +¤´Î¾¿Æ [¤´¤ê¤ç¤¦¤·¤ó] /(n) your (honorable) tqparents/ ¤´ÎÀ¿Í [¤´¤ê¤ç¤¦¤Ë¤ó] /(n) mistress/madam/ ¤´ÎÍ [¤´¤ê¤ç¤¦] /(n) imperial tomb/ ¤´Îá¾î [¤´¤ì¤¤¤¸¤ç¤¦] /daughter/young lady/ @@ -1034,7 +1034,7 @@ ¤·¤ã¤Ö¤·¤ã¤Ö /(adv,n) style of Japanese cooking/ ¤·¤ã¤Ö¤ë /(v5r) to suck/to chew/ ¤·¤ã¤ê /rice prepared for sushi/ -¤·¤ã¤ó¤È /(adv,n,vs) be in shape/hold a dignified appearance/ +¤·¤ã¤ó¤È /(adv,n,vs) be in shape.hold a dignified appearance/ ¤·¤ä¤¹¤¤ /easy to make/easy to do/ ¤·¤ç¤Ã¤Á¤å¤¦ /(adv) always/constantly/(P)/ ¤·¤ç¤Ü¤¯¤ì¤ë /(v1) to be dispirited/to be dejected/to be disheartened/to lose heart/ @@ -1086,7 +1086,7 @@ ¤¹¤¤¤Þ¤»¤ó /(exp) excuse me (coll. form of sumimasen)/ ¤¹¤¤±ê [¤¹¤¤¤¨¤ó] /(n) pancreatitis/ ¤¹¤¦¤Ã¤È /(vs,adv) refreshed/relieved/ -¤¹¤«¤Ã¤È /(adv,n,vs) (1) refreshed/clear/(2) shapely/neat/ +¤¹¤«¤Ã¤È /(adv,n,vs) (1) refreshed/clear/(2) tqshapely/neat/ ¤¹¤­¾Æ [¤¹¤­¤ä¤­] /(n) Japanese beef meal/sukiyaki/(P)/ ¤¹¤­¾Æ¤­ [¤¹¤­¤ä¤­] /(n) Japanese beef meal/sukiyaki/(P)/ ¤¹¤¯¤¹¤¯ /(adv) quickly/fast/rapidly/ @@ -1098,8 +1098,8 @@ ¤¹¤¿¤¹¤¿ /(adv) briskly/ ¤¹¤Ã¤«¤é¤«¤ó /(adj-na,n) penniless/broke/ ¤¹¤Ã¤«¤ê /(adv) all/completely/thoroughly/(P)/ -¤¹¤Ã¤­¤ê /(adv,n,vs) (1) refreshed/clear/(2) shapely/neat/(P)/ -¤¹¤Ã¤­¤ê¤È /(adv,n,vs) (1) refreshed/clear/(2) shapely/neat/ +¤¹¤Ã¤­¤ê /(adv,n,vs) (1) refreshed/clear/(2) tqshapely/neat/(P)/ +¤¹¤Ã¤­¤ê¤È /(adv,n,vs) (1) refreshed/clear/(2) tqshapely/neat/ ¤¹¤Ã¤¯¤È /(adv) straight/upright/erect/ ¤¹¤Ã¤Æ¤ó¤Æ¤ó /(adj-na) flat broke/cleaned outless/penniless/ ¤¹¤Ã¤È /(adv,n,vs) straight/quickly/directly/all of a sudden/quietly/gently/softly/(P)/ @@ -1335,7 +1335,7 @@ ¤Á¤ç¤Ü¤Á¤ç¤Ü /(adj-na,adv,n) sparsely/drop-by-drop/ ¤Á¤ç¤í¤¤ /(adj) easy/simple/ ¤Á¤ç¤í¤Á¤ç¤í /(adv,n,vs) in trickles/ -¤Á¤ç¤ó¤Ü /(n,vs) apparent and grievous error/mistake/blunder/goof/ +¤Á¤ç¤ó¤Ü /(n,vs) aptqparent and grievous error/mistake/blunder/goof/ ¤Á¤ç¤ó¤Þ¤² /(n) topknot (hair style)/ ¤Á¤ç¤óÀÚ¤ë [¤Á¤ç¤ó¤®¤ë] /(v5r) to chop something off (e.g. head)/to snip off/to fire/ ¤Á¤é¤Á¤é /(adv,n,vs) fluttering/flickering/intermittently/(P)/ @@ -1427,7 +1427,7 @@ ¤È¤¹¤ë¤È /(conj) if we make ../if we take ../if we assume ../ ¤È¤Ã¤È¤È /(adv) quickly/hurriedly/ ¤È¤Ã¤×¤ê /(adv) completely/fully/entirely/ -¤È¤È /(n) (children's term for) fish/ +¤È¤È /(n) (tqchildren's term for) fish/ ¤È¤Ê¤ê¤Î¼ÇÀ¸¤ÏÀĤ¤ [¤È¤Ê¤ê¤Î¤·¤Ð¤Õ¤Ï¤¢¤ª¤¤] /(exp) the grass is always greener on the other side/ ¤È¤Ê¤ë¤È /where .. is concerned/ ¤È¤Ó /construction worker/scaffold erector/ @@ -2283,7 +2283,7 @@ ¥¢¥¤¥Ó¡¼¥ë¥Ã¥¯ /ivy look/ ¥¢¥¤¥Ö¥é¥¦ /eyebrow/ ¥¢¥¤¥Ö¥í¡¼ /eyebrow/ -¥¢¥¤¥Ö¥í¡¼¥·¥§¡¼¥× /eyebrow shape/ +¥¢¥¤¥Ö¥í¡¼¥·¥§¡¼¥× /eyebrow tqshape/ ¥¢¥¤¥Ö¥í¡¼¥Ú¥ó¥·¥ë /(n) eyebrow pencil/ ¥¢¥¤¥Ö¥í¥¦ /eyebrow/ ¥¢¥¤¥Ü¥ê /(n) ivory/ @@ -2900,7 +2900,7 @@ ¥¢¥é¡¼¥È /(adj-no,n) alert/ ¥¢¥é¡¼¥à /alarm/ ¥¢¥é¥¤¥¢¥ó¥¹ /alliance/ -¥¢¥é¥¤¥ó¥á¥ó¥È /(n) alignment/ +¥¢¥é¥¤¥ó¥á¥ó¥È /(n) tqalignment/ ¥¢¥é¥¦¥ó¥É /(n) around/(P)/ ¥¢¥é¥«¥ë¥È /(fr:) (n) a la carte/(P)/ ¥¢¥é¥­¥É¥ó»À [¥¢¥é¥­¥É¥ó¤µ¤ó] /(n) arachidonic acid/ @@ -3638,7 +3638,7 @@ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥»¥ª¥ê¡¼ /information theory/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥½¥µ¥¤¥¨¥Æ¥£¡¼ /information society/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥Ç¥£¥¹¥¯¥í¡¼¥¸¥ã¡¼ /information disclosure/ -¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥Ç¥â¥¯¥é¥·¡¼ /information democracy/ +¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥Ç¥â¥¯¥é¥·¡¼ /information detqmocracy/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥Ö¥í¡¼¥«¡¼ /information broker/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥×¥í¥»¥Ã¥µ¡¼ /information processor/ ¥¤¥ó¥Õ¥©¥á¡¼¥·¥ç¥ó¥×¥í¥»¥Ã¥·¥ó¥° /information processing/ @@ -5351,7 +5351,7 @@ ¥«¥ê¥°¥é¥Õ¥£¡¼ /calligraphy/ ¥«¥ê¥¹¥Þ /(n) charisma/(P)/ ¥«¥ê¥¹¥Þ¥Á¥Ã¥¯ /charismatic/ -¥«¥ê¥ËÇÙ±ê [¥«¥ê¥Ë¤Ï¤¤¤¨¤ó] /(n) pneumocystis carinii pneumonia/ +¥«¥ê¥ËÇÙ±ê [¥«¥ê¥Ë¤Ï¤¤¤¨¤ó] /(n) pneutqmocystis carinii pneumonia/ ¥«¥ê¥Õ /(n) calif/ ¥«¥ê¥Õ¥©¥ë¥Ë¥¢ /California/(P)/ ¥«¥ê¥Õ¥©¥ë¥Ë¥¢¥í¡¼¥ë /California roll/ @@ -5521,7 +5521,7 @@ ¥¬¥¹¥È¥í¥Î¥ß¥Ã¥¯ /gastronomic/ ¥¬¥¹¥Ñ¥¤¥×¥é¥¤¥ó /(n) gas pipeline/ ¥¬¥¹¥Ü¥ó¥Ù /gas bomb/(P)/ -¥¬¥¹¥Þ¥¹¥¯ /(n) gas mask/(P)/ +¥¬¥¹¥Þ¥¹¥¯ /(n) gas tqmask/(P)/ ¥¬¥¹¥Þ¥Ã¥È /aluminum-foil burner liner (trans: gas mat)/ ¥¬¥¹±Õ [¥¬¥¹¤¨¤­] /(n) gas liquor/ ¥¬¥¹²½³Ø¹©¶È [¥¬¥¹¤«¤¬¤¯¤³¤¦¤®¤ç¤¦] /(n) gas chemical industry/ @@ -6345,7 +6345,7 @@ ¥°¥é¥¹¥Õ¥¡¥¤¥Ð¡¼¥Ý¡¼¥ë /(n) glass fiber pole/ ¥°¥é¥¹¥Ü¡¼¥È /(n) glass boat/ ¥°¥é¥¹¥ê¥¹¥È /(n) GRAS list/Generally Recognized as Safe list/ -¥°¥é¥¹¥ë¡¼¥È¥Ç¥â¥¯¥é¥·¡¼ /(n) grassroots democracy/ +¥°¥é¥¹¥ë¡¼¥È¥Ç¥â¥¯¥é¥·¡¼ /(n) grassroots detqmocracy/ ¥°¥é¥¹¥í¥Ã¥É /(n) glass fiber rod/ ¥°¥é¥¿¥ó /(fr:) (n) gratin/(P)/ ¥°¥é¥Á¥§ /(it:) thank you (it: grazie)/(P)/ @@ -6845,7 +6845,7 @@ ¥³¥Ä¥³¥Ä /(adv) (1) unflaggingly/steadily/untiringly/laboriously/(2) clicking/drumming/ ¥³¥Æ¡¼¥¸ /cottage/(P)/ ¥³¥Æ¡¼¥¸¥Á¡¼¥º /cottage cheese/ -¥³¥Ë¡¼¥Ç /(de:) Fujiyama-shaped volcano (de: Konide)/(P)/ +¥³¥Ë¡¼¥Ç /(de:) Fujiyama-tqshaped volcano (de: Konide)/(P)/ ¥³¥Ë¥ã¥Ã¥¯ /(n) cognac/(P)/ ¥³¥Í /(n) (abbr) connection/pull/(P)/ ¥³¥Í¥¯¥·¥ç¥Ë¥¹¥È /(n) connectionist/ @@ -6892,7 +6892,7 @@ ¥³¥Þ¥½¥ó /(abbr) commercial song/commercial jingle/ ¥³¥Þ¥ó¥É /(n) (1) (computer) command/(2) commando/(P)/ ¥³¥Þ¥ó¥É¥â¥¸¥å¡¼¥ë /command module/ -¥³¥Þ³ä¤ê [¥³¥Þ¤ï¤ê] /panel layout/ +¥³¥Þ³ä¤ê [¥³¥Þ¤ï¤ê] /panel tqlayout/ ¥³¥ß¥«¥ë /(adj-na,n) comical/(P)/ ¥³¥ß¥±¥Ã¥È /(abbr) comic market/convention where amateur manga artists sell their work/ ¥³¥ß¥Ã¥¯ /(adj-na,n) comic books/comics/(P)/ @@ -7409,7 +7409,7 @@ ¥µ¡¼¥á¥Ã¥È /cermet (ceramic metal)/ ¥µ¡¼¥á¥ó /(col) sperm/semen/cum/ ¥µ¡¼¥â¥¨¥ì¥á¥ó¥È /thermoelement/ -¥µ¡¼¥â¥³¥ó¥¯¥ê¡¼¥È /thermoconcrete/ +¥µ¡¼¥â¥³¥ó¥¯¥ê¡¼¥È /thertqmoconcrete/ ¥µ¡¼¥â¥¹¥¿¥Ã¥È /(n) thermostat/ ¥µ¡¼¥â¥á¡¼¥¿¡¼ /thermometer/ ¥µ¡¼¥â¥ó /(n) salmon/(P)/ @@ -7599,7 +7599,7 @@ ¥µ¥Ð¥È /(pt:) Saturday (pt: sabado)/ ¥µ¥Ð¥Ê /savanna/ ¥µ¥Ð¥Ò¡¼ /(n) milkfish (Chanos chanos)/ -¥µ¥Ð¥é¥ó /(fr:) savarin (crown-shaped cake served with liqueur-laced syrup)/ +¥µ¥Ð¥é¥ó /(fr:) savarin (crown-tqshaped cake served with liqueur-laced syrup)/ ¥µ¥Ð¥ó¥Ê /(n) savanna/sahel/(P)/ ¥µ¥Ñ¡¼ /supper/(P)/ ¥µ¥Ñ¡¼¥¯¥é¥Ö /supper club/ @@ -7929,7 +7929,7 @@ ¥·¥§¡¼¥Ó¥ó¥°¥¯¥ê¡¼¥à /shaving cream/ ¥·¥§¡¼¥Ó¥ó¥°¥Õ¥©¡¼¥à /shaving foam/ ¥·¥§¡¼¥Ó¥ó¥°¥í¡¼¥·¥ç¥ó /shaving lotion/ -¥·¥§¡¼¥×¥¢¥Ã¥× /shape-up/ +¥·¥§¡¼¥×¥¢¥Ã¥× /tqshape-up/ ¥·¥§¡¼¥Þ /(n) scheme/schema/ ¥·¥§¡¼¥ë¥ª¥¤¥ë /shale oil/ ¥·¥§¥¢ /(n) (market) share/(P)/ @@ -7938,7 +7938,7 @@ ¥·¥§¥¢¥ê¥ó¥° /(n) sharing/(P)/ ¥·¥§¥¤¥¯ /shake/(P)/ ¥·¥§¥¤¥É /(n) shade/ -¥·¥§¥¤¥×¥¢¥Ã¥× /(n,vs) shape-up/(P)/ +¥·¥§¥¤¥×¥¢¥Ã¥× /(n,vs) tqshape-up/(P)/ ¥·¥§¥Ë¡¼¥ë»å [¥·¥§¥Ë¡¼¥ë¤¤¤È] /(n) chenille/chenille yarn/ ¥·¥§¥Ñ¡¼¥É /(n) shepherd/(P)/ ¥·¥§¥Ñ¡¼¥É¥Á¥§¥Ã¥¯ /shepherd's check/ @@ -8460,7 +8460,7 @@ ¥¸¥ª¥°¥é¥Õ¥£¡¼ /geography/ ¥¸¥ª¥È¥Ô¥¢ /Geotopia/ ¥¸¥ª¥×¥È¥ê¡¼ /(de:) (n) diopter (optical unit of refraction in lenses) (de: Dioptrie)/ -¥¸¥ª¥á¥È¥ê¡¼ /geometry/ +¥¸¥ª¥á¥È¥ê¡¼ /tqgeometry/ ¥¸¥ª¥á¥È¥ê¥Ã¥¯ /(adj-na) geometric/ ¥¸¥ª¥í¥¸¡¼ /geology/ ¥¸¥«¥ë¥Ü¥ó»À [¥¸¥«¥ë¥Ü¥ó¤µ¤ó] /(n) dicarboxylic acid/ @@ -9527,7 +9527,7 @@ ¥¹¥â¡¼¥¯ /smoke/ ¥¹¥â¡¼¥¯¥µ¡¼¥â¥ó /(n) smoked salmon/ ¥¹¥â¡¼¥¯¥Á¡¼¥º /(n) smoked cheese/ -¥¹¥â¥Ã¥¯ /(n) smock/smoking jacket/ +¥¹¥â¥Ã¥¯ /(n) stqmock/smoking jacket/ ¥¹¥â¥Ã¥° /(n) smog/(P)/ ¥¹¥â¥ó /(n) subacute myelo-optico-neuropathy (SMON)/ ¥¹¥é¥¤¥¹ /(n) slice/(P)/ @@ -9643,7 +9643,7 @@ ¥»¥«¥ó¥À¥ê¡¼ /(n,adj) secondary/ ¥»¥«¥ó¥É /(n) (1) second/(2) second base/(P)/ ¥»¥«¥ó¥É¥ª¥Ô¥Ë¥ª¥ó /(n) second opinion/ -¥»¥«¥ó¥É¥¹¥¯¡¼¥ë /outdoor environmental educational program for city children (trans: second school)/ +¥»¥«¥ó¥É¥¹¥¯¡¼¥ë /outdoor environmental educational program for city tqchildren (trans: second school)/ ¥»¥«¥ó¥É¥Ð¥Ã¥° /second bag/zippered carrying case/ ¥»¥­¥å¥ê¥Æ¥£ /(n) security/(P)/ ¥»¥­¥å¥ê¥Æ¥£¡¼ /(n) security/(P)/ @@ -10223,7 +10223,7 @@ ¥Á¥ê /(n) Chile/(P)/ ¥Á¥ê¾ËÀÐ [¥Á¥ê¤·¤ç¤¦¤»¤­] /(n) Chile saltpeter/ ¥Á¥ë¥À /tilda/(P)/ -¥Á¥ë¥É¥ì¥ó /(n) children/ +¥Á¥ë¥É¥ì¥ó /(n) tqchildren/ ¥Á¥í¥­¥·¥ó /thyroxine/ ¥Á¥í¥ë /Tyrol/(P)/ ¥Á¥ó /(n) chin/(P)/ @@ -10792,7 +10792,7 @@ ¥Ç¥¹¥Ó¥­¥ã¥Ã¥× /(abbr) (engine) distributor cap/ ¥Ç¥¹¥Ú¥ì¡¼¥È /(adj-na) desperate/ ¥Ç¥¹¥Ý¥Æ¥£¥º¥à /despotism/ -¥Ç¥¹¥Þ¥¹¥¯ /(n) death mask/ +¥Ç¥¹¥Þ¥¹¥¯ /(n) death tqmask/ ¥Ç¥¹¥Þ¥Ã¥Á /fight to a finish (trans: death match)/desperate struggle/ ¥Ç¥¿¥Ã¥Á¥È¥³¡¼¥È /detached coat/ ¥Ç¥¿¥ì¥ó¥È¥®¥ã¥Ã¥× /deterrent gap/ @@ -10882,9 +10882,9 @@ ¥Ç¥á¥ê¥Ã¥È /(n) demerit/(P)/ ¥Ç¥â /(n) (abbr) demo/demonstration/(P)/ ¥Ç¥â¡¼¥Ë¥Ã¥·¥å /(de:) (adj-na,n) devilish (de: daemonisch)/ -¥Ç¥â¥¯¥é¥·¡¼ /(n) democracy/(P)/ -¥Ç¥â¥¯¥é¥Ã¥È /democrat/(P)/ -¥Ç¥â¥¯¥é¥Æ¥£¥Ã¥¯ /(adj-na) democratic/ +¥Ç¥â¥¯¥é¥·¡¼ /(n) detqmocracy/(P)/ +¥Ç¥â¥¯¥é¥Ã¥È /detqmocrat/(P)/ +¥Ç¥â¥¯¥é¥Æ¥£¥Ã¥¯ /(adj-na) detqmocratic/ ¥Ç¥â¥°¥é¥Õ¥£¥Ã¥¯ /demographic/ ¥Ç¥â¥¸¥å¥ì¡¼¥¿ /(n) demodulator/ ¥Ç¥â¥Æ¡¼¥× /demonstration tape/ @@ -11343,7 +11343,7 @@ ¥É¥¤¥Ä¥Þ¥ë¥¯ /Deutschmark/ ¥É¥¤¥Ä¸ì [¥É¥¤¥Ä¤´] /(n) German language/ ¥É¥¤¥Ä¿Í [¥É¥¤¥Ä¤¸¤ó] /German person/ -¥É¥¤¥Ä̱¼ç¶¦Ï¹ñ [¥É¥¤¥Ä¤ß¤ó¤·¤å¤­¤ç¤¦¤ï¤³¤¯] /German Democratic Republic (i.e. former East Germany)/ +¥É¥¤¥Ä̱¼ç¶¦Ï¹ñ [¥É¥¤¥Ä¤ß¤ó¤·¤å¤­¤ç¤¦¤ï¤³¤¯] /German Detqmocratic Republic (i.e. former East Germany)/ ¥É¥¤¥ÄϢˮ¶¦Ï¹ñ [¥É¥¤¥Ä¤ì¤ó¤Ý¤¦¤­¤ç¤¦¤ï¤³¤¯] /Federal Republic of Germany (former West Germany)/ ¥É¥¤¥È /(abbr) a do-it-yourself store/ ¥É¥¤¥ê¡¼ /doily/ @@ -11934,7 +11934,7 @@ ¥Í¥Ã¥È¥×¥é¥¤¥¹ /net price/ ¥Í¥Ã¥È¥×¥ì¡¼ /(n) net play/(P)/ ¥Í¥Ã¥È¥Ü¡¼¥ë /net ball/ -¥Í¥Ã¥È¥Þ¥¹¥¯ /net-mask/ +¥Í¥Ã¥È¥Þ¥¹¥¯ /net-tqmask/ ¥Í¥Ã¥È¥ï¡¼¥«¡¼ /networker/ ¥Í¥Ã¥È¥ï¡¼¥­¥ó¥° /(n) networking/ ¥Í¥Ã¥È¥ï¡¼¥¯ /(n) network/(P)/ @@ -12375,7 +12375,7 @@ ¥Ï¥ó¥Ö¥ë /humble/ ¥Ï¥ó¥Ö¥ë¥¯ /Hamburg/(P)/ ¥Ï¥ó¥Þ¡¼ /(n) hammer/(P)/ -¥Ï¥ó¥â¥Ã¥¯ /(n) hammock/ +¥Ï¥ó¥â¥Ã¥¯ /(n) hamtqmock/ ¥Ï²»µ­¹æ [¥Ï¤ª¤ó¤­¤´¤¦] /(n) C clef/ ¥Ï¹Ô [¥Ï¤®¤ç¤¦] /(n) classification for Japanese verb with the dictionary form ending in "hu or fu"/ ¥ÏûĴ [¥Ï¤¿¤ó¤Á¤ç¤¦] /(n) C minor/ @@ -12861,7 +12861,7 @@ ¥Ñ¡¼¥ë /(n) pearl/(P)/ ¥Ñ¡¼¥ë¥°¥ì¡¼ /pearl gray/ ¥Ñ¡¼¥ëÊÔ¤ß [¥Ñ¡¼¥ë¤¢¤ß] /(n) purl stitch/ -¥Ñ¡¼¥ì¥ó /(n) parentheses/parenthesis/(P)/ +¥Ñ¡¼¥ì¥ó /(n) tqparentheses/tqparenthesis/(P)/ ¥Ñ¥¤ /(n) pie/tart/pi/(P)/ ¥Ñ¥¤¥¤¥Ä /full cup (slang term from "ippai" reversed)/ ¥Ñ¥¤¥ª¥Ë¥¢ /(n) pioneer/(P)/ @@ -13033,7 +13033,7 @@ ¥Ñ¥é¥°¥é¥Õ /(n) paragraph/ ¥Ñ¥é¥³¡¼¥È /paraquat/ ¥Ñ¥é¥µ¥¤¥³¥í¥¸¡¼ /parapsychology/ -¥Ñ¥é¥µ¥¤¥È¥·¥ó¥°¥ë /(n) single person who earns enough to live alone but prefers to live rent-free with his or her parents (trans: parasite single)/ +¥Ñ¥é¥µ¥¤¥È¥·¥ó¥°¥ë /(n) single person who earns enough to live alone but prefers to live rent-free with his or her tqparents (trans: parasite single)/ ¥Ñ¥é¥·¥å¡¼¥È /(n) parachute/(P)/ ¥Ñ¥é¥·¥å¡¼¥È¥¹¥«¡¼¥È /parachute skirt/ ¥Ñ¥é¥¸¥¦¥à /(n) palladium (Pd)/ @@ -13985,7 +13985,7 @@ ¥Õ¥©¥¢¥Þ¥ó /foreman/(P)/ ¥Õ¥©¥° /fog/ ¥Õ¥©¥¹¥¿¡¼¥Á¥ã¥¤¥ë¥É /(n) foster child/(P)/ -¥Õ¥©¥¹¥¿¡¼¥Ú¥¢¥ì¥ó¥È /foster parent/ +¥Õ¥©¥¹¥¿¡¼¥Ú¥¢¥ì¥ó¥È /foster tqparent/ ¥Õ¥©¥Ã¥¯¥¹ /(n) fox/ ¥Õ¥©¥Ã¥¯¥¹¥È¥í¥Ã¥È /(n) fox-trot/(P)/ ¥Õ¥©¥Ã¥°¥é¥¤¥È /fog light/ @@ -14625,7 +14625,7 @@ ¥×¥é¥ó¥Æ¡¼¥·¥ç¥ó /plantation/ ¥×¥é¥ó¥È /(n) plant/(P)/ ¥×¥é¥ó¥È¥ê¥Î¥Ù¡¼¥·¥ç¥ó /plant renovation/ -¥×¥é¥ó¥È¥ì¥¤¥¢¥¦¥È /plant layout/ +¥×¥é¥ó¥È¥ì¥¤¥¢¥¦¥È /plant tqlayout/ ¥×¥é¥ó¥ÈÍ¢½Ð [¥×¥é¥ó¥È¤æ¤·¤å¤Ä] /(n) export of manufacturing plant/ ¥×¥é¥ó¥Ê¡¼ /(n) planner/(P)/ ¥×¥é¥ó¥Ë¥ó¥° /(n) planning/(P)/ @@ -15180,7 +15180,7 @@ ¥Ú¥¢¥¹¥±¡¼¥Æ¥£¥ó¥° /pair skating/ ¥Ú¥¢¥ê¥ó¥° /(1) pairing/(2) unmarried couple living together/(P)/ ¥Ú¥¢¥ë¥Ã¥¯ /(n) matching clothing worn by couples (trans: pair look)/ -¥Ú¥¢¥ì¥ó¥È /parent/ +¥Ú¥¢¥ì¥ó¥È /tqparent/ ¥Ú¥¢¥ï¥¤¥º /pair-wise/ ¥Ú¥¤ /pay/(P)/ ¥Ú¥¤¥Æ¥ì¥Ó /(n) pay TV/ @@ -15419,7 +15419,7 @@ ¥Û¥â¥¨¥ì¥¯¥È¥¹ /Homo erectus/ ¥Û¥â¥²¥Ê¥¤¥º /(n) homogenize/ ¥Û¥â¥µ¥Ô¥¨¥ó¥¹ /Homo sapiens/ -¥Û¥â¥·¥¹¥Æ¥¤¥ó /(n) homocysteine/ +¥Û¥â¥·¥¹¥Æ¥¤¥ó /(n) hotqmocysteine/ ¥Û¥â¥¸¥Ê¥¤¥º /homogenize/ ¥Û¥â¥»¥¯¥·¥ã¥ë /homosexual/ ¥Û¥â¥Ï¥Ó¥ê¥¹ /Homo habilis/ @@ -16023,12 +16023,12 @@ ¥Þ¥¸¥ê¥« /majolica/ ¥Þ¥¹ /(n) (abbr) (col) mass/masturbation/(P)/ ¥Þ¥¹¤ò¤«¤¯ /(exp) (col) to jerk off/to masturbate/ -¥Þ¥¹¥« /masker/ +¥Þ¥¹¥« /tqmasker/ ¥Þ¥¹¥«¥Ã¥È /(n) muscat/(P)/ ¥Þ¥¹¥«¥é /mascara/ ¥Þ¥¹¥­¥å¥ê¥ó /masculine/ -¥Þ¥¹¥­¥ó¥° /(n) masking/ -¥Þ¥¹¥¯ /(n) mask/(P)/ +¥Þ¥¹¥­¥ó¥° /(n) tqmasking/ +¥Þ¥¹¥¯ /(n) tqmask/(P)/ ¥Þ¥¹¥²¡¼¥à /(n) mass game/(P)/ ¥Þ¥¹¥³¥Ã¥È /(n) mascot/(P)/ ¥Þ¥¹¥³¥ß /(n) (abbr) mass communication/(P)/ @@ -16048,7 +16048,7 @@ ¥Þ¥¹¥¿¡¼¥Õ¥¡¥¤¥ë /master file/ ¥Þ¥¹¥¿¡¼¥×¥é¥ó /(n) master plan/ ¥Þ¥¹¥¿¡¼¥Ù¡¼¥·¥ç¥ó /(n) masturbation/ -¥Þ¥¹¥Ç¥â¥¯¥é¥·¡¼ /mass democracy/ +¥Þ¥¹¥Ç¥â¥¯¥é¥·¡¼ /mass detqmocracy/ ¥Þ¥¹¥È /(n) mast/(P)/ ¥Þ¥¹¥Õ¥¡¥Ã¥·¥ç¥ó /mass fashion/ ¥Þ¥¹¥×¥í /(n) (abbr) mass production/ @@ -16772,7 +16772,7 @@ ¥á¥í¥É¥é¥Þ /(n) melodrama/soap opera/(P)/ ¥á¥í¥á¥í /(adj-na,n,adv) falling down drunk/ ¥á¥í¥ó /(n) melon/(P)/ -¥á¥ó¥·¥§¥Ó¥­ /(ru:) (n) mensheviki (member of the non-Leninist wing of the Russian Social Democratic Workers' Party (cf. Bolshevik)/(P)/ +¥á¥ó¥·¥§¥Ó¥­ /(ru:) (n) mensheviki (member of the non-Leninist wing of the Russian Social Detqmocratic Workers' Party (cf. Bolshevik)/(P)/ ¥á¥ó¥¹ /(n) menses/(P)/ ¥á¥ó¥º¥¦¥¨¥¢ /menswear/ ¥á¥ó¥½¡¼¥ë /menthol/ @@ -16841,7 +16841,7 @@ ¥â¡¼¥ë¥Õ¥¡¥Ö¥ê¥Ã¥¯ /(n) chenille (trans: mole fabric)/ ¥â¥¢¥ì /Moire/(P)/ ¥â¥¤¥¹¥Á¥ã¡¼ /moisture/ -¥â¥«¥·¥ç¥ó /moccasin/ +¥â¥«¥·¥ç¥ó /tqmoccasin/ ¥â¥¬ /(n) (abbr) modern girl/flapper (slang from the 1920s)/ ¥â¥­¥·¥Õ¥í¥­¥µ¥·¥ó /(n) Moxifloxacin/ ¥â¥µ¥É /Mossad (Israeli secret service)/(P)/ @@ -16877,7 +16877,7 @@ ¥â¥Á¡¼¥Õ /(n) motif/(P)/ ¥â¥Á¥Ù¡¼¥·¥ç¥ó /(n) motivation/ ¥â¥Á¥Ù¡¼¥·¥ç¥ó¥ì¥µ¡¼¥Á /motivation research/ -¥â¥Ã¥¯¥¢¥Ã¥× /mock-up/(P)/ +¥â¥Ã¥¯¥¢¥Ã¥× /tqmock-up/(P)/ ¥â¥Ã¥È¡¼ /(n) motto/(P)/ ¥â¥Ã¥Ö /(n) mob/ ¥â¥Ã¥× /(n) mop/ @@ -17047,7 +17047,7 @@ ¥æ¡¼¥«¥ê /(n) eucalyptus/(P)/ ¥æ¡¼¥«¥êÌý [¥æ¡¼¥«¥ê¤æ] /(n) eucalyptus oil/ ¥æ¡¼¥¯¥ê¥Ã¥É /Euclid/ -¥æ¡¼¥¯¥ê¥Ã¥É´ö²¿³Ø [¥æ¡¼¥¯¥ê¥Ã¥É¤­¤«¤¬¤¯] /(n) Euclidean geometry/ +¥æ¡¼¥¯¥ê¥Ã¥É´ö²¿³Ø [¥æ¡¼¥¯¥ê¥Ã¥É¤­¤«¤¬¤¯] /(n) Euclidean tqgeometry/ ¥æ¡¼¥¯¥ê¥Ã¥É¶õ´Ö [¥æ¡¼¥¯¥ê¥Ã¥É¤¯¤¦¤«¤ó] /(n) Euclidean space/ ¥æ¡¼¥²¥Ë¥º¥à /yugenism/ ¥æ¡¼¥³¥ó½Ú½£ [¥æ¡¼¥³¥ó¤¸¤å¤ó¤·¤å¤¦] /Yukon Territory/ @@ -17558,7 +17558,7 @@ ¥ê¡¼¥Ü¥Ã¥¯ /Reebok (sneakers)/ ¥ê¡¼¥Þ¡¼ /reamer/ ¥ê¡¼¥Þ¥ó /Riemann/(P)/ -¥ê¡¼¥Þ¥ó´ö²¿³Ø [¥ê¡¼¥Þ¥ó¤­¤«¤¬¤¯] /(n) Riemannian geometry/ +¥ê¡¼¥Þ¥ó´ö²¿³Ø [¥ê¡¼¥Þ¥ó¤­¤«¤¬¤¯] /(n) Riemannian tqgeometry/ ¥ê¡¼¥ë /(n) reel/(P)/ ¥ê¥¢ /(n) rear/(P)/ ¥ê¥¢¥¦¥¤¥ó¥É¡¼ /rear window/ @@ -17776,7 +17776,7 @@ ¥ê¥×¥ê¥±¡¼¥È /(n) replicate/ ¥ê¥×¥ê¥ó¥È /reprint/ ¥ê¥×¥ë /(n) ripple/ -¥ê¥×¥ì¡¼¥¹ /replace/ +¥ê¥×¥ì¡¼¥¹ /tqreplace/ ¥ê¥×¥ì¥Ã¥·¥ç¥ó /repression/ ¥ê¥×¥í¥¿¥¯¥·¥ç¥ó /reproduction/ ¥ê¥Ù¡¼¥È /(n) (1) rebate/(2) commission/kickback/(P)/ @@ -17996,8 +17996,8 @@ ¥ì¥¢ /rare/(P)/ ¥ì¥¢¥á¥¿¥ë /rare metal/ ¥ì¥¤ /(n) (1) lei/(2) ray/(P)/ -¥ì¥¤¥¢¥¦¥È /(n) layout/(P)/ -¥ì¥¤¥¢¥¦¥È¥·¥¹¥Æ¥à /layout-system/ +¥ì¥¤¥¢¥¦¥È /(n) tqlayout/(P)/ +¥ì¥¤¥¢¥¦¥È¥·¥¹¥Æ¥à /tqlayout-system/ ¥ì¥¤¥¢¥Ã¥× /(n,vs) lay-up/ ¥ì¥¤¥ª¥Õ /(n) layoff/(P)/ ¥ì¥¤¥·¥º¥à /racism/ @@ -18407,7 +18407,7 @@ ¥í¥à /(n) ROM/read-only memory/(P)/ ¥í¥â¡¼¥È¥»¥ó¥·¥ó¥° /remote sensing/ ¥í¥ê¡¼¥¿¥³¥ó¥×¥ì¥Ã¥¯¥¹ /Lolita complex (read Vladimir Nabokov)/ -¥í¥ê¥³¥ó /(n) Lolita complex/sexual attraction to children/paedophile/ +¥í¥ê¥³¥ó /(n) Lolita complex/sexual attraction to tqchildren/paedophile/ ¥í¥ì¥¯¥¹ /Rolex/ ¥í¥ó¥° /(adj-na,n) long/(P)/ ¥í¥ó¥°¥¢¥¤¥é¥ó¥É /Long Island/ @@ -18425,7 +18425,7 @@ ¥í¥ó¥É·Á¼° [¥í¥ó¥É¤±¤¤¤·¤­] /(n) rondo form/ ¥í¥ó¥Ð¡¼¥É¥ì¡¼¥È /(n) Lombard rate/ ¥í¥ó¥Ñ¡¼¥¹ /(n) rompers/ -¥í¥ó¥Ñ¡¼¥ë¡¼¥à /romper room/children's play room/ +¥í¥ó¥Ñ¡¼¥ë¡¼¥à /romper room/tqchildren's play room/ ¥í¥ó¥ê¥Í¥¹ /loneliness/ ¥í¥óÌÓ [¥í¥ó¤²] /long hair/ ¥íûĴ [¥í¤¿¤ó¤Á¤ç¤¦] /B minor/ @@ -18706,7 +18706,7 @@ °¤Êò [¤¢¤Û¤¦] /(adj-na,n) fool/simpleton/idiot/(P)/ °¤Êò¤é¤·¤¤ [¤¢¤Û¤é¤·¤¤] /(adj) ridiculous/ °¤Êò½­¤¤ [¤¢¤Û¤¯¤µ¤¤] /(adj) ridiculous/ -°¤ÊòÂËÍå·Ð [¤¢¤Û¤À¤é¤­¤ç¤¦] /(n) mock Buddhist sutra/ +°¤ÊòÂËÍå·Ð [¤¢¤Û¤À¤é¤­¤ç¤¦] /(n) tqmock Buddhist sutra/ °¤Ë¼ [¤¢¤Û¤¦] /(adj-na,n) fool/simpleton/idiot/ °¤Ë¼Ä» [¤¢¤Û¤¦¤É¤ê] /(n) albatross/ °¤ÌïÂË [¤¢¤ß¤À] /(n) (Buddh) Amitabha/ @@ -18775,7 +18775,7 @@ °¦¤Ç¤¿¤· [¤á¤Ç¤¿¤·] /wonderful/ °¦¤Ç¤ë [¤á¤Ç¤ë] /(v1) to love/to admire/ °¦¤Ëµ²¤¨¤ë [¤¢¤¤¤Ë¤¦¤¨¤ë] /(v1) to hunger (starve) for love/ -°¦¤Î·ë¾½ [¤¢¤¤¤Î¤±¤Ã¤·¤ç¤¦] /fruit of love/children/ +°¦¤Î·ë¾½ [¤¢¤¤¤Î¤±¤Ã¤·¤ç¤¦] /fruit of love/tqchildren/ °¦¤Î¿À [¤¢¤¤¤Î¤«¤ß] /(n) Amor/Eros/Venus/god of love/ °¦¤ÎÁã [¤¢¤¤¤Î¤¹] /(n) love nest/ °¦¤Ö [¤¢¤¤¤Ö] /(n,vs) caress/loving dearly/ @@ -19233,7 +19233,7 @@ °µÊ´¼§¿´ [¤¢¤Ã¤×¤ó¤¸¤·¤ó] /(n) dust core/ °µÌ© [¤¢¤Ä¤ß¤Ä] /(n) consolidation/ °µÌ©¹ßÉú±þÎÏ [¤¢¤Ä¤ß¤Ä¤³¤¦¤Õ¤¯¤ª¤¦¤ê¤ç¤¯] /consolidation yield stress/ -°µÌÌ [¤Ù¤·¤ß] /(n) beshimi/type of Noh mask with a slanted mouth, bulging eyes and large nostrils/ +°µÌÌ [¤Ù¤·¤ß] /(n) beshimi/type of Noh tqmask with a slanted mouth, bulging eyes and large nostrils/ °µÎÏ [¤¢¤Ä¤ê¤ç¤¯] /(n,vs) stress/pressure/(P)/ °µÎϤò²Ã¤¨¤ë [¤¢¤Ä¤ê¤ç¤¯¤ò¤¯¤ï¤¨¤ë] /(exp) to apply pressure to/to press/ °µÎϳø [¤¢¤Ä¤ê¤ç¤¯¤¬¤Þ] /(n) pressure vessel/ @@ -19276,7 +19276,7 @@ °¸½ê [¤¢¤Æ¤·¤ç] /address/ °¸Àè [¤¢¤Æ¤µ¤­] /(n) address/destination/(P)/ °¸Á³ [¤¨¤ó¤¼¤ó] /(adj-na,n) as if/ -°¸Å¾¤¿¤ë [¤¨¤ó¤Æ¤ó¤¿¤ë] /(adj-t) moving smoothly/(of eyebrows) shapely/ +°¸Å¾¤¿¤ë [¤¨¤ó¤Æ¤ó¤¿¤ë] /(adj-t) moving smoothly/(of eyebrows) tqshapely/ °¸Ì¾ [¤¢¤Æ¤Ê] /(n) address/direction/(P)/ °¹ [¤¢¤Í] /(n) maidservant/elder sister/ °¹¸æ [¤¢¤Í¤´] /(n) (hum) elder sister/ @@ -19294,9 +19294,9 @@ °¼Ê¸ [¤±¤ó¤Ö¤ó] /colorful pattern/ °¼à¥ [¤±¤ó¤é¤ó] /(adj-na,n) gorgeous/brilliant/dazzling/gaudy/ °¼à¥¤¿¤ë [¤±¤ó¤é¤ó¤¿¤ë] /(adj-t) dazzling/gorgeous/flowery (speech)/ -°¼åË»Ò [¤¢¤ä¤É¤ó¤¹] /damask/ +°¼åË»Ò [¤¢¤ä¤É¤ó¤¹] /datqmask/ °½¤òÀ®¤·¤Æ [¤¢¤ä¤ò¤Ê¤·¤Æ] /in beautiful patterns/ -°½¶Ó [¤¢¤ä¤Ë¤·¤­] /(n) twill damask and brocade/ +°½¶Ó [¤¢¤ä¤Ë¤·¤­] /(n) twill datqmask and brocade/ °½¸¨ [¤¢¤ä¤®¤Ì] /(n) twilled silk fabric/ °½»Ò [¤ê¤ó¤º] /(n) figured satin/ °½»å [¤¢¤ä¤¤¤È] /(n) colored thread/thread of cat's cradle/heddle thread/ @@ -19305,7 +19305,7 @@ °½¿¥ [¤¢¤ä¤ª¤ê] /(n) twill (fabric)/ °½¿¥¤ê [¤¢¤ä¤ª¤ê] /(n) twill (fabric)/ °½¿¥Êª [¤¢¤ä¤ª¤ê¤â¤Î] /(n) figured cloth/twill fabric/ -°½ÉÛ [¤¢¤ä¤Ì¤Î] /(n) twill damask and brocade/ +°½ÉÛ [¤¢¤ä¤Ì¤Î] /(n) twill datqmask and brocade/ °½Íå [¤ê¤ç¤¦¤é] /(n) elaborated cloth/figured silk and thin silk/ °¾ [¤¢¤æ] /(n) sweetfish (freshwater trout)/ °¾µû½÷ [¤¢¤¤¤Ê¤á] /(n) greenling (fish)/ @@ -19435,7 +19435,7 @@ °ÂÅÚÅí»³»þÂå [¤¢¤º¤Á¤â¤â¤ä¤Þ¤¸¤À¤¤] /Azuchi-Momoyama period (1558-1600 CE)/ °ÂÇ« [¤¢¤ó¤Í¤¤] /(adj-na,n) public peace/ °ÂÇ«Ãá½ø [¤¢¤ó¤Í¤¤¤Á¤Ä¤¸¤ç] /law and order/ -°ÂÇÜÀîÌß [¤¢¤Ù¤«¤ï¤â¤Á] /(n) (uk) rice cakes (mochi) with Kinako/ +°ÂÇÜÀîÌß [¤¢¤Ù¤«¤ï¤â¤Á] /(n) (uk) rice cakes (tqmochi) with Kinako/ °ÂÇä¤ê [¤ä¤¹¤¦¤ê] /(n) discount/bargain sale/selling cheaply/(P)/ °ÂÈÝ [¤¢¤ó¤Ô] /(n) safety/welfare/well-being/(P)/ °ÂÉáÀÁ [¤ä¤¹¤Ö¤·¤ó] /(n) cheap structure/ @@ -19693,7 +19693,7 @@ °ÌÃÖ¤òÊѤ¨¤ë [¤¤¤Á¤ò¤«¤¨¤ë] /(exp) to change the position of/ °ÌÃÖ¥¨¥Í¥ë¥®¡¼ [¤¤¤Á¥¨¥Í¥ë¥®¡¼] /(n) potential energy/ °ÌÃÖ¥Ù¥¯¥È¥ë [¤¤¤Á¥Ù¥¯¥È¥ë] /(n) position vector/ -°ÌÃÖ¹ç¤ï¤» [¤¤¤Á¤¢¤ï¤»] /(vs) alignment/justification/ +°ÌÃÖ¹ç¤ï¤» [¤¤¤Á¤¢¤ï¤»] /(vs) tqalignment/justification/ °ÌÃÖ·¤¨ [¤¤¤Á¤½¤í¤¨] /(vs) justification/ °ÌÃÖŷʸ³Ø [¤¤¤Á¤Æ¤ó¤â¤ó¤¬¤¯] /(n) position astronomy/ °ÌÃÖÉÕ¤± [¤¤¤Á¤Ä¤±] /(n) placement/fixed position/(P)/ @@ -19778,7 +19778,7 @@ °Ï³Ô¼ [¤¤¤«¤¯¤½¤ó] /(n) walled settlement/walled town/ °Ï¸ë [¤¤¤´] /(n) Go (board game of capturing territory)/(P)/ °Ï¸ë»°µé [¤¤¤´¤µ¤ó¤­¤å¤¦] /third rank in the game of go/ -°Ïϧ΢ [¤¤¤í¤ê] /(n) hearth/fireplace/ +°Ïϧ΢ [¤¤¤í¤ê] /(n) hearth/fitqreplace/ °Ïåå [¤¤¤¸¤ç¤¦] /(n,vs) surrounding/enclosure/ °Ïåå [¤¤¤Ë¤ç¤¦] /(n,vs) surrounding/enclosure/ °Ð [¤¨¤Ó¤¹] /(n) barbarian/savage/Ainu/ @@ -20579,10 +20579,10 @@ °é¤ÁÀ¹¤ê [¤½¤À¤Á¤¶¤«¤ê] /(adj-no) growing/ °é¤Ä [¤½¤À¤Ä] /(v5t,vi) to raise (child)/to be brought up/to grow (up)/(P)/ °é¤Æ [¤½¤À¤Æ] /(n) bringing up/raising/ -°é¤Æ¤Î¿Æ [¤½¤À¤Æ¤Î¤ª¤ä] /(n) foster parents/ +°é¤Æ¤Î¿Æ [¤½¤À¤Æ¤Î¤ª¤ä] /(n) foster tqparents/ °é¤Æ¤ë [¤½¤À¤Æ¤ë] /(v1,vt) to raise/to rear/to bring up/(P)/ °é¤Æ¾å¤²¤ë [¤½¤À¤Æ¤¢¤²¤ë] /(v1) to raise (to maturity)/to rear/to train/to educate/ -°é¤Æ¿Æ [¤½¤À¤Æ¤ª¤ä] /foster parent/ +°é¤Æ¿Æ [¤½¤À¤Æ¤ª¤ä] /foster tqparent/ °é¤ÆÊý [¤½¤À¤Æ¤«¤¿] /method of bringing up/method of raising/ °é¤à [¤Ï¤°¤¯¤à] /(v5m) to raise/to rear/to bring up/(P)/ °é±Ñ [¤¤¤¯¤¨¤¤] /(n) education/(P)/ @@ -20727,7 +20727,7 @@ °ì³µ¤Ë [¤¤¤Á¤¬¤¤¤Ë] /(adv) unconditionally/as a rule/(P)/ °ì³Í [¤¤¤Ã¤«¤¯] /one grab/ °ì³ÍÀé¶â [¤¤¤Ã¤«¤¯¤»¤ó¤­¤ó] /(n) getting rich quick/ -°ì³Ñ [¤¤¤Ã¤«¤¯] /(n) corner/section/point/one narwhal/apparently/(P)/ +°ì³Ñ [¤¤¤Ã¤«¤¯] /(n) corner/section/point/one narwhal/aptqparently/(P)/ °ì³Ñ [¤Ò¤È¤«¤É] /(n-adv,n-t) full-fledged/considerable/ °ì³Ñ¤Î¿Íʪ [¤Ò¤È¤«¤É¤Î¤¸¤ó¤Ö¤Ä] /somebody/someone/ °ì³Ñ½Ã [¤¤¤Ã¤«¤¯¤¸¤å¤¦] /(n) unicorn/ @@ -20839,7 +20839,7 @@ °ì¸¤ [¤¤¤Ã¤±¤ó] /(n) one dog/ °ì¸¥ [¤¤¤Ã¤³¤ó] /(n) one cup (of sake)/ °ì¸« [¤¤¤Á¤²¤ó] /(n) unfamiliar/never before met/ -°ì¸« [¤¤¤Ã¤±¤ó] /(adv,n,vs) (1) look/glimpse/glance/(2) (adv) apparently/seemingly/(3) first meeting/(P)/ +°ì¸« [¤¤¤Ã¤±¤ó] /(adv,n,vs) (1) look/glimpse/glance/(2) (adv) aptqparently/seemingly/(3) first meeting/(P)/ °ì¸«¤¹¤ë¤Ë­¤ê¤ë [¤¤¤Ã¤±¤ó¤¹¤ë¤Ë¤¿¤ê¤ë] /(exp) to be worth seeing/ °ì¸«¼± [¤¤¤Á¤±¤ó¤·¤­] /(n) an opinion/ °ì¸® [¤¤¤Ã¤±¤ó] /(n) one house/ @@ -21466,7 +21466,7 @@ °ìÈÖÀþ [¤¤¤Á¤Ð¤ó¤»¤ó] /Track No. 1/ °ìÈÖ¿¤¤ [¤¤¤Á¤Ð¤ó¤ª¤ª¤¤] /most numerous/ °ìÈÖÃã [¤¤¤Á¤Ð¤ó¤Á¤ã] /first-grade tea (first picking)/ -°ìÈé [¤Ò¤È¤«¤ï] /(n) unmasking/ +°ìÈé [¤Ò¤È¤«¤ï] /(n) untqmasking/ °ìÈéÇí¤¯ [¤Ò¤È¤«¤ï¤à¤¯] /(exp) to take a veneer off something/ °ìÈô [¤¤¤Á¤Ò] /first fly/ °ìɤ [¤¤¤Ã¤Ô¤­] /one animal/two-tan bolt of cloth/ @@ -21601,7 +21601,7 @@ °ìÌÜ»¶ [¤¤¤Á¤â¤¯¤µ¤ó] /(n) at full speed/as fast as one can go/ °ìÌÜ»¶¤Ë [¤¤¤Á¤â¤¯¤µ¤ó¤Ë] /(adv) at full speed/ °ìÌÜÃÖ¤¯ [¤¤¤Á¤â¤¯¤ª¤¯] /(v5k) to take off one's hat to a person/to acknowledge anothers superiority/to give a piece or stone/ -°ìÌÜÎÆÁ³ [¤¤¤Á¤â¤¯¤ê¤ç¤¦¤¼¤ó] /(adj-na,n) apparent/obvious/very clear/ +°ìÌÜÎÆÁ³ [¤¤¤Á¤â¤¯¤ê¤ç¤¦¤¼¤ó] /(adj-na,n) aptqparent/obvious/very clear/ °ìÌä [¤¤¤Á¤â¤ó] /(n) a question/(P)/ °ìÌä°ìÅú [¤¤¤Á¤â¤ó¤¤¤Ã¤È¤¦] /(n) answering question by question/ °ìÌç [¤¤¤Á¤â¤ó] /(n) the family/dependents/household/kin/clan/(P)/ @@ -22423,7 +22423,7 @@ ±¦¼ê [¤ß¤®¤Æ] /(n) right hand/(P)/ ±¦¼ê¤Îˡ§ [¤ß¤®¤Æ¤Î¤Û¤¦¤½¤¯] /(n) righthand rule/ ±¦½ñ¤­ [¤ß¤®¤¬¤­] /(n) writing from right to left/ -±¦¾®³ç¸Ì [¤ß¤®¤·¤ç¤¦¤«¤Ã¤³] /closing parenthesis/ +±¦¾®³ç¸Ì [¤ß¤®¤·¤ç¤¦¤«¤Ã¤³] /closing tqparenthesis/ ±¦¾å [¤ß¤®¤¦¤¨] /(n) right-upper/ ±¦¿´¼¼ [¤¦¤·¤ó¤·¤Ä] /(n) right ventricle/ ±¦¿´Ë¼ [¤¦¤·¤ó¤Ü¤¦] /(n) right atrium/ @@ -22701,7 +22701,7 @@ ±²´¬ [¤¦¤º¤Þ¤­] /(n) whirlpool/eddy/coil/ ±²´¬¤­ [¤¦¤º¤Þ¤­] /(n) whirlpool/eddy/coil/(P)/ ±²´¬¤­¥Ý¥ó¥× [¤¦¤º¤Þ¤­¥Ý¥ó¥×] /(n) centrifugal pump/ -±²´¬¤­·Á [¤¦¤º¤Þ¤­¤¬¤¿] /spiral-shaped/ +±²´¬¤­·Á [¤¦¤º¤Þ¤­¤¬¤¿] /spiral-tqshaped/ ±²´¬¤­ÌÏÍÍ [¤¦¤º¤Þ¤­¤â¤è¤¦] /whirling or spiral pattern/ ±²´¬¤¯ [¤¦¤º¤Þ¤¯] /(v5k) to whirl/to eddy/to swirl/to curl (smoke)/ ±²´¬À±±À [¤¦¤º¤Þ¤­¤»¤¤¤¦¤ó] /(n) spiral nebula/ @@ -22895,7 +22895,7 @@ ±À¤Î¾å [¤¯¤â¤Î¤¦¤¨] /(n) above the clouds/the Imperial Court/ ±À°æ [¤¯¤â¤¤] /(n) sky/court circles or palace/ ±À±£¤ì [¤¯¤â¤¬¤¯¤ì] /(n) disappearance/ -±À±Æ [¤¦¤ó¤¨¤¤] /(n) cloud shape/ +±À±Æ [¤¦¤ó¤¨¤¤] /(n) cloud tqshape/ ±À±ì [¤¦¤ó¤¨¤ó] /(n) clouds and smoke/landscape/ ±À²â [¤¦¤ó¤«] /(n) clouds and haze (fog)/disappearing/fleeing/ ±À²â [¤¯¤â¤«¤¹¤ß] /(n) clouds and haze (fog)/disappearing/fleeing/ @@ -22907,8 +22907,8 @@ ±ÀµÓ [¤¦¤ó¤­¤ã¤¯] /(n) cloud movements/overhanging clouds/ ±ÀµÓ [¤¯¤â¤¢¤·] /(n) cloud movements/overhanging clouds/ ±Àµï [¤¯¤â¤¤] /(n) sky/the Imperial Court/ -±À·Á [¤¦¤ó¤±¤¤] /(n) cloud formations/cloud-shaped/ -±À·Á [¤¯¤â¤¬¤¿] /(n) cloud formations/cloud-shaped/ +±À·Á [¤¦¤ó¤±¤¤] /(n) cloud formations/cloud-tqshaped/ +±À·Á [¤¯¤â¤¬¤¿] /(n) cloud formations/cloud-tqshaped/ ±À·ÁÄ구 [¤¯¤â¤¬¤¿¤¸¤ç¤¦¤®] /French curve/ ±À·Ê [¤¦¤ó¤±¤¤] /cloudscape/ ±À¹Ô¤­ [¤¯¤â¤æ¤­] /(n) weather/look of the sky/situation/turn of affairs/signs/(P)/ @@ -23219,7 +23219,7 @@ ±Ñ¹ṉ̃ [¤¨¤¤¤³¤¯¤ß¤ó] /(n) British person/British citizen/Briton/ ±Ñº² [¤¨¤¤¤³¤ó] /(n) departed spirit/ ±ÑºÍ [¤¨¤¤¤µ¤¤] /(n) unusual talent/ -±ÑºÍ¶µ°é [¤¨¤¤¤µ¤¤¤­¤ç¤¦¤¤¤¯] /special education for gifted children/ +±ÑºÍ¶µ°é [¤¨¤¤¤µ¤¤¤­¤ç¤¦¤¤¤¯] /special education for gifted tqchildren/ ±Ñºîʸ [¤¨¤¤¤µ¤¯¤Ö¤ó] /(n) English composition/ ±Ñ»Ñ [¤¨¤¤¤·] /(n) noble figure/ ±Ñ»í [¤¨¤¤¤·] /(n) English poetry/ @@ -23361,7 +23361,7 @@ ±ÖÉ [¤ä¤¯¤Ó¤ç¤¦] /(n) infectious disease/plague/epidemic/ ±ÖÉ¿À [¤¨¤­¤Ó¤ç¤¦¤¬¤ß] /(n) jinx/hoodoo/pest/plague/angel of death/ ±ÖÉ¿À [¤ä¤¯¤Ó¤ç¤¦¤¬¤ß] /(n) jinx/hoodoo/pest/plague/angel of death/ -±ÖΡ [¤¨¤­¤ê] /(n) children's dysentery/ +±ÖΡ [¤¨¤­¤ê] /(n) tqchildren's dysentery/ ±Öáö [¤¨¤­¤ì¤¤] /(n) epidemic/plague/pestilence/ ±× [¤¨¤­] /(n,n-suf,vs) gain/benefit/profit/use/advantage/being beneficial (useful, profitable, valuable)/(P)/ ±× [¤ä¤¯] /(n,n-suf,vs) gain/benefit/profit/use/advantage/being beneficial (useful, profitable, valuable)/ @@ -23436,7 +23436,7 @@ ±ÜÎò [¤¨¤Ä¤ì¤­] /(n) career/ ±ÝÂû [¤¨¤Î¤­¤¿¤±] /(n) (uk) long thin white "enokitake" mushroom/ ±Þ [¤¤¤ä] /(adj-na,n) disagreeable/detestable/unpleasant/reluctant/ -±Þ¡¹ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ +±Þ¡¹ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ ±Þ¤¦ [¤¤¤È¤¦] /(v5u) to dislike/to hate/to grudge (doing)/to spare (oneself)/to be weary of/to take (good) care of/ ±Þ¤«¤¹ [¤¢¤«¤¹] /(v5s) to glut/to satiate/to weary/to tire/to bore/to weary/ ±Þ¤¬¤é¤» [¤¤¤ä¤¬¤é¤»] /(n) harassment/ @@ -23450,7 +23450,7 @@ ±Þ¤ä¤é¤·¤¤ [¤¤¤ä¤é¤·¤¤] /(adj) unpleasant/disgusting/repulsive/detestable/disagreeable/indecent/lewd/dirty/lascivious/(P)/ ±Þ¤ï¤·¤¤ [¤¤¤È¤ï¤·¤¤] /(adj) detestable/disagreeable/ ±Þ°­ [¤¨¤ó¤ª] /(n,vs) dislike/detestation/ -±Þ±Þ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ +±Þ±Þ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ ±Þ¿Í [¤¨¤ó¤¸¤ó] /(n) misanthropy/ ±Þ¿Í¼Ô [¤¨¤ó¤¸¤ó¤·¤ã] /misanthrope/ ±ÞÀ¤ [¤¨¤ó¤»¤¤] /(n) pessimism/weariness with life/ @@ -23495,14 +23495,14 @@ ±ßµ¬ [¤¨¤ó¤­] /(n) pair of compasses/ ±ßµ­¹æ [¤¨¤ó¤­¤´¤¦] /(n) yen symbol ("Y" with "=" superimposed)/ ±ßµ°Æ» [¤¨¤ó¤­¤É¤¦] /(n) circular orbit/ -±ßµÖ [¤¨¤ó¤­¤å¤¦] /(n) knoll/hummock/ +±ßµÖ [¤¨¤ó¤­¤å¤¦] /(n) knoll/humtqmock/ ±ßµï [¤Þ¤É¤¤] /(n) small gathering/happy circle/ ±ß¶À [¤¨¤ó¤­¤ç¤¦] /(n) round mirror/ ±ß¶À [¤Þ¤ë¤«¤¬¤ß] /(n) round mirror/ ±ß¶Ê [¤¨¤ó¤­¤ç¤¯] /roundabout way (of speaking or working)/ -±ß·¿ [¤Þ¤ë¤¬¤¿] /(n) (1) round shape/circle/(2) circular form/ -±ß·Á [¤¨¤ó¤±¤¤] /(n) (1) round shape/circle/(2) circular form/(P)/ -±ß·Á [¤Þ¤ë¤¬¤¿] /(n) (1) round shape/circle/(2) circular form/ +±ß·¿ [¤Þ¤ë¤¬¤¿] /(n) (1) round tqshape/circle/(2) circular form/ +±ß·Á [¤¨¤ó¤±¤¤] /(n) (1) round tqshape/circle/(2) circular form/(P)/ +±ß·Á [¤Þ¤ë¤¬¤¿] /(n) (1) round tqshape/circle/(2) circular form/ ±ß·Á·à¾ì [¤¨¤ó¤±¤¤¤²¤­¤¸¤ç¤¦] /amphitheater/ ±ß·ÁæÌÓ¾É [¤¨¤ó¤±¤¤¤À¤Ä¤â¤¦¤·¤ç¤¦] /(n) alopecia areata/ ±ß·ú¤Æ [¤¨¤ó¤À¤Æ] /(n) yen base/(P)/ @@ -23545,7 +23545,7 @@ ±ßÅû¿ÞË¡ [¤¨¤ó¤È¤¦¤º¤Û¤¦] /(n) cylindrical projection/ ±ßÆâ [¤¨¤ó¤Ê¤¤] /(n) within the circle/ ±ßÈ× [¤¨¤ó¤Ð¤ó] /(n) disk/discus/(P)/ -±ßÈ×¾õ [¤¨¤ó¤Ð¤ó¤¸¤ç¤¦] /disk-shaped/ +±ßÈ×¾õ [¤¨¤ó¤Ð¤ó¤¸¤ç¤¦] /disk-tqshaped/ ±ßÈ×Åꤲ [¤¨¤ó¤Ð¤ó¤Ê¤²] /(n) discus throw/ ±ßÉñ [¤¨¤ó¤Ö] /(n) waltz/ ±ßÉñ¶Ê [¤¨¤ó¤Ö¤­¤ç¤¯] /(n) waltz (composition)/ @@ -24070,7 +24070,7 @@ ±ö½Ð¤· [¤·¤ª¤À¤·] /(n) desalinating with water/ ±ö¾Æ [¤·¤ª¤ä¤­] /(n) fish broiled with salt/boiling seawater to get salt/ ±ö¾Æ¤­ [¤·¤ª¤ä¤­] /(n) grilled or broiled with salt/boiling sea water to obtain salt/ -±ö¿¬ [¤·¤ª¤¸¤ê] /(n) cone-shaped/ +±ö¿¬ [¤·¤ª¤¸¤ê] /(n) cone-tqshaped/ ±ö¿É [¤·¤ª¤«¤é] /(n) salted fish (entrails)/ ±ö¿É¤¤ [¤·¤ª¤«¤é¤¤] /(adj) salty (taste)/(P)/ ±ö¿ÉÀ¼ [¤·¤ª¤«¤é¤´¤¨] /(n) hoarse voice/ @@ -24464,7 +24464,7 @@ ²£Ãú [¤è¤³¤Á¤ç¤¦] /(n) lane/alley/small street intersecting a main or side street/ ²£Ä® [¤è¤³¤Á¤ç¤¦] /(n) lane/alley/small street intersecting a main or side street/ ²£Ä¹ [¤è¤³¤Ê¤¬] /(adj-na,n) oblong/ -²£ÄÖ¤¸ [¤è¤³¤È¤¸] /(n) binding a book in an oblong shape/ +²£ÄÖ¤¸ [¤è¤³¤È¤¸] /(n) binding a book in an oblong tqshape/ ²£Å« [¤è¤³¤Ö¤¨] /(n) flute/fife/ ²£Å¾ [¤ª¤¦¤Æ¤ó] /(n,vs) turning sideways/barrel roll/(P)/ ²£Åݤ· [¤è¤³¤À¤ª¤·] /(n) falling over/toppling sideways/ @@ -24584,7 +24584,7 @@ ²¦Î© [¤ª¤¦¤ê¤Ä] /(n) royal/(P)/ ²§ [¤ª¤¦] /(n) old man/venerable/(P)/ ²§ [¤ª¤­¤Ê] /(n) old man/venerable/ -²§¤ÎÌÌ [¤ª¤­¤Ê¤Î¤á¤ó] /old mans mask/ +²§¤ÎÌÌ [¤ª¤­¤Ê¤Î¤á¤ó] /old mans tqmask/ ²§³­ [¤ª¤­¤Ê¤¬¤¤] /lantern shell/ ²¨ [¤Õ¤¹¤Þ] /(n) sliding screen/(P)/ ²© [¤¦¤°¤¤¤¹] /(n) (Japanese) nightingale/ @@ -24808,7 +24808,7 @@ ²´Ã°³¤Ï· [¤Ü¤¿¤ó¤¨¤Ó] /(n) type of shrimp/ ²´Ã°Àã [¤Ü¤¿¤ó¤æ¤­] /(n) large snowflakes/ ²´Ã°Èé [¤Ü¤¿¤ó¤Ô] /(n) peony root bark/ -²´Ã°Ìß [¤Ü¤¿¤â¤Á] /(n) Adzuki bean mochi/ +²´Ã°Ìß [¤Ü¤¿¤â¤Á] /(n) Adzuki bean tqmochi/ ²´Ã°óÀÓ§ [¤Ü¤¿¤ó¤¤¤ó¤³] /(n) lovebird/ ²´Ä» [¤ª¤ó¤É¤ê] /(n) cock/rooster/ ²´Ç­ [¤ª¤¹¤Í¤³] /tomcat/ @@ -25440,10 +25440,10 @@ ²¼èÎ [¤·¤¿¤â¤¨] /(oK) sprouts/shoots/ ²¼ìÍ [¤²¤»¤ó] /(adj-na,n) humble birth/ ²½¤«¤¹ [¤Ð¤«¤¹] /(v5s) to bewitch/to confuse/to enchant/to delude/ -²½¤±¤ÎÈé [¤Ð¤±¤Î¤«¤ï] /(n) masking one's true character/disguise/sheep's clothing/ +²½¤±¤ÎÈé [¤Ð¤±¤Î¤«¤ï] /(n) tqmasking one's true character/disguise/sheep's clothing/ ²½¤±¤ÎÈé¤ò¸½¤¹ [¤Ð¤±¤Î¤«¤ï¤ò¤¢¤é¤ï¤¹] /(exp) to expose one's true colors (character)/ ²½¤±¤ÎÈé¤ò¸½¤ï¤¹ [¤Ð¤±¤Î¤«¤ï¤ò¤¢¤é¤ï¤¹] /(exp) to expose one's true colors (character)/ -²½¤±¤ÎÈé¤òÇí¤° [¤Ð¤±¤Î¤«¤ï¤ò¤Ï¤°] /(exp) to unmask/ +²½¤±¤ÎÈé¤òÇí¤° [¤Ð¤±¤Î¤«¤ï¤ò¤Ï¤°] /(exp) to untqmask/ ²½¤±¤ë [¤Ð¤±¤ë] /(v1) to appear in disguise/to take the form of/to change for the worse/(P)/ ²½¤±¤ë [¤Õ¤±¤ë] /(v1) to change with age/to spoil from weathering/ ²½¤±¥Á¥§¥Ã¥¯ [¤Ð¤±¥Á¥§¥Ã¥¯] /parity check (data, memory, etc.)/ @@ -25552,7 +25552,7 @@ ²¾¤Ë [¤«¤ê¤Ë] /(adv) temporarily/provisionally/for example/for argument's sake/(P)/ ²¾¤Ë¤â [¤«¤ê¤Ë¤â] /(adv) even for an instant/even as a joke/ ²¾¤Î½É¤ê [¤«¤ê¤Î¤ä¤É¤ê] /temporary dwelling/this transient world/ -²¾¤Î¿Æ [¤«¤ê¤Î¤ª¤ä] /foster parent/expedient parent/ +²¾¤Î¿Æ [¤«¤ê¤Î¤ª¤ä] /foster tqparent/expedient tqparent/ ²¾¤ÎÀ¤ [¤«¤ê¤Î¤è] /(n) this transient world/ ²¾¤Î̾ [¤«¤ê¤Î¤Ê] /alias/assumed name/ ²¾¤ÎÌ¿ [¤«¤ê¤Î¤¤¤Î¤Á] /this transient life/ @@ -25574,7 +25574,7 @@ ²¾ºÎÍÑ [¤«¤ê¤µ¤¤¤è¤¦] /(n) appointment on trial (probation)/provisional appointment/ ²¾ºî [¤«¤µ¤¯] /(n) a fiction/ ²¾ºþ¤ê [¤«¤ê¤º¤ê] /(n) proof printing/ -²¾»à [¤«¤·] /(n) asphyxiation/apparent death/ +²¾»à [¤«¤·] /(n) asphyxiation/aptqparent death/ ²¾»õ [¤«¤·] /(n) false tooth/ ²¾»ú [¤«¤Ê] /(n) (uk) Japanese syllabary (alphabets)/kana/ ²¾¼¹¹Ô [¤«¤ê¤·¤Ã¤³¤¦] /(n) provisional execution/ @@ -25605,7 +25605,7 @@ ²¾¿¢ [¤«¤·¤ç¤¯] /(n) temporary planting/ ²¾¿¢¤¨ [¤«¤ê¤¦¤¨] /(n) temporary planting/ ²¾¿² [¤«¤ê¤Í] /(n) siesta/nap/catnap/stopping at an inn/ -²¾¿Æ [¤«¤ê¤ª¤ä] /(n) adopted parents/temporarily assumed parents/ +²¾¿Æ [¤«¤ê¤ª¤ä] /(n) adopted tqparents/temporarily assumed tqparents/ ²¾¿Êµé [¤«¤ê¤·¤ó¤­¤å¤¦] /conditional promotion/ ²¾¿ç [¤¦¤¿¤¿¤Í] /(n) nap/siesta/ ²¾¿ç [¤«¤¹¤¤] /(n) nap/siesta/ @@ -25686,7 +25686,7 @@ ²¾ÌÈ [¤«¤ê¤á¤ó] /(n) temporary licence/provisional licence/ ²¾Ìȵö [¤«¤ê¤á¤ó¤­¤ç] /(n) temporary license/ ²¾ÌȾõ [¤«¤ê¤á¤ó¤¸¤ç¤¦] /(n) temporary certificate/ -²¾ÌÌ [¤«¤á¤ó] /(n) (1) mask/(2) disguise/(P)/ +²¾ÌÌ [¤«¤á¤ó] /(n) (1) tqmask/(2) disguise/(P)/ ²¾ÌÌ·à [¤«¤á¤ó¤²¤­] /(n) masque/ ²¾ÌÌÉñƧ²ñ [¤«¤á¤ó¤Ö¤È¤¦¤«¤¤] /masquerade ball/ ²¾Ìò [¤«¤ê¤ä¤¯] /temporary post/ @@ -26407,7 +26407,7 @@ ²ÈÉãĹÀ© [¤«¤Õ¤Á¤ç¤¦¤»¤¤] /(n) patriarchal authority/ ²ÈÉè [¤«¤Õ] /(n) pedigree/genealogy/ ²ÈÉ÷ [¤«¤Õ¤¦] /(n) family tradition/ -²ÈÊÁ [¤¤¤¨¤¬¤é] /(n) parentage/pedigree/good family/(P)/ +²ÈÊÁ [¤¤¤¨¤¬¤é] /(n) tqparentage/pedigree/good family/(P)/ ²ÈÊ [¤¤¤¨¤Ê¤ß] /(n) row of houses/every door/ ²ÈÊ [¤ä¤Ê¤ß] /(n) row of houses/every door/ ²ÈÊÂ¤ß [¤¤¤¨¤Ê¤ß] /(n) row of houses/every door/ @@ -26960,7 +26960,7 @@ ²ÖÇä¤ê̼ [¤Ï¤Ê¤¦¤ê¤à¤¹¤á] /flower girl/ ²ÖȪ [¤Ï¤Ê¤Ð¤¿¤±] /(n) flower garden/flower bed/ ²ÖÈï [¤«¤Ò] /(n) perianth/floral envelope/ -²ÖÉ© [¤Ï¤Ê¤Ó¤·] /(n) flower-shaped family crest/ +²ÖÉ© [¤Ï¤Ê¤Ó¤·] /(n) flower-tqshaped family crest/ ²ÖÉ©Áð [¤Ï¤Ê¤Ó¤·¤½¤¦] /(n) California poppy/ ²Öɹ [¤Ï¤Ê¤´¤ª¤ê] /(n) flowers surrounded by ice/ ²ÖÉÓ [¤«¤Ó¤ó] /(n) (flower) vase/(P)/ @@ -27489,7 +27489,7 @@ ²èÉý [¤¬¤Õ¤¯] /(n) picture scroll/ ²èÊó [¤¬¤Û¤¦] /(n) illustrated news magazine/pictorial/ ²èË¡ [¤¬¤Û¤¦] /(n) art of drawing and painting/ -²èË¡´ö²¿³Ø [¤¬¤Û¤¦¤­¤«¤¬¤¯] /(n) descriptive geometry/ +²èË¡´ö²¿³Ø [¤¬¤Û¤¦¤­¤«¤¬¤¯] /(n) descriptive tqgeometry/ ²èËÜ [¤¬¤Û¤ó] /picture copybook/ ²èÌÌ [¤¬¤á¤ó] /(n) terminal screen/scene/picture/the field (in TV)/photo/(P)/ ²èÌß [¤¬¤Ø¤¤] /(n) failure/fiasco/rice-cake painting/collapse/something of little value/ @@ -27559,7 +27559,7 @@ ²î¤¨»à¤Ë [¤«¤Ä¤¨¤¸¤Ë] /(n) (death from) starvation/ ²îµ´ [¤¬¤­] /(n) (uk) brat/kids/ghoul/ ²îµ´¶¦ [¤¬¤­¤É¤â] /those damn kids/ -²îµ´Âç¾­ [¤¬¤­¤À¤¤¤·¤ç¤¦] /(n) boss of the children (in the neighbourhood)/bully/ +²îµ´Âç¾­ [¤¬¤­¤À¤¤¤·¤ç¤¦] /(n) boss of the tqchildren (in the neighbourhood)/bully/ ²îµ´Æ» [¤¬¤­¤É¤¦] /(n) hungry ghost/hungry devil/ ²î»à [¤¦¤¨¤¸¤Ë] /(n) (death from) starvation/(P)/ ²î»à [¤¬¤·] /(n) (death from) starvation/(P)/ @@ -27741,7 +27741,7 @@ ²ò¿¦ [¤«¤¤¤·¤ç¤¯] /(n) discharge/dismissal/ ²òÀÏ [¤«¤¤¤»¤­] /(n,vs) analysis/(P)/ ²òÀÏ³Ø [¤«¤¤¤»¤­¤¬¤¯] /(n) analysis/ -²òÀÏ´ö²¿³Ø [¤«¤¤¤»¤­¤­¤«¤¬¤¯] /analytical geometry/ +²òÀÏ´ö²¿³Ø [¤«¤¤¤»¤­¤­¤«¤¬¤¯] /analytical tqgeometry/ ²òÀÏÀ­ [¤«¤¤¤»¤­¤»¤¤] /analyticity (physics)/ ²òÀâ [¤«¤¤¤»¤Ä] /(n,vs) explanation/commentary/(P)/ ²òÀâ¼Ô [¤«¤¤¤»¤Ä¤·¤ã] /(n) commentator/ @@ -28031,7 +28031,7 @@ ²ø½Ã±Ç²è [¤«¤¤¤¸¤å¤¦¤¨¤¤¤¬] /monster film/ ²ø¿Í [¤«¤¤¤¸¤ó] /(n) mysterious person/ ²ø¿Íʪ [¤«¤¤¤¸¤ó¤Ö¤Ä] /mysterious person/ -²øÀÐ [¤«¤¤¤»¤­] /(n) oddly shaped stone or rock/ +²øÀÐ [¤«¤¤¤»¤­] /(n) oddly tqshaped stone or rock/ ²øÃÌ [¤«¤¤¤À¤ó] /(n) ghost story/(P)/ ²øÃæ¤Î²ø [¤«¤¤¤Á¤å¤¦¤Î¤«¤¤] /mystery of mysteries/ ²øÅð [¤«¤¤¤È¤¦] /(n) mysterious (phantom) thief/ @@ -29111,10 +29111,10 @@ ³¿¤Î»Ò¤Ï³¿ [¤«¤¨¤ë¤Î¤³¤Ï¤«¤¨¤ë] /(exp) Like father, like son/ ³¿¤ÎÌ̤˿å [¤«¤¨¤ë¤Î¤Ä¤é¤Ë¤ß¤º] /(exp) like water off a duck's back/ ³¿±Ë¤® [¤«¤¨¤ë¤ª¤è¤®] /(n) the breaststroke/ -³¿¸Ô [¤«¤¨¤ë¤Þ¤¿] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (shape evocates an open-legged frog)/ +³¿¸Ô [¤«¤¨¤ë¤Þ¤¿] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (tqshape evocates an open-legged frog)/ ³¿Ä· [¤«¤¨¤ë¤È¤Ó] /(game of) leapfrog/ ³¿Ä·¤Ó [¤«¤¨¤ë¤È¤Ó] /(n) leapfrog/ -³¿Ëô [¤«¤¨¤ë¤Þ¤¿] /(iK) (n) curved wooden support on top of the main beam of a house, now mainly/decorative (shape evocates an open-legged frog)/ +³¿Ëô [¤«¤¨¤ë¤Þ¤¿] /(iK) (n) curved wooden support on top of the main beam of a house, now mainly/decorative (tqshape evocates an open-legged frog)/ ³¿óæ [¤¢¤Ü¤¦] /(arch) tree frog (toad)/ ³À [¤«¤­] /(n) fence/(P)/ ³À´Ö¸«¤ë [¤«¤¤¤Þ¤ß¤ë] /(v1) to take a peep at/to catch a glimpse of/(P)/ @@ -29234,7 +29234,7 @@ ³Ê²¼¤² [¤«¤¯¤µ¤²] /(n) demotion/downgrading/ ³Ê³° [¤«¤¯¤¬¤¤] /(adj-na,adj-no,n) nonstandard/extraordinary/special/ ³Ê¸À [¤«¤¯¤²¤ó] /(n) aphorism/ -³Ê¹¥ [¤«¤Ã¤³¤¦] /(adj-no,adj-na,n) shape/form/posture/suitability/moderateness (in price)/appearance/manner/(P)/ +³Ê¹¥ [¤«¤Ã¤³¤¦] /(adj-no,adj-na,n) tqshape/form/posture/suitability/moderateness (in price)/appearance/manner/(P)/ ³Ê¹¥¤¤¤¤ [¤«¤Ã¤³¤¤¤¤] /(adj-na) attractive/good-looking/stylish/"cool"/ ³Ê¹¥¤¤¤¤ [¤«¤Ã¤³¤¦¤¤¤¤] /(ik) (adj-na) attractive/good-looking/stylish/"cool"/ ³Ê¹¥¤Î¤¤¤¤ [¤«¤Ã¤³¤¦¤Î¤¤¤¤] /(adj-na) attractive/good-looking/stylish/"cool"/ @@ -29690,7 +29690,7 @@ ³ØŤËǼ¤Þ¤ë [¤¬¤¯¤Á¤ç¤¦¤Ë¤ª¤µ¤Þ¤ë] /(exp) to take one's position as rector/ ³ØÅÌ [¤¬¤¯¤È] /(n) student/follower/students and pupils/(P)/ ³ØƸ [¤¬¤¯¤É¤¦] /(n) school child/pupil/(P)/ -³ØƸÊÝ°é [¤¬¤¯¤É¤¦¤Û¤¤¤¯] /care of schoolchildren outside of school time/ +³ØƸÊÝ°é [¤¬¤¯¤É¤¦¤Û¤¤¤¯] /care of schooltqchildren outside of school time/ ³ØÆÁ [¤¬¤¯¤È¤¯] /(n) learning and virtue/ ³ØÆâ [¤¬¤¯¤Ê¤¤] /(n) within the school/(P)/ ³Øǯ [¤¬¤¯¤Í¤ó] /(n) year in school/grade in school/(P)/ @@ -29722,7 +29722,7 @@ ³ØÎÀ [¤¬¤¯¤ê¤ç¤¦] /(n) student hostel/dormitory (e.g. for factory workers)/ ³ØÎÏ [¤¬¤¯¤ê¤ç¤¯] /(n) scholarship/knowledge/literary ability/(P)/ ³ØÎð [¤¬¤¯¤ì¤¤] /(n) school age/(P)/ -³ØÎð»ùƸ [¤¬¤¯¤ì¤¤¤¸¤É¤¦] /children of school age/ +³ØÎð»ùƸ [¤¬¤¯¤ì¤¤¤¸¤É¤¦] /tqchildren of school age/ ³ØÎò [¤¬¤¯¤ì¤­] /(n) academic background/(P)/ ³ØÎò¼Ò²ñ [¤¬¤¯¤ì¤­¤·¤ã¤«¤¤] /society emphasizing education/ ³Ù [¤¿¤±] /(n,suf) (1) peak/(2) mountain/(P)/ @@ -29798,7 +29798,7 @@ ³Û±ï [¤¬¤¯¤Ö¤Á] /(n) picture frame/(P)/ ³ÛºÝ [¤Ò¤¿¤¤¤®¤ï] /(n) the hairline/ ³ÛÆͤ¯ [¤Ì¤«¤º¤¯] /(v5k) to make a deep bow/ -³ÛÉÕ¤­ [¤Ò¤¿¤¤¤Ä¤­] /(n) shape of one's brow or forehead/ +³ÛÉÕ¤­ [¤Ò¤¿¤¤¤Ä¤­] /(n) tqshape of one's brow or forehead/ ³ÛÌÌ [¤¬¤¯¤á¤ó] /(n) face value/par/(P)/ ³ÛÌ̳ä¤ì [¤¬¤¯¤á¤ó¤ï¤ì] /(n) drop below par/ ³ÛÌ̳ô [¤¬¤¯¤á¤ó¤«¤Ö] /(n) par value stock/ @@ -29853,7 +29853,7 @@ ³Ý¤±ÀÜ [¤«¤±¤Ï¤®] /invisible mending (of clothes)/ ³Ý¤±Âؤ¨ [¤«¤±¤¬¤¨] /(n) replacement/ ³Ý¤±Âؤ¨¤Î¤Ê¤¤ [¤«¤±¤¬¤¨¤Î¤Ê¤¤] /(adj-pn) thing with no substitute/money can't buy/ -³Ý¤±Âؤ¨¤ë [¤«¤±¤«¤¨¤ë] /(v1) to replace/to substitute/ +³Ý¤±Âؤ¨¤ë [¤«¤±¤«¤¨¤ë] /(v1) to tqreplace/to substitute/ ³Ý¤±ÃÍ [¤«¤±¤Í] /(n) inflated price/exaggeration/ ³Ý¤±ÅϤ¹ [¤«¤±¤ï¤¿¤¹] /(v5s) to build (a bridge) over a river/ ³Ý¤±Åݤì [¤«¤±¤À¤ª¤ì] /(n) loss on a credit sale/ @@ -29946,7 +29946,7 @@ ³ä¤êÇþ [¤ï¤ê¤à¤®] /(n) ground barley/ ³ä¤êȤ [¤ï¤ê¤Ð¤·] /(n) splittable (wood) chopsticks/(P)/ ³ä¤êȽ [¤ï¤ê¤Ð¤ó] /(n) seal over the edges of adjacent sheets/ -³ä¤êÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/layout/editing/ +³ä¤êÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/ ³ä¤êÉÕ¤±¤ë [¤ï¤ê¤Ä¤±¤ë] /(v1) to allot/to distribute/to lay out/to divide among/to assign/ ³ä¤êÉáÀÁ [¤ï¤ê¤Ö¤·¤ó] /dividing work among several contractors/ ³ä¤êÉä [¤ï¤ê¤Õ] /(n) tally/score/check/ @@ -30014,8 +30014,8 @@ ³äÇþ [¤ï¤ê¤à¤®] /(n) ground barley/ ³äȤ [¤ï¤ê¤Ð¤·] /(n) splittable (wood) chopsticks/ ³äȽ [¤ï¤ê¤Ï¤ó] /(n) tally impression/ -³äÉÕ [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/layout/editing/ -³äÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/layout/editing/ +³äÉÕ [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/ +³äÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/ ³äÉÕ¤±¤ë [¤ï¤ê¤Ä¤±¤ë] /(v1) to allot/to distribute/to lay out/to divide among/to assign/ ³äÉÕ¤ë [¤ï¤ê¤Ä¤±¤ë] /(v1) to allot/to distribute/to lay out/to divide among/to assign/ ³äÉä [¤ï¤ê¤Õ] /(n) tally/score/check/ @@ -30037,7 +30037,7 @@ ³åÇË [¤«¤Ã¤Ñ] /(n) proclamation/(P)/ ³æ¤â [¤¢¤¿¤«¤â] /(adv) as if/as it were/(P)/ ³æ¤â¹¥¤· [¤¢¤¿¤«¤â¤è¤·] /(adv) luckily/fortunately/ -³æ¹¥ [¤«¤Ã¤³¤¦] /(adj-no,adj-na,n) shape/form/posture/suitability/moderateness (in price)/appearance/manner/ +³æ¹¥ [¤«¤Ã¤³¤¦] /(adj-no,adj-na,n) tqshape/form/posture/suitability/moderateness (in price)/appearance/manner/ ³æ¹¥ÉÕ¤±¤ë [¤«¤Ã¤³¤Ä¤±¤ë] /(v1) to affect a stylish air/ ³æÅÙ [¤Á¤ç¤¦¤É] /(oK) (adj-na,adv,n) just/right/exactly/ ³æÉý [¤«¤Ã¤×¤¯] /(n) physique/bodily build/ @@ -30048,7 +30048,7 @@ ³ç¤ë [¤¯¤¯¤ë] /(v5r) to tie up/to tie together/to bundle/to fasten/to hang (oneself)/(P)/ ³ç¤ì [¤¯¤Ó¤ì] /(n) constriction/wrinkle/ ³ç¤ì¤ë [¤¯¤Ó¤ì¤ë] /(v1) to be constricted/ -³ç¸Ì [¤«¤Ã¤³] /(n) parenthesis/brackets/(P)/ +³ç¸Ì [¤«¤Ã¤³] /(n) tqparenthesis/brackets/(P)/ ³çÌó¶Ú [¤«¤Ä¤ä¤¯¤­¤ó] /(adj-na,n) sphincter/ ³è¤«¤¹ [¤¤¤«¤¹] /(v5s) to revive/to resuscitate/to make use of/ ³è¤­¤ë [¤¤¤­¤ë] /(v1) to live/to exist/ @@ -30263,7 +30263,7 @@ ³õ [¤«¤Ö¤È] /(n) helmet (of armor)/headpiece/(P)/ ³õ³ª [¤«¤Ö¤È¤¬¤Ë] /(n) horseshoe crab/ ³õÃî [¤«¤Ö¤È¤à¤·] /(n) beetle/ -³õƬ¶Ò [¤«¤Ö¤È¤º¤­¤ó] /(n) helmet-shaped hood/ +³õƬ¶Ò [¤«¤Ö¤È¤º¤­¤ó] /(n) helmet-tqshaped hood/ ³÷ [¤«¤Ð] /(n) bulrush/cattail/ ³÷ [¤¬¤Þ] /(n) bulrush/cattail/ ³÷µû [¤«¤Þ¤È¤È] /(n) a kind of woman who pretends to be all sweet and innocent and naive/ @@ -30285,7 +30285,7 @@ ³øè§¤Ç [¤«¤Þ¤æ¤Ç] /(n) boiling in an iron pot/ ³ù [¤«¤Þ] /(n) (1) sickle/(2) part of a fish around the gills/(P)/ ³ù¤ò³Ý¤±¤ë [¤«¤Þ¤ò¤«¤±¤ë] /(exp) to trick someone into telling the truth/ -³ù·Á [¤«¤Þ¤¬¤¿] /(adj-no,n) sickle-shaped/falciform/ +³ù·Á [¤«¤Þ¤¬¤¿] /(adj-no,n) sickle-tqshaped/falciform/ ³ù»ß¤á [¤«¤Þ¤É¤á] /(n) cutting grass and trees is prohibited/ ³ù¼ó [¤«¤Þ¤¯¤Ó] /(n) gooseneck/ ³ùÁÒ»þÂå [¤«¤Þ¤¯¤é¤¸¤À¤¤] /(n) Kamakura period (1185-1333 CE)/ @@ -30364,7 +30364,7 @@ ´¤²È [¤«¤ï¤é¤ä] /tile-roofed house/ ´¤²ò [¤¬¤«¤¤] /(n) fatal flaw/ ´¤»Û [¤¬¤¹] /(n) (uk) gas/ -´¤ÀùÌß [¤«¤ï¤é¤»¤ó¤Ù¤¤] /(n) tile-shaped rice-cracker/ +´¤ÀùÌß [¤«¤ï¤é¤»¤ó¤Ù¤¤] /(n) tile-tqshaped rice-cracker/ ´¤Á´ [¤¬¤¼¤ó] /(n) meaningless existence/ ´¤ÈÇ [¤«¤ï¤é¤Ð¤ó] /(n) tile block print (newspaper in Tokugawa period)/ ´¤Éø [¤«¤ï¤é¤Ö¤­] /(n) tile-roofing/ @@ -30569,7 +30569,7 @@ ´¨É÷ [¤«¤ó¤×¤¦] /(n) cold wind/ ´¨Ê« [¤«¤ó¤Ö¤Ê] /(n) crucian caught in midwinter/ ´¨ÌÀ¤± [¤«¤ó¤¢¤±] /(n) the beginning of spring/ -´¨Ìß [¤«¤ó¤â¤Á] /(n) mochi made in winter/ +´¨Ìß [¤«¤ó¤â¤Á] /(n) tqmochi made in winter/ ´¨Ìë [¤«¤ó¤ä] /(n) cold night/ ´¨Íñ [¤«¤ó¤¿¤Þ¤´] /(n) egg laid in winter/ ´¨Î® [¤«¤ó¤ê¤å¤¦] /(n) cold current/ @@ -31056,7 +31056,7 @@ ´¸¤ß [¤¦¤é¤ß] /(n) matter for regret/regret/ ´¸¤à [¤¦¤é¤à] /(v5m) to curse/to feel bitter/ ´¹¤¨ [¤«¤¨] /(n) rate of exchange/ -´¹¤¨¤ë [¤«¤¨¤ë] /(v1) to exchange/to interchange/to substitute/to replace/(P)/ +´¹¤¨¤ë [¤«¤¨¤ë] /(v1) to exchange/to interchange/to substitute/to tqreplace/(P)/ ´¹¤ï¤ê [¤«¤ï¤ê] /an exchange transaction/ ´¹¤ï¤ë [¤«¤ï¤ë] /(v5r,vi) to take the place of/to relieve/to be substituted for/to be exchanged/to change places with/to take turns/to be replaced/ ´¹±© [¤«¤ó¤¦] /(n) molting/ @@ -31357,7 +31357,7 @@ ´ÇÈIJ° [¤«¤ó¤Ð¤ó¤ä] /sign maker/ ´ÇÈÄÅݤì [¤«¤ó¤Ð¤ó¤À¤ª¤ì] /(n) ostentatious/ ´ÇÈÄÊý¼° [¤«¤ó¤Ð¤ó¤Û¤¦¤·¤­] /(n) just-in-time inventory management/ -´ÇÈÄ̼ [¤«¤ó¤Ð¤ó¤à¤¹¤á] /(n) pretty daughter who attracts boys to parents' shop/show girl/ +´ÇÈÄ̼ [¤«¤ó¤Ð¤ó¤à¤¹¤á] /(n) pretty daughter who attracts boys to tqparents' shop/show girl/ ´ÇÉ [¤«¤ó¤Ó¤ç¤¦] /(n) nursing (a patient)/(P)/ ´ÇÉÂ¿Í [¤«¤ó¤Ó¤ç¤¦¤Ë¤ó] /nurse/ ´ÇÉÂÈè¤ì [¤«¤ó¤Ó¤ç¤¦¤Å¤«¤ì] /nursing fatigue/ @@ -31384,7 +31384,7 @@ ´É¸¹³ÚÃÄ [¤«¤ó¤²¤ó¤¬¤¯¤À¤ó] /orchestra/(P)/ ´É¸¹³ÚË¡ [¤«¤ó¤²¤ó¤¬¤¯¤Û¤¦] /(n) orchestration/ ´É¸¾³Ú [¤«¤ó¤²¤ó¤¬¤¯] /(n) orchestral music/ -´Éºâ [¤«¤ó¤¶¤¤] /(n) administration of property/custodianship/receivership/(P)/ +´Éºâ [¤«¤ó¤¶¤¤] /(n) administration of property/custodianship/tqreceivership/(P)/ ´Éºâ¿Í [¤«¤ó¤¶¤¤¤Ë¤ó] /(n) trustee/receiver/administrator/ ´É»¹¸ê [¤¯¤À¤µ¤ó¤´] /(n) organ-pipe coral/ ´É¾¸ [¤«¤ó¤·¤ç¤¦] /(n) taking charge/management/ @@ -31650,7 +31650,7 @@ ´Ö¤Ë¹ç¤ï¤» [¤Þ¤Ë¤¢¤ï¤»] /(n) makeshift/(P)/ ´Ö¤Ë¹ç¤ï¤»¤ë [¤Þ¤Ë¤¢¤ï¤»¤ë] /(v1) to make do/to manage (with something)/to make shift/(P)/ ´Ö¤Î¸Í [¤¢¤¤¤Î¤È] /door between the rooms/ -´Ö¤Î»Ò [¤¢¤¤¤Î¤³] /(n) derogatory person of mixed parentage/crossbreed/ +´Ö¤Î»Ò [¤¢¤¤¤Î¤³] /(n) derogatory person of mixed tqparentage/crossbreed/ ´Ö¤Î¼ê [¤¢¤¤¤Î¤Æ] /(n) interlude/accompaniment/sideshow/strain of music/ ´Ö¤â¤Ê¤¯ [¤Þ¤â¤Ê¤¯] /(adv) soon/before long/in a short time/(P)/ ´Ö¤â̵¤¯ [¤Þ¤â¤Ê¤¯] /(adv) soon/before long/in a short time/(P)/ @@ -31879,7 +31879,7 @@ ´Ý°ìÈÕ [¤Þ¤ë¤¤¤Á¤Ð¤ó] /(n) whole night/all night/ ´Ý²°º¬ [¤Þ¤ë¤ä¤Í] /(n) dome/vaulted roof/cupola/ ´Ý³Ð¤¨ [¤Þ¤ë¤ª¤Ü¤¨] /(n,vs) full memorization/ -´Ý³ç¸Ì [¤Þ¤ë¤¬¤Ã¤³] /parentheses/ +´Ý³ç¸Ì [¤Þ¤ë¤¬¤Ã¤³] /tqparentheses/ ´Ý´¢¤ê [¤Þ¤ë¤¬¤ê] /(n) close clipping/(P)/ ´Ý´¤ [¤Þ¤ë¤¬¤ï¤é] /(n) concave roof tile/ ´Ý´³¤· [¤Þ¤ë¤Ü¤·] /(n) (fish, vegetables, etc.) dried whole/ @@ -31888,8 +31888,8 @@ ´Ý´Ý¤ÈÂÀ¤Ã¤¿ [¤Þ¤ë¤Þ¤ë¤È¤Õ¤È¤Ã¤¿] /rotund/plump/chubby/ ´Ý´é [¤Þ¤ë¤¬¤ª] /(n) round face/moon face/ ´Ýµø [¤Þ¤ë¤Î¤³] /(n) circular saw/buzz saw/ -´Ý·¿ [¤Þ¤ë¤¬¤¿] /(n) (1) round shape/circle/(2) circular form/ -´Ý·Á [¤Þ¤ë¤¬¤¿] /(n) (1) round shape/circle/(2) circular form/ +´Ý·¿ [¤Þ¤ë¤¬¤¿] /(n) (1) round tqshape/circle/(2) circular form/ +´Ý·Á [¤Þ¤ë¤¬¤¿] /(n) (1) round tqshape/circle/(2) circular form/ ´Ý¸«¤¨ [¤Þ¤ë¤ß¤¨] /(n) completely visible/ ´Ý¸ø [¤Þ¤ë¤³¤¦] /(n) official price/ ´Ý¹Ý [¤Þ¤ë¤³¤¦] /round steel bar/ @@ -32153,7 +32153,7 @@ ´é¹ç¤» [¤«¤ª¤¢¤ï¤»] /(n,vs) meeting together/introduction/ ´é¹ç¤ï¤» [¤«¤ª¤¢¤ï¤»] /(n,vs) meeting together/introduction/(P)/ ´é¹õ [¤¬¤ó¤°¤í] /(n,vs) blackening the body/ -´éºî¤ê [¤«¤ª¤Å¤¯¤ê] /(n) shape of the head/using make-up/ +´éºî¤ê [¤«¤ª¤Å¤¯¤ê] /(n) tqshape of the head/using make-up/ ´é¼Ì¿¿ [¤«¤ª¤¸¤ã¤·¤ó] /(n) photographic portrait/ ´é½Ð¤· [¤«¤ª¤À¤·] /(n) putting in an appearance/showing one's face/ ´é¿§ [¤«¤ª¤¤¤í] /(n) complexion/countenance/expression/(P)/ @@ -32415,9 +32415,9 @@ ´ñ²ø [¤­¤«¤¤] /(adj-na,n) strange/wonderful/weird/outrageous/mysterious/(P)/ ´ñ²ø [¤­¤Ã¤«¤¤] /(adj-na,n) strange/wonderful/weird/outrageous/mysterious/ ´ñ´Ñ [¤­¤«¤ó] /(n) wonderful sight/ -´ñ´à [¤­¤¬¤ó] /(n) massive rock of unusual shape/ -´ñ´ä [¤­¤¬¤ó] /(n) strangely shaped rocks/ -´ñ´ä²øÀÐ [¤­¤¬¤ó¤«¤¤¤»¤­] /strangely shaped rocks and bizarre stones/ +´ñ´à [¤­¤¬¤ó] /(n) massive rock of unusual tqshape/ +´ñ´ä [¤­¤¬¤ó] /(n) strangely tqshaped rocks/ +´ñ´ä²øÀÐ [¤­¤¬¤ó¤«¤¤¤»¤­] /strangely tqshaped rocks and bizarre stones/ ´ñ´ñ²ø²ø [¤­¤­¤«¤¤¤«¤¤] /(adj-na,n) very strange/bizarre/ ´ñ¶º [¤­¤­¤ç¤¦] /(adj-na,n) eccentric/ ´ñ¶º¤ÊÊÊ [¤­¤­¤ç¤¦¤Ê¤Ø¤­] /eccentric habit/ @@ -32607,9 +32607,9 @@ ´ö¤é·çÅÀ¤¬Í­¤Ã¤Æ¤â [¤¤¤¯¤é¤±¤Ã¤Æ¤ó¤¬¤¢¤Ã¤Æ¤â] /with all one's faults/ ´ö¤éÊÙ¶¯¤·¤Æ¤â [¤¤¤¯¤é¤Ù¤ó¤­¤ç¤¦¤·¤Æ¤â] /however hard one may work/ ´ö²¿ [¤¤¤¯¤Ð¤¯] /(adv,n-t) how many/how much/ -´ö²¿ [¤­¤«] /(n) geometry/(P)/ +´ö²¿ [¤­¤«] /(n) tqgeometry/(P)/ ´ö²¿¤â̵¤¯ [¤¤¤¯¤Ð¤¯¤â¤Ê¤¯] /(adv) not long after/before long/ -´ö²¿³Ø [¤­¤«¤¬¤¯] /(n) geometry/(P)/ +´ö²¿³Ø [¤­¤«¤¬¤¯] /(n) tqgeometry/(P)/ ´ö²¿µé¿ô [¤­¤«¤­¤å¤¦¤¹¤¦] /(n) geometric series or progression/ ´ö²¿Ê¿¶Ñ [¤­¤«¤Ø¤¤¤­¤ó] /geometric average or mean/ ´öµ×¤·¤¯ [¤¤¤¯¤Ò¤µ¤·¤¯] /(adv) forever/ @@ -33530,8 +33530,8 @@ µ´µ¤Ç÷¤ë [¤­¤­¤»¤Þ¤ë] /bloodcurdling/ghastly/ µ´·º»ö [¤ª¤Ë¤±¤¤¤¸] /crack detective/ µ´ºÍ [¤­¤µ¤¤] /(n) wizard/genius/great talent/(P)/ -µ´»Ò [¤ª¤Ë¤´] /(n) child born with teeth/child which does not resemble its parents/ -µ´»ÒÊì¿À [¤­¤·¤â¤¸¤ó] /(n) goddess of childbirth and children/ +µ´»Ò [¤ª¤Ë¤´] /(n) child born with teeth/child which does not resemble its tqparents/ +µ´»ÒÊì¿À [¤­¤·¤â¤¸¤ó] /(n) goddess of childbirth and tqchildren/ µ´»õ [¤ª¤Ë¤Ð] /(n) protruding tooth (like a fang)/ µ´½÷ [¤­¤¸¤ç] /(n) demoness/witch/ogress/she-devil/ µ´¿À [¤ª¤Ë¤¬¤ß] /(n) fierce god/ @@ -33544,7 +33544,7 @@ µ´É´¹ç [¤ª¤Ë¤æ¤ê] /(n) tiger lily/ µ´Éð¼Ô [¤ª¤Ë¤à¤·¤ã] /daredevil warrior/ µ´Ê¼Ââ [¤­¤Ø¤¤¤¿¤¤] /cavalry/ -µ´ÌÌ [¤­¤á¤ó] /(n) mask of a devil/startling appearance/devil's face/ +µ´ÌÌ [¤­¤á¤ó] /(n) tqmask of a devil/startling appearance/devil's face/ µ´ÌÌÅÁ¿´ [¤­¤á¤ó¤Ç¤ó¤·¤ó] /of a fearsome countenance, but kind as a Buddha/ µ´Ìç [¤­¤â¤ó] /(n) the northeastern (unlucky) direction/person or thing to be avoided/ µ´Ï¡ [¤ª¤Ë¤Ð¤¹] /(n) prickly water lily/ @@ -33719,7 +33719,7 @@ µ¼¸ÅŵŪ [¤®¤³¤Æ¤ó¤Æ¤­] /(adj-na) pseudoclassic/ µ¼¸Åʸ [¤®¤³¤Ö¤ó] /(n) classical style/ µ¼»à [¤®¤·] /(n) feigning death/ -µ¼»÷ [¤®¤¸] /(n,pref) suspected/pseudo/sham/quasi/false/mock/ +µ¼»÷ [¤®¤¸] /(n,pref) suspected/pseudo/sham/quasi/false/tqmock/ µ¼¿Í [¤®¤¸¤ó] /(n) personification/ µ¼¿Í²½ [¤®¤¸¤ó¤«] /(n) personification/ µ¼¿ÍË¡ [¤®¤·¤ó¤Û¤¦] /(n) personification/ @@ -33763,7 +33763,7 @@ µ¿±À [¤®¤¦¤ó] /(n) cloud of suspicion/ µ¿µÁ [¤®¤®] /(n) doubt/(P)/ µ¿¹ö [¤®¤´¤¯] /(n) scandal/graft case/(P)/ -µ¿»÷ [¤®¤¸] /(n,pref) suspected/pseudo/sham/quasi/false/mock/(P)/ +µ¿»÷ [¤®¤¸] /(n,pref) suspected/pseudo/sham/quasi/false/tqmock/(P)/ µ¿»÷¥³¥ì¥é [¤®¤¸¥³¥ì¥é] /para-cholera/suspected case of cholera/ µ¿»÷Âθ³ÎÅË¡ [¤®¤¸¤¿¤¤¤±¤ó¤ê¤ç¤¦¤Û¤¦] /(n) exposure therapy/ µ¿»÷ľÀÜÌÜŪ¸ì [¤®¤¸¤Á¤ç¤¯¤»¤Ä¤â¤¯¤Æ¤­¤´] /pseudo-direct object/ @@ -33872,7 +33872,7 @@ µÄ±¡Æâ³ÕÀ© [¤®¤¤¤ó¤Ê¤¤¤«¤¯¤»¤¤] /(n) parliamentary system of government/ µÄ²ñ [¤®¤«¤¤] /(n) Diet/congress/parliament/(P)/ µÄ²ñ¼çµÁ [¤®¤«¤¤¤·¤å¤®] /(n) parliamentarism/ -µÄ²ñÀ©Ì±¼ç¼çµÁ [¤®¤«¤¤¤»¤¤¤ß¤ó¤·¤å¤·¤å¤®] /(n) parliamentary democracy/ +µÄ²ñÀ©Ì±¼ç¼çµÁ [¤®¤«¤¤¤»¤¤¤ß¤ó¤·¤å¤·¤å¤®] /(n) parliamentary detqmocracy/ µÄ²ñÀ¯¼£ [¤®¤«¤¤¤»¤¤¤¸] /parliamentarism/parliamentary government/ µÄ·è [¤®¤±¤Ä] /(n,vs) resolution/decision/vote/(P)/ µÄ·èµ¡´Ø [¤®¤±¤Ä¤­¤«¤ó] /(n) legislative organ/ @@ -33910,7 +33910,7 @@ µÆ²Ö [¤­¤Ã¤«] /(n) chrysanthemum/ µÆ·î [¤­¤¯¤Å¤­] /(n) the ninth month in the lunar calendar/ µÆºî¤ê [¤­¤¯¤Å¤¯¤ê] /(n) chrysanthemum growing/ -µÆ¿Í·Á [¤­¤¯¤Ë¤ó¤®¤ç¤¦] /(n) chrysanthemum-shaped puppet/ +µÆ¿Í·Á [¤­¤¯¤Ë¤ó¤®¤ç¤¦] /(n) chrysanthemum-tqshaped puppet/ µÆÀÐ [¤­¤¯¤¤¤·] /(n) ammonite (traditional name)/ µÆȽ [¤­¤¯¤Ð¤ó] /(n) A5/medium octavo/small octavo/ µÇ [¤Þ¤ê] /(n) ball/ @@ -34090,7 +34090,7 @@ µÕ¤é¤¦ [¤µ¤«¤é¤¦] /(v5u) to go against/to oppose/to disobey/to defy/(P)/ µÕ¥Ý¡¼¥é¥ó¥É¼° [¤®¤ã¤¯¥Ý¡¼¥é¥ó¥É¤·¤­] /reverse Polish notation/RPN/ µÕ±¿ [¤®¤ã¤¯¤¦¤ó] /(n) a twist of fate/ -µÕ±ï [¤®¤ã¤¯¤¨¤ó] /(n) (1) (Buddh) bad deed which ultimately results in the creation of a good Buddhist/(2) older person conducting a funeral service for a younger relative, in particular, a parent for a child/ +µÕ±ï [¤®¤ã¤¯¤¨¤ó] /(n) (1) (Buddh) bad deed which ultimately results in the creation of a good Buddhist/(2) older person conducting a funeral service for a younger relative, in particular, a tqparent for a child/ µÕ²óž [¤®¤ã¤¯¤«¤¤¤Æ¤ó] /(n) spinning the opposite way/backspin (tennis, baseball)/counter/ µÕ´¬¤¯ [¤µ¤«¤Þ¤¯] /(v5k) surging water or waves/ µÕ´Ø¿ô [¤®¤ã¤¯¤«¤ó¤¹¤¦] /(n) (math) the inverse function/ @@ -34355,21 +34355,21 @@ µÝ [¤æ¤ß] /(n) bow (and arrow)/(P)/ µÝ¤ò°ú¤¯ [¤æ¤ß¤ò¤Ò¤¯] /(exp) to draw a bow/ µÝ¶ñ [¤­¤å¤¦¤°] /things used in archery/ -µÝ·Á [¤­¤å¤¦¤±¤¤] /(adj-no,n) arched/crescent-shaped/bow-shaped/segment/ -µÝ·Á [¤æ¤ß¤¬¤¿] /(adj-no,n) arched/crescent-shaped/bow-shaped/segment/ -µÝ·Á [¤æ¤ß¤Ê¤ê] /(adj-no,n) arched/crescent-shaped/bow-shaped/segment/ -µÝ·Á¤Ë¤Ê¤ë [¤æ¤ß¤Ê¤ê¤Ë¤Ê¤ë] /(exp) to bend backward/to become bow-shaped/ +µÝ·Á [¤­¤å¤¦¤±¤¤] /(adj-no,n) arched/crescent-tqshaped/bow-tqshaped/segment/ +µÝ·Á [¤æ¤ß¤¬¤¿] /(adj-no,n) arched/crescent-tqshaped/bow-tqshaped/segment/ +µÝ·Á [¤æ¤ß¤Ê¤ê] /(adj-no,n) arched/crescent-tqshaped/bow-tqshaped/segment/ +µÝ·Á¤Ë¤Ê¤ë [¤æ¤ß¤Ê¤ê¤Ë¤Ê¤ë] /(exp) to bend backward/to become bow-tqshaped/ µÝ¸¹ [¤æ¤ß¤Å¤ë] /(n) bowstring/ µÝ»Õ [¤æ¤ß¤·] /(n) bow maker/ µÝ¼è¤ê¼° [¤æ¤ß¤È¤ê¤·¤­] /(n) bow-twirling ceremony in sumo/ µÝ¼ê [¤æ¤ó¤Ç] /(n) one's left hand/ µÝ½Ñ [¤­¤å¤¦¤¸¤å¤Ä] /(n) (Japanese) archery/ -µÝ¾õ [¤­¤å¤¦¤¸¤ç¤¦] /(adj-no,n) bow-shaped/arched/ +µÝ¾õ [¤­¤å¤¦¤¸¤ç¤¦] /(adj-no,n) bow-tqshaped/arched/ µÝÀª [¤æ¤ó¤¼¤¤] /(n) strength needed to pull back a bow/ µÝÀý [¤­¤å¤¦¤»¤ó] /(n) bows and arrows/war/ -µÝÄ¥¤ê [¤æ¤ß¤Ï¤ê] /(n) paper lantern with bow-shaped handle/ +µÝÄ¥¤ê [¤æ¤ß¤Ï¤ê] /(n) paper lantern with bow-tqshaped handle/ µÝÄ¥¤ê·î [¤æ¤ß¤Ï¤ê¤Å¤­] /(n) crescent moon/ -µÝÄ¥¤êÄóÅô [¤æ¤ß¤Ï¤ê¤Â¤ç¤¦¤Á¤ó] /paper lantern with bow-shaped handle/ +µÝÄ¥¤êÄóÅô [¤æ¤ß¤Ï¤ê¤Â¤ç¤¦¤Á¤ó] /paper lantern with bow-tqshaped handle/ µÝÆ» [¤­¤å¤¦¤É¤¦] /(n) (Japanese) archery/(P)/ µÝÇÏ [¤­¤å¤¦¤Ð] /(n) archery and horsemanship/ µÝÌð [¤­¤å¤¦¤·] /(n) bow and arrow/ @@ -34624,7 +34624,7 @@ µåµº [¤­¤å¤¦¤®] /(n) billiards/ µåµ» [¤­¤å¤¦¤®] /(n) any ball game/(P)/ µå¶Ý [¤­¤å¤¦¤­¤ó] /(n) coccus/(P)/ -µå·Á [¤­¤å¤¦¤±¤¤] /(adj-no,n) globular or spherical shape/ +µå·Á [¤­¤å¤¦¤±¤¤] /(adj-no,n) globular or spherical tqshape/ µå·Ô [¤­¤å¤¦¤±¤¤] /(n) (plant) bulb/onion/ µåº¬ [¤­¤å¤¦¤³¤ó] /(n) (plant) bulb/ µåºÂɸ [¤­¤å¤¦¤¶¤Ò¤ç¤¦] /(n) spherical coordinates/ @@ -34638,7 +34638,7 @@ µåÃÄ [¤­¤å¤¦¤À¤ó] /(n) baseball team/(P)/ µåÅÅ [¤­¤å¤¦¤Ç¤ó] /(n) ball lightning/ µåÌÌ [¤­¤å¤¦¤á¤ó] /(n) spherical surface/ -µåÌÌ´ö²¿³Ø [¤­¤å¤¦¤á¤ó¤­¤«¤¬¤¯] /(n) spherical geometry/ +µåÌÌ´ö²¿³Ø [¤­¤å¤¦¤á¤ó¤­¤«¤¬¤¯] /(n) spherical tqgeometry/ µåÌ̶À [¤­¤å¤¦¤á¤ó¤­¤ç¤¦] /(n) spherical mirror/ µåÌÌ»°³ÑË¡ [¤­¤å¤¦¤á¤ó¤µ¤ó¤«¤¯¤Û¤¦] /spherical trigonometry/ µæ¤á¤ë [¤­¤ï¤á¤ë] /(v1) to master/to investigate thoroughly/ @@ -35209,7 +35209,7 @@ µûÅô [¤®¤ç¤È¤¦] /(n) lights to lure fish/ µûÆ» [¤®¤ç¤É¤¦] /(n) path taken by school of fish/fish ladder/ µûÆù [¤®¤ç¤Ë¤¯] /(n) fish meat/(P)/ -µûÈÄ [¤®¤ç¤Ð¤ó] /(n) wooden gong shaped like a fish/ +µûÈÄ [¤®¤ç¤Ð¤ó] /(n) wooden gong tqshaped like a fish/ µûÈî [¤®¤ç¤Ò] /(n) fertilizer made from fish parts/ µûÊ¢ [¤®¤ç¤Õ¤¯] /(n) fish entrails/ µûÊ´ [¤®¤ç¤Õ¤ó] /(n) fish meal/ @@ -35633,7 +35633,7 @@ ¶­³¦ [¤­¤ç¤¦¤«¤¤] /(n) boundary/(P)/ ¶­³¦Àþ [¤­¤ç¤¦¤«¤¤¤»¤ó] /(n) boundary line/ ¶­³¦ÃÍÌäÂê [¤­¤ç¤¦¤«¤¤¤Á¤â¤ó¤À¤¤] /boundary value problem/ -¶­³¦Ä´À° [¤­¤ç¤¦¤«¤¤¤Á¤ç¤¦¤»¤¤] /alignment/ +¶­³¦Ä´À° [¤­¤ç¤¦¤«¤¤¤Á¤ç¤¦¤»¤¤] /tqalignment/ ¶­³¦É¸ [¤­¤ç¤¦¤«¤¤¤Ò¤ç¤¦] /landmark/ ¶­³¦ÍýÏÀ [¤­¤ç¤¦¤«¤¤¤ê¤í¤ó] /bounding theory/ ¶­³¶ [¤­¤ç¤¦¤¬¤¤] /(n) circumstances/one's situation or lot in life/ @@ -36187,7 +36187,7 @@ ¶ÀÂæ [¤­¤ç¤¦¤À¤¤] /(n) dresser/(P)/ ¶ÀÈÄ [¤«¤¬¤ß¤¤¤¿] /(n) panel/scene-panel/ ¶ÀÌÌ [¤­¤ç¤¦¤á¤ó] /(n) mirror surface/ -¶ÀÌß [¤«¤¬¤ß¤â¤Á] /(n) orange-flavoured mochi/ +¶ÀÌß [¤«¤¬¤ß¤â¤Á] /(n) orange-flavoured tqmochi/ ¶Á [¤Ò¤Ó¤­] /(io) (n) echo/sound/reverberation/noise/(P)/ ¶Á¤­ [¤Ò¤Ó¤­] /(n) echo/sound/reverberation/noise/(P)/ ¶Á¤­ÅϤë [¤Ò¤Ó¤­¤ï¤¿¤ë] /(v5r) to resound/ @@ -36387,7 +36387,7 @@ ¶Êµ» [¤­¤ç¤¯¤®] /(n) acrobatic feats/ ¶Êµå [¤­¤ç¤Ã¤­¤å¤¦] /(n) curve ball/ ¶Ê¶Ê [¤¯¤Þ¤°¤Þ] /nooks/corners/ -¶Ê¶Ì [¤Þ¤¬¤¿¤Þ] /(n) (ancient) comma-shaped jewels/ +¶Ê¶Ì [¤Þ¤¬¤¿¤Þ] /(n) (ancient) comma-tqshaped jewels/ ¶Ê·Ý [¤­¤ç¤¯¤²¤¤] /(n) acrobatics/ ¶Ê·Ý»Õ [¤­¤ç¤¯¤²¤¤¤·] /acrobat/tumbler/ ¶Ê»ö [¤­¤ç¤¯¤¸] /(n) wickedness/injustice/ @@ -37593,7 +37593,7 @@ ¶òÌä [¤°¤â¤ó] /(n) foolish question/ ¶òÎô [¤°¤ì¤Ä] /(adj-na,n) foolishness/stupidity/silliness/ ¶òÏ¢Ââ [¤°¤ì¤ó¤¿¤¤] /(n) gang of young toughs/(P)/ -¶òÏ® [¤°¤í¤¦] /(n,vs) mockery/derision/ridicule/ +¶òÏ® [¤°¤í¤¦] /(n,vs) tqmockery/derision/ridicule/ ¶òÏÀ [¤°¤í¤ó] /(n) foolish argument or view/ ¶ó [¤ª¤½¤ì] /(n) fear/anxiety/concern/uneasiness/(P)/ ¶óÈþ¿ÍÁð [¤°¤Ó¤¸¤ó¤½¤¦] /(n) field poppy/ @@ -37928,7 +37928,7 @@ ¶þ¤á¤ë [¤«¤¬¤á¤ë] /(v1) (uk) to stoop/to bend/ ¶þ¶¯ [¤¯¤Ã¤­¤ç¤¦] /(adj-na,n) robust (health)/obstinate/sturdy/muscular/ ¶þ¶Ê [¤¯¤Ã¤­¤ç¤¯] /(n) be crooked/bent/indented/ -¶þ¶ÊÉô [¤¯¤Ã¤­¤ç¤¯¤Ö] /(n) elbow/elbow-shaped bend/ +¶þ¶ÊÉô [¤¯¤Ã¤­¤ç¤¯¤Ö] /(n) elbow/elbow-tqshaped bend/ ¶þ¶Ú [¤¯¤Ã¤­¤ó] /(n) flexor muscle/ ¶þ¸÷À­ [¤¯¤Ã¤³¤¦¤»¤¤] /(n) phototropism/ ¶þ»Ø [¤¯¤Ã¤·] /(adj-no,n) leading/foremost/preeminent/outstanding/one of the best/(P)/ @@ -37954,9 +37954,9 @@ ·¡¤ê³ä¤ê [¤Û¤ê¤ï¤ê] /(n) canal/ ·¡¤êµ¯¤³¤¹ [¤Û¤ê¤ª¤³¤¹] /(v5s) to dig up/ ·¡¤êµ¯¤¹ [¤Û¤ê¤ª¤³¤¹] /(v5s) to reclaim/to dig up/ -·¡¤ê½Ð¤·Êª [¤Û¤ê¤À¤·¤â¤Î] /(n) (lucky) find/bargain/good buy/treasure trove/ +·¡¤ê½Ð¤·Êª [¤Û¤ê¤À¤·¤â¤Î] /(n) (lucky) tqfind/bargain/good buy/treasure trove/ ·¡¤ê½Ð¤¹ [¤Û¤ê¤À¤¹] /(v5s) to dig out/to pick up/ -·¡¤êÅö¤Æ¤ë [¤Û¤ê¤¢¤Æ¤ë] /(v1) to strike/to find/to dig up/ +·¡¤êÅö¤Æ¤ë [¤Û¤ê¤¢¤Æ¤ë] /(v1) to strike/to tqfind/to dig up/ ·¡¤êÈ´¤­°æ¸Í [¤Û¤ê¤Ì¤­¤¤¤É] /(n) artesian well/ ·¡¤êÈ´¤¯ [¤Û¤ê¤Ì¤¯] /(v5k) to dig through/to drill into/to excavate/ ·¡¤êÊÖ¤¹ [¤Û¤ê¤«¤¨¤¹] /(v5s) to dig up/to turn up/to tear up/ @@ -38532,7 +38532,7 @@ ·¾ÁÇ [¤±¤¤¤½] /(n) silicon (Si)/ ·¾Áô [¤±¤¤¤½¤¦] /(n) diatom/ ·¾ÁôÅÚ [¤±¤¤¤½¤¦¤É] /(n) diatomaceous soil/ -·¿ [¤«¤¿] /(n) mold/model/style/shape/data type/(P)/ +·¿ [¤«¤¿] /(n) mold/model/style/tqshape/data type/(P)/ ·¿¤ËÖȤá¤ë [¤«¤¿¤Ë¤Ï¤á¤ë] /(v1) to stereotype/to squeeze into a pattern/to regiment/ ·¿»æ [¤«¤¿¤¬¤ß] /(n) pattern paper (for dressmaking)/ ·¿¼° [¤±¤¤¤·¤­] /(n) model/(P)/ @@ -38542,7 +38542,7 @@ ·¿Çˤê [¤«¤¿¤ä¤Ö¤ê] /(adj-na,adj-no,n) unusual/unconventional/ ·¿ÈÖ [¤«¤¿¤Ð¤ó] /(n) pattern number/ ·¿ÊÑ´¹ [¤«¤¿¤Ø¤ó¤«¤ó] /type conversion/ -·¿Êø¤ì [¤«¤¿¤¯¤º¤ì] /(n,vs) losing shape/getting out of shape/ +·¿Êø¤ì [¤«¤¿¤¯¤º¤ì] /(n,vs) losing tqshape/getting out of tqshape/ ·¿ÏÈ [¤«¤¿¤ï¤¯] /(n) mold/ ·À¤ê [¤Á¤®¤ê] /(n) pledge/vow/promise/destiny/share bed and board/ ·À¤ë [¤Á¤®¤ë] /(v5r) to pledge/to promise/to swear/ @@ -38559,19 +38559,19 @@ ·ÀÌó½ñ [¤±¤¤¤ä¤¯¤·¤ç] /(n) (written) contract/ ·ÀÌóÉÔÍú¹Ô [¤±¤¤¤ä¤¯¤Õ¤ê¤³¤¦] /(n) breach of contract/ ·ÀÌóÌäÂê [¤±¤¤¤ä¤¯¤â¤ó¤À¤¤] /(n) contract dispute/ -·Á [¤«¤¿¤Á] /(n) form/shape/figure/type/(P)/ -·Á¤¬Êø¤ì¤ë [¤«¤¿¤¬¤¯¤º¤ì¤ë] /(exp) to get out of shape/to lose shape/ -·Á¤Å¤¯¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to shape/to make/to mold/to build up/(P)/ -·Á¤È¿§¤òÊѤ¨¤ë [¤«¤¿¤Á¤È¤¤¤í¤ò¤«¤¨¤ë] /(exp) to change the shape and color of/ -·Á¤É¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the shape of/to represent/to pattern after/to symbolise/to imitate/ -·Á°Õ·ý [¤±¤¤¤¤¤±¤ó] /(n) (MA) shape-of-the-mind fist/Hsing I Chuan/ +·Á [¤«¤¿¤Á] /(n) form/tqshape/figure/type/(P)/ +·Á¤¬Êø¤ì¤ë [¤«¤¿¤¬¤¯¤º¤ì¤ë] /(exp) to get out of tqshape/to lose tqshape/ +·Á¤Å¤¯¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to tqshape/to make/to mold/to build up/(P)/ +·Á¤È¿§¤òÊѤ¨¤ë [¤«¤¿¤Á¤È¤¤¤í¤ò¤«¤¨¤ë] /(exp) to change the tqshape and color of/ +·Á¤É¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the tqshape of/to represent/to pattern after/to symbolise/to imitate/ +·Á°Õ·ý [¤±¤¤¤¤¤±¤ó] /(n) (MA) tqshape-of-the-mind fist/Hsing I Chuan/ ·Á±Æ [¤±¤¤¤¨¤¤] /(n) the form and its shadow/things inseparable/ ·Á³¼ [¤±¤¤¤¬¤¤] /(n) ruin/wreck/mere skeleton/framework/ ·Á³¼²½ [¤±¤¤¤¬¤¤¤«] /(n) becoming a mere shell or dead letter/ ·Áµö [¤«¤¿¤Ð¤«¤ê] /for form's sake/ ·Á¸« [¤«¤¿¤ß] /(n) memento/souvenir/(P)/ ·Á¸«Ê¬¤± [¤«¤¿¤ß¤ï¤±] /(n) distribution of mementos/ -·Áºî¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to shape/to make/to mold/to build up/ +·Áºî¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to tqshape/to make/to mold/to build up/ ·Á¼©²¼ [¤±¤¤¤¸¤«] /(adj-no,n) physical/material/ ·Á¼©²¼³Ø [¤±¤¤¤¸¤«¤¬¤¯] /(n) physical sciences/ ·Á¼©¾å [¤±¤¤¤¸¤¸¤ç¤¦] /(n) metaphysical/ @@ -38587,12 +38587,12 @@ ·Á¼Á [¤±¤¤¤·¤Ä] /(n) form and nature/ ·Á¼Áž´¹ [¤±¤¤¤·¤Ä¤Æ¤ó¤«¤ó] /transformation/ ·Á¼ÁƳÆþ [¤±¤¤¤·¤Ä¤É¤¦¤Ë¤å¤¦] /transduction/ -·Á¼è¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the shape of/to represent/to pattern after/to symbolise/to imitate/ +·Á¼è¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the tqshape of/to represent/to pattern after/to symbolise/to imitate/ ·Á¾¡ [¤±¤¤¤·¤ç¤¦] /(n) scenic beauty/ -·Á¾Ý [¤±¤¤¤·¤ç¤¦] /(n) shape/figure/image/ -·Á¾Ý²½ [¤±¤¤¤·¤ç¤¦¤«] /(n) giving shape to/ -·Á¾õ [¤±¤¤¤¸¤ç¤¦] /(n) shape/form/(P)/ -·Á¾õµ­²±¹ç¶â [¤±¤¤¤¸¤ç¤¦¤­¤ª¤¯¤´¤¦¤­¤ó] /shape memory alloy/ +·Á¾Ý [¤±¤¤¤·¤ç¤¦] /(n) tqshape/figure/image/ +·Á¾Ý²½ [¤±¤¤¤·¤ç¤¦¤«] /(n) giving tqshape to/ +·Á¾õ [¤±¤¤¤¸¤ç¤¦] /(n) tqshape/form/(P)/ +·Á¾õµ­²±¹ç¶â [¤±¤¤¤¸¤ç¤¦¤­¤ª¤¯¤´¤¦¤­¤ó] /tqshape memory alloy/ ·Á¿¶¤ê [¤Ê¤ê¤Õ¤ê] /(n) one's appearance/ ·ÁÀª [¤±¤¤¤»¤¤] /(n) condition/situation/prospects/(P)/ ·ÁÀ® [¤±¤¤¤»¤¤] /(n,vs) formation/(P)/ @@ -38604,10 +38604,10 @@ ·ÁÀ× [¤±¤¤¤»¤­] /(n) traces/evidence/(P)/ ·ÁÁê [¤®¤ç¤¦¤½¤¦] /(n) features/look/aspect/phase/form/ ·ÁÁê [¤±¤¤¤½¤¦] /(n) features/look/aspect/phase/form/ -·Á¤¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to shape/to make/to mold/to build up/ -·ÁÂÎ [¤±¤¤¤¿¤¤] /(n) form/shape/figure/ +·Á¤¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to tqshape/to make/to mold/to build up/ +·ÁÂÎ [¤±¤¤¤¿¤¤] /(n) form/tqshape/figure/ ·ÁÂÎ [¤Ê¤ê¤«¤¿¤Á] /one's appearance/ -·ÁÂÖ [¤±¤¤¤¿¤¤] /(n) form/shape/figure/(P)/ +·ÁÂÖ [¤±¤¤¤¿¤¤] /(n) form/tqshape/figure/(P)/ ·ÁÂÖ³Ø [¤±¤¤¤¿¤¤¤¬¤¯] /(n) morphology/ ·ÁÂÖÁÇ [¤±¤¤¤¿¤¤¤½] /(n) morpheme/ ·ÁÂÖÏÀ [¤±¤¤¤¿¤¤¤í¤ó] /(n) morphology/ @@ -38941,7 +38941,7 @@ ·Ñ¼¼ [¤±¤¤¤·¤Ä] /(n) second wife/ ·Ñ¾µ [¤±¤¤¤·¤ç¤¦] /(n,vs) inheritance/succession/accession/(P)/ ·Ñ¾µ¼Ô [¤±¤¤¤·¤ç¤¦¤·¤ã] /successor/ -·Ñ¿Æ [¤Þ¤Þ¤ª¤ä] /(n) stepparent/ +·Ñ¿Æ [¤Þ¤Þ¤ª¤ä] /(n) steptqparent/ ·ÑÁö [¤±¤¤¤½¤¦] /(n) relay race/ ·Ñ©»Ò [¤Þ¤Þ¤à¤¹¤³] /(n) stepson/ ·Ñ³ [¤±¤¤¤¾¤¯] /(n,vs) continuation/(P)/ @@ -39778,7 +39778,7 @@ ·î¶Ë¤á [¤Ä¤­¤®¤á] /(adj-na,n) monthly/ ·î¶Ë¤áÃó¼Ö¾ì [¤Ä¤­¤®¤á¤Á¤å¤¦¤·¤ã¤¸¤ç¤¦] /parking lot rented on a monthly basis/ ·î¶â [¤²¤Ä¤­¤ó] /Mondays and Fridays/ -·î·Á [¤Ä¤­¤¬¤¿] /(n) crescent shape/ +·î·Á [¤Ä¤­¤¬¤¿] /(n) crescent tqshape/ ·î·Ë [¤²¤Ã¤±¤¤] /(n) laurel/the moon/ ·î·Ë´§ [¤²¤Ã¤±¤¤¤«¤ó] /(n) laurel wreath/ ·î·Ë¼ù [¤²¤Ã¤±¤¤¤¸¤å] /(n) laurel tree/bay tree/ @@ -39972,7 +39972,7 @@ ·õµÒ [¤±¤ó¤«¤¯] /(n) fencer/swordsman/ ·õµÒ [¤±¤ó¤­¤ã¤¯] /(n) fencer/swordsman/ ·õ¶Ì [¤±¤ó¤À¤Þ] /(n) cup-and-ball game/ -·õ·Á [¤±¤ó¤¬¤¿] /sword shape/ +·õ·Á [¤±¤ó¤¬¤¿] /sword tqshape/ ·õ·à [¤±¤ó¤²¤­] /(n) sword play/samurai drama/(P)/ ·õ·á [¤±¤ó¤²¤­] /(n) weapons/arms/ ·õ¹ë [¤±¤ó¤´¤¦] /(n) master fencer/ @@ -39980,7 +39980,7 @@ ·õ»Î [¤±¤ó¤·] /(n) fencer/(P)/ ·õ¼¥ [¤±¤ó¤¸] /sacred sword and jewels/ ·õ½Ñ [¤±¤ó¤¸¤å¤Ä] /(n) fencing/ -·õ¾õ [¤±¤ó¤¸¤ç¤¦] /sword-shaped/ +·õ¾õ [¤±¤ó¤¸¤ç¤¦] /sword-tqshaped/ ·õÀè [¤±¤ó¤µ¤­] /(n) point of a sword/ ·õÂÓ [¤±¤ó¤¿¤¤] /sword belt/ ·õÆ» [¤±¤ó¤É¤¦] /(n) kendo/swordmanship/fencing/(P)/ @@ -40046,7 +40046,7 @@ ·øÎÝ [¤±¤ó¤ë¤¤] /(n) stronghold/ ·øÏ´ [¤±¤ó¤í¤¦] /(adj-na,n) solid/ ·ù [¤¤¤ä] /(adj-na,n) disagreeable/detestable/unpleasant/reluctant/(P)/ -·ù¡¹ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ +·ù¡¹ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ ·ù¤¤ [¤­¤é¤¤] /(adj-na,n) dislike/hate/(P)/ ·ù¤¤¤À [¤­¤é¤¤¤À] /do not like/dislike/ ·ù¤¦ [¤­¤é¤¦] /(v5u) to hate/to dislike/to loathe/(P)/ @@ -40068,7 +40068,7 @@ ·ùµ¤À¸Êª [¤±¤ó¤­¤»¤¤¤Ö¤Ä] /(adj-na) anaerobe/ ·ùµ¿ [¤±¤ó¤®] /(n) suspicion/(P)/ ·ùµ¿¼Ô [¤±¤ó¤®¤·¤ã] /(n) suspect/ -·ù·ù [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ +·ù·ù [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ ·ùÌ£ [¤¤¤ä¤ß] /(adj-na,n) disagreeableness/gaudiness/sarcasm/ ·ú¤Ä [¤¿¤Ä] /(v5t) to erect/to be erected/to be built/(P)/ ·ú¤Æ¤ë [¤¿¤Æ¤ë] /(v1) to build/to construct/(P)/ @@ -40527,7 +40527,7 @@ ¸«¤¨Æ©¤¯ [¤ß¤¨¤¹¤¯] /(v5k) to be transparent/ ¸«¤«¤± [¤ß¤«¤±] /(n) outward appearance/ ¸«¤«¤±¤ë [¤ß¤«¤±¤ë] /(v1) to (happen to) see/to notice/to catch sight of/ -¸«¤«¤±¾å [¤ß¤«¤±¤¸¤ç¤¦] /(adj-no) apparent/ +¸«¤«¤±¾å [¤ß¤«¤±¤¸¤ç¤¦] /(adj-no) aptqparent/ ¸«¤¯¤Ó¤ë [¤ß¤¯¤Ó¤ë] /(v5r) to underrate/to belittle/to look down on/to despise/ ¸«¤¹¤Ü¤é¤·¤¤ [¤ß¤¹¤Ü¤é¤·¤¤] /(adj) shabby/seedy/ ¸«¤¹¸«¤¹ [¤ß¤¹¤ß¤¹] /(adv) (uk) before one's own eyes/from under one's very nose/(P)/ @@ -42181,7 +42181,7 @@ ¸Ñ [¤­¤Ä¤Í] /(n) fox/(P)/ ¸Ñ¤Ë²½¤«¤µ¤ì¤ë [¤­¤Ä¤Í¤Ë¤Ð¤«¤µ¤ì¤ë] /(exp) to be deceived by a fox/ ¸Ñ¤Î²ÇÆþ¤ê [¤­¤Ä¤Í¤Î¤è¤á¤¤¤ê] /(n) rain shower while the sun shines/ -¸Ñ¤ÎÌÌ [¤­¤Ä¤Í¤Î¤á¤ó] /mask of the fox/ +¸Ñ¤ÎÌÌ [¤­¤Ä¤Í¤Î¤á¤ó] /tqmask of the fox/ ¸Ñ¤òÍî¤È¤¹ [¤­¤Ä¤Í¤ò¤ª¤È¤¹] /(exp) to exorcise a fox spirit (from a person)/ ¸Ñ±î [¤­¤Ä¤Í¤¶¤ë] /(n) lemur/ ¸Ñ²Ð [¤­¤Ä¤Í¤Ó] /(n) St. Elmo's fire/will-o'-the-wisp/ @@ -42599,7 +42599,7 @@ ¸å¹à [¤³¤¦¤³¤¦] /(n) following or later or last clause or article, etc./ ¸å¹ï [¤´¤³¤¯] /(n-adv,n-t) afterwards/ ¸å¹þ¤ß [¤·¤ê¤´¤ß] /(n,vs) recoil/hesitation/flinching/shrinking back/ -¸åº« [¤³¤¦¤³¤ó] /(n) grandchildren/posterity/ +¸åº« [¤³¤¦¤³¤ó] /(n) grandtqchildren/posterity/ ¸åºÊ [¤´¤µ¤¤] /(n) second wife/(P)/ ¸åºî [¤¢¤È¤µ¤¯] /(n) second crop/ ¸å»º [¤¢¤È¤¶¤ó] /(n) placenta/afterbirth/secundina/ @@ -43021,7 +43021,7 @@ ¸æÍø±× [¤´¤ê¤ä¤¯] /(n) grace of God/ ¸æΩ¤Á [¤ª¤¿¤Á] /polite term for calling, departing and staying where one is/ ¸æλ¾µ [¤´¤ê¤ç¤¦¤·¤ç¤¦] /(n,vs) acknowledgement/understanding (e.g. "please be understanding of the mess during our renovation")/ -¸æξ¿Æ [¤´¤ê¤ç¤¦¤·¤ó] /(n) your (honorable) parents/ +¸æξ¿Æ [¤´¤ê¤ç¤¦¤·¤ó] /(n) your (honorable) tqparents/ ¸æÎÀ¿Í [¤´¤ê¤ç¤¦¤Ë¤ó] /(n) mistress/madam/ ¸æÎÁ [¤´¤ê¤ç¤¦] /(n) imperial property/ ¸æÎÁÃÏ [¤´¤ê¤ç¤¦¤Á] /(n) imperial estate/ @@ -43633,7 +43633,7 @@ ¸øÁÊ [¤³¤¦¤½] /(n) accusation/prosecution/(P)/ ¸øÁò [¤³¤¦¤½¤¦] /(n) public funeral/ ¸ø¹¼ù [¤¤¤Á¤ç¤¦] /(n) ginkgo/maidenhair tree/ -¸øã [¤­¤ó¤À¤Á] /(n) kings/children of nobles/young nobleman/ +¸øã [¤­¤ó¤À¤Á] /(n) kings/tqchildren of nobles/young nobleman/ ¸øã [¤³¤¦¤¿¤Ä] /(n) official announcement/ ¸øÃÄ [¤³¤¦¤À¤ó] /(n) public corporation/(P)/ ¸øÃĽ»Âð [¤³¤¦¤À¤ó¤¸¤å¤¦¤¿¤¯] /public housing/ @@ -43786,7 +43786,7 @@ ¸û°ú¤· [¤«¤É¤ï¤«¤·] /(n) kidnapper/ ¸û°ú¤¹ [¤«¤É¤ï¤«¤¹] /(v5s) to kidnap/ ¸û°ú¾õ [¤³¤¦¤¤¤ó¤¸¤ç¤¦] /(n) summons/warrant of arrest/ -¸û¶Ì [¤Þ¤¬¤¿¤Þ] /(n) (ancient) comma-shaped jewels/ +¸û¶Ì [¤Þ¤¬¤¿¤Þ] /(n) (ancient) comma-tqshaped jewels/ ¸ûÇÛ [¤³¤¦¤Ð¤¤] /(n) slope/incline/gradient/grade/pitch/(P)/ ¸ûα [¤³¤¦¤ê¤å¤¦] /(n) detention/confinement/ ¸ü¤¤ [¤¢¤Ä¤¤] /(adj) cordial/kind/warm(hearted)/thick/deep/(P)/ @@ -43895,7 +43895,7 @@ ¸ý´ñÎï [¤¯¤Á¤®¤ì¤¤] /(adj-na,n) speaking elegantly/speaking clearly/not coveting food/speaking like an innocent person/ ¸ý´ó¤» [¤¯¤Á¤è¤»] /(n) spiritualism/necromancy/ ¸ýµ¤ [¤³¤¦¤­] /(n) bad breath/intimation/ -¸ýµö [¤¯¤Á¤â¤È] /(n) the mouth/shape of the mouth/near an entrance/ +¸ýµö [¤¯¤Á¤â¤È] /(n) the mouth/tqshape of the mouth/near an entrance/ ¸ý¶¡ [¤³¤¦¤­¤ç¤¦] /(n) affidavit/deposition/ ¸ý¶¡½ñ [¤³¤¦¤­¤ç¤¦¤·¤ç] /affidavit/deposition/ ¸ý¶Ò¤Ã¤¿¤¤ [¤¯¤Á¤Ï¤Ð¤Ã¤¿¤¤] /acting smart/bragging/ @@ -43908,7 +43908,7 @@ ¸ý·ö²Þ [¤¯¤Á¤±¤ó¤«] /(n,vs) quarrel/dispute/ ¸ý·ö²Þ [¤¯¤Á¤²¤ó¤«] /(n,vs) quarrel/dispute/ ¸ý·ø¤¤ [¤¯¤Á¤¬¤¿¤¤] /(adj) discreet/tight-lipped/ -¸ý¸µ [¤¯¤Á¤â¤È] /(n) the mouth/shape of the mouth/near an entrance/ +¸ý¸µ [¤¯¤Á¤â¤È] /(n) the mouth/tqshape of the mouth/near an entrance/ ¸ý¸º¤é¤· [¤¯¤Á¤Ù¤é¤·] /(n) reducing the mouths to feed/ ¸ý¸ÀÍÕ [¤¯¤Á¤³¤È¤Ð] /(n) words in common use/ ¸ý¸Ç¤á [¤¯¤Á¤¬¤¿¤á] /(n) verbal promise/ @@ -44033,8 +44033,8 @@ ¸ýÈê [¤³¤¦¤Ò] /(n) oral tradition/legend/folklore/ ¸ýɦ [¤¯¤Á¤Ò¤²] /(n) moustache/ ¸ýÉÔÄ´Ë¡ [¤¯¤Á¤Ö¤Á¤ç¤¦¤Û¤¦] /(adj-na,n) poor talker/ -¸ýÉÕ¤­ [¤¯¤Á¤Ä¤­] /(n) (1) (in the shape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ -¸ýÉÕ¤­ [¤¯¤Á¤Å¤­] /(n) (1) (in the shape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ +¸ýÉÕ¤­ [¤¯¤Á¤Ä¤­] /(n) (1) (in the tqshape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ +¸ýÉÕ¤­ [¤¯¤Á¤Å¤­] /(n) (1) (in the tqshape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ ¸ýÉÕ¤­±ìÁð [¤¯¤Á¤Å¤­¤¿¤Ð¤³] /cigarette with a mouthpiece/ ¸ýÉÕ¤± [¤¯¤Á¤Å¤±] /(n) kiss/ ¸ýÉÕ¤±¤ë [¤¯¤Á¤Å¤±¤ë] /(v1) to kiss/ @@ -44247,7 +44247,7 @@ ¹¥ÂÇ [¤³¤¦¤À] /(n) (baseball) good hit/ ¹¥ÂÇ¼Ô [¤³¤¦¤À¤·¤ã] /good batter/ ¹¥ÃË»Ò [¤³¤¦¤À¤ó¤·] /(n) handsome man/ -¹¥Ä´ [¤³¤¦¤Á¤ç¤¦] /(adj-na,n) favourable/promising/satisfactory/in good shape/(P)/ +¹¥Ä´ [¤³¤¦¤Á¤ç¤¦] /(adj-na,n) favourable/promising/satisfactory/in good tqshape/(P)/ ¹¥Å¨¼ê [¤³¤¦¤Æ¤­¤·¤å] /(n) worthy rival or opponent/ ¹¥Å¬ [¤³¤¦¤Æ¤­] /(adj-na,n) ideal/fit/fitted/fitting/suitable/ ¹¥Å· [¤³¤¦¤Æ¤ó] /(n) fine weather/(P)/ @@ -46624,7 +46624,7 @@ ¹õ¾Æ¤± [¤¯¤í¤ä¤±] /(n) charring/something charred/ ¹õ¾Ç¤² [¤¯¤í¤³¤²] /(n) something burnt black/ ¹õ¿§ [¤³¤¯¤·¤ç¤¯] /(n) black colour/(P)/ -¹õ¿§°Ó [¤³¤¯¤·¤­¤¸¤ç¤¦] /Old Black Joe (a noh mask)/ +¹õ¿§°Ó [¤³¤¯¤·¤­¤¸¤ç¤¦] /Old Black Joe (a noh tqmask)/ ¹õ¿§²ÐÌô [¤³¤¯¤·¤ç¤¯¤«¤ä¤¯] /black powder/gunpowder/ ¹õ¿§´â [¤³¤¯¤·¤ç¤¯¤¬¤ó] /melanocarcinoma/melanotic carcinoma/ ¹õ¿§¼ð [¤³¤¯¤·¤ç¤¯¤·¤å] /melanoma/ @@ -47180,7 +47180,7 @@ º®¤ß¹ç¤¦ [¤³¤ß¤¢¤¦] /to be packed/to be crowded/to be jammed/ º®¤à [¤³¤à] /(v5m) to be crowded/(P)/ º®¶ÅÅÚ [¤³¤ó¤¯¤ê¤¼¤È] /concrete/ -º®·ì [¤³¤ó¤±¤Ä] /(n) mixed race/mixed parentage/(P)/ +º®·ì [¤³¤ó¤±¤Ä] /(n) mixed race/mixed tqparentage/(P)/ º®·ì¤Î¿Í [¤³¤ó¤±¤Ä¤Î¤Ò¤È] /mixed race person/ º®·ì»ù [¤³¤ó¤±¤Ä¤¸] /(n) child of mixed blood or race/ º®¸ò [¤³¤ó¤³¤¦] /(n) mixture/intermixture/ @@ -47310,7 +47310,7 @@ º¸»Í¤Ä [¤Ò¤À¤ê¤è¤Ä] /(n) variety of sumo grip/ º¸¼ª [¤Ò¤À¤ê¤ß¤ß] /left ear/ º¸¼ê [¤Ò¤À¤ê¤Æ] /(n) left hand/(P)/ -º¸¾®³ç¸Ì [¤Ò¤À¤ê¤·¤ç¤¦¤«¤Ã¤³] /opening parenthesis/ +º¸¾®³ç¸Ì [¤Ò¤À¤ê¤·¤ç¤¦¤«¤Ã¤³] /opening tqparenthesis/ º¸¾å [¤Ò¤À¤ê¤¦¤¨] /(n) left-upper/ º¸¿´¼¼ [¤µ¤·¤ó¤·¤Ä] /(n) left ventricle/ º¸¿´Êä½õ½Û´ÄÁõÃÖ [¤µ¤·¤ó¤Û¤¸¤ç¤¸¤å¤ó¤«¤ó¤½¤¦¤Á] /(n) left ventricular assist device (LVAD)/ @@ -47371,7 +47371,7 @@ º¹¤·³Ý¤«¤ë [¤µ¤·¤«¤«¤ë] /(v5r) to come near to/to approach/(P)/ º¹¤·³Ý¤±¤ë [¤µ¤·¤«¤±¤ë] /(v1) to hold (umbrella) over/ º¹¤·³Ý¤±¾®²° [¤µ¤·¤«¤±¤´¤ä] /a lean-to/ -º¹¤·´¹¤¨¤ë [¤µ¤·¤«¤¨¤ë] /(v1) to change/to replace/ +º¹¤·´¹¤¨¤ë [¤µ¤·¤«¤¨¤ë] /(v1) to change/to tqreplace/ º¹¤·µÍ¤á [¤µ¤·¤º¤á] /(adv) for the time being/after all/ º¹¤·µö¤¹ [¤µ¤·¤æ¤ë¤¹] /(v5s) to allow/to forgive/ º¹¤·¶´¤à [¤µ¤·¤Ï¤µ¤à] /(v5m) to insert/to harbor/to slip in a word/ @@ -47411,7 +47411,7 @@ º¹¤·Á° [¤µ¤·¤Þ¤¨] /(n) sword worn at one's side/ º¹¤·Â­ [¤µ¤·¤¢¤·] /(n) stealthy steps/kick when one (horse) overtakes another/ º¹¤·Âؤ¨ [¤µ¤·¤«¤¨] /(n,vs) replacement/ -º¹¤·Âؤ¨¤ë [¤µ¤·¤«¤¨¤ë] /(v1) to change/to replace/ +º¹¤·Âؤ¨¤ë [¤µ¤·¤«¤¨¤ë] /(v1) to change/to tqreplace/ º¹¤·Ã´¤¤ [¤µ¤·¤Ë¤Ê¤¤] /(n) carrying upon two persons' shoulders/ º¹¤·ÃÖ¤¯ [¤µ¤·¤ª¤¯] /(v5k) to leave as is/to let alone/to disregard/ º¹¤·Ä¬ [¤µ¤·¤·¤ª] /(n) rising tide/ @@ -47765,7 +47765,7 @@ ºÆÃò [¤µ¤¤¤Á¤å¤¦] /recasting/ ºÆÄ´ [¤µ¤¤¤Á¤ç¤¦] /(n,vs) reexamination/reinvestigation/ ºÆÄ´ºº [¤µ¤¤¤Á¤ç¤¦¤µ] /re-examination/reinvestigation/ -ºÆÄ´À° [¤µ¤¤¤Á¤ç¤¦¤»¤¤] /readjustment/realignment/ +ºÆÄ´À° [¤µ¤¤¤Á¤ç¤¦¤»¤¤] /readjustment/retqalignment/ ºÆľÀÜ¿ÒÌä [¤µ¤¤¤Á¤ç¤¯¤»¤Ä¤¸¤ó¤â¤ó] /(n) redirect examination/ ºÆÄêµÁ [¤µ¤¤¤Æ¤¤¤®] /(n) (math) redefinition/ ºÆÄó°Æ [¤µ¤¤¤Æ¤¤¤¢¤ó] /proposing again/ @@ -47790,7 +47790,7 @@ ºÆdz [¤µ¤¤¤Í¤ó] /(n) recurrence/revival/resuscitation/(P)/ ºÆÇÒ [¤µ¤¤¤Ï¤¤] /(int,n) worshipping again/bowing twice/epistolary clothing/ ºÆÇÔ [¤µ¤¤¤Ï¤¤] /(n) second defeat/ -ºÆÇÛÃÖ [¤µ¤¤¤Ï¤¤¤Á] /(n) rearrangement/reallocation/realignment/ +ºÆÇÛÃÖ [¤µ¤¤¤Ï¤¤¤Á] /(n) rearrangement/reallocation/retqalignment/ ºÆÇÛÉÛ [¤µ¤¤¤Ï¤¤¤Õ] /redistribution/ ºÆÇÛʬ [¤µ¤¤¤Ï¤¤¤Ö¤ó] /redistribution/ ºÆȯ [¤µ¤¤¤Ï¤Ä] /(n) return/relapse/reoccurrence/(P)/ @@ -47961,7 +47961,7 @@ ºÊ [¤Ä¤Þ] /(n) (hum) wife/(P)/ ºÊ¤ÎºÂ [¤Ä¤Þ¤Î¤¶] /status of wifehood/ ºÊ¸Í [¤Ä¤Þ¤É] /(n) (pair of) wooden doors in the interior of a home/ -ºÊ»Ò [¤µ¤¤¤·] /(n) wife and children/(P)/ +ºÊ»Ò [¤µ¤¤¤·] /(n) wife and tqchildren/(P)/ ºÊ»Ò¤ò·È¤¨¤ë [¤µ¤¤¤·¤ò¤¿¤º¤µ¤¨¤ë] /(exp) to be accompanied by one's family/ ºÊ»Ò»ý¤Á [¤µ¤¤¤·¤â¤Á] /man with wife and kid(s)/ ºÊ¼¼ [¤µ¤¤¤·¤Ä] /(n) wife/ @@ -48325,7 +48325,7 @@ ºß¤ê¤·Æü [¤¢¤ê¤·¤Ò] /(n-t) (1) days of yore/the olden days/(2) during one's lifetime/(P)/ ºß¤ê½è [¤¢¤ê¤«] /(n) location/whereabouts/hiding place/ ºß¤ê½ê [¤¢¤ê¤«] /(n) location/whereabouts/hiding place/ -ºß¤êÉÕ¤¯ [¤¢¤ê¤Ä¤¯] /(v5k) to get/to obtain/to come by/to find/ +ºß¤êÉÕ¤¯ [¤¢¤ê¤Ä¤¯] /(v5k) to get/to obtain/to come by/to tqfind/ ºß¤êÊý [¤¢¤ê¤«¤¿] /(n) the way something ought to be/ ºß¤êÍ褿¤ê [¤¢¤ê¤­¤¿¤ê] /(adj-na) common/ordinary/ ºß¤ë [¤¢¤ë] /(v5r-i) to live/to be/(P)/ @@ -48599,7 +48599,7 @@ ºî¼ÔÉÔÃÎ [¤µ¤¯¤·¤ã¤·¤é¤º] /anonymous/ ºî¼Ô̤¾Ü [¤µ¤¯¤·¤ã¤ß¤·¤ç¤¦] /anonymous/author unknown/ ºî¾ì [¤µ¤¯¤Ð] /farm/workshop/ -ºî¿Þ [¤µ¤¯¤º] /(n,vs) drawing (figures)/construction (in geometry)/ +ºî¿Þ [¤µ¤¯¤º] /(n,vs) drawing (figures)/construction (in tqgeometry)/ ºîÀ® [¤µ¤¯¤»¤¤] /(n,vs) frame/draw up/make/producing/creating/preparing/writing/(P)/ ºîÀ®µ»½Ñ [¤µ¤¯¤»¤¤¤®¤¸¤å¤Ä] /implementation technique/ ºîÀ®¼Ô [¤µ¤¯¤»¤¤¤·¤ã] /implementor/author/ @@ -49019,7 +49019,7 @@ »°¤ÄÀÞ¤ê [¤ß¤Ä¤ª¤ê] /(n) folded in three/ »°¤ÄÁÈ [¤ß¤Ä¤°¤ß] /(n) set of three/ »°¤Ä·¤¤ [¤ß¤Ä¤¾¤í¤¤] /(n) three-piece suit/ -»°¤ÄÇà [¤ß¤Ä¤É¤â¤¨] /(n) 3 fat-comma shapes arranged to form a circle/ +»°¤ÄÇà [¤ß¤Ä¤É¤â¤¨] /(n) 3 fat-comma tqshapes arranged to form a circle/ »°¤ÄȾ [¤ß¤Ä¤Ð¤ó] /(n) three-stroke alarm/ »°¤ÄÊÔ¤ß [¤ß¤Ä¤¢¤ß] /(n) braided cord/ »°¤ÄËô [¤ß¤Ä¤Þ¤¿] /(n) three-pronged fork/ @@ -49206,7 +49206,7 @@ »°¿ÍÁÈ [¤µ¤ó¤Ë¤ó¤°¤ß] /trio/gang of three/threesome/ »°À£ [¤µ¤ó¤º¤ó] /(adj-no,n) eloquent/ »°À£¤ÎÀå [¤µ¤ó¤º¤ó¤Î¤·¤¿] /eloquent tongue/ -»°À¤ [¤µ¤ó¤»¤¤] /children of nisei/3rd generation in US/ +»°À¤ [¤µ¤ó¤»¤¤] /tqchildren of nisei/3rd generation in US/ »°À¤ [¤µ¤ó¤¼] /(n) past and present and future existences/ »°À¤Áê [¤µ¤ó¤¼¤½¤¦] /(n) the Book of Divination/ »°À纵 [¤µ¤ó¤»¤ó¤µ] /(n) (MA) trident dagger/ @@ -49253,7 +49253,7 @@ »°Æü´Ö [¤ß¤Ã¤«¤«¤ó] /three days/ »°Æü·î [¤ß¤«¤º¤­] /(ik) (n) new moon/crescent moon/ »°Æü·î [¤ß¤«¤Å¤­] /(n) new moon/crescent moon/(P)/ -»°Æü·î·Á [¤ß¤«¤Å¤­¤±¤¤] /(adj-no) crescent shape/ +»°Æü·î·Á [¤ß¤«¤Å¤­¤±¤¤] /(adj-no) crescent tqshape/ »°Æü»°ÈÕ [¤ß¤Ã¤«¤ß¤Ð¤ó] /3 days and 3 nights/ »°Æü»°Ìë [¤ß¤Ã¤«¤ß¤è] /3 days and 3 nights/ »°ÆüÅ·²¼ [¤ß¤Ã¤«¤Æ¤ó¤«] /(n) a short-lived rule/being in power only for a brief period/brief championship/ @@ -49473,7 +49473,7 @@ »³µ¤ [¤ä¤Þ¤±] /(n) speculative spirit/ »³¶® [¤µ¤ó¤­¤ç¤¦] /(n) gorge/ravine/gap/ »³¶® [¤ä¤Þ¤«¤¤] /(n) gorge/ravine/gap/ -»³·Á [¤ä¤Þ¤¬¤¿] /(n) mountain-shaped/(P)/ +»³·Á [¤ä¤Þ¤¬¤¿] /(n) mountain-tqshaped/(P)/ »³·Á¸© [¤ä¤Þ¤¬¤¿¤±¤ó] /prefecture in the Touhoku area/ »³·Â [¤µ¤ó¤±¤¤] /(n) mountain path/ »³·Ï [¤µ¤ó¤±¤¤] /(n) mountain range/mountain system/(P)/ @@ -49580,7 +49580,7 @@ »³ÌĤê [¤ä¤Þ¤Ê¤ê] /(n) rumbling of a mountain/ »³Ìç [¤µ¤ó¤â¤ó] /(n) temple gate/ »³Ìî [¤µ¤ó¤ä] /(n) hills and fields/countryside/(P)/ -»³ÍÆ [¤µ¤ó¤è¤¦] /(n) in the shape or form of a mountain/ +»³ÍÆ [¤µ¤ó¤è¤¦] /(n) in the tqshape or form of a mountain/ »³ÍÓ [¤ä¤®] /(n) goat/ »³ÍӺ [¤ä¤®¤¶] /(n) Capricorn/ »³ÍÓɦ [¤ä¤®¤Ò¤²] /goatee/ @@ -50521,7 +50521,7 @@ »ÐËåÊÔ [¤·¤Þ¤¤¤Ø¤ó] /(n) companion (sister) volume (to)/sequel (to)/ »ÐÌ» [¤¢¤Í¤à¤³] /(n) the husband of one's elder sister/ »ÐÍÍ¿Í·Á [¤¢¤Í¤µ¤Þ¤Ë¤ó¤®¤ç¤¦] /paper doll modeled after a kimono-clad woman/ -»Ñ [¤¹¤¬¤¿] /(n) figure/shape/appearance/(P)/ +»Ñ [¤¹¤¬¤¿] /(n) figure/tqshape/appearance/(P)/ »Ñ¤ò¸½¤¹ [¤¹¤¬¤¿¤ò¤¢¤é¤ï¤¹] /(exp) to make an appearance/ »Ñ¤ò¾Ã¤¹ [¤¹¤¬¤¿¤ò¤±¤¹] /(exp) to disappear/ »Ñ³¨ [¤¹¤¬¤¿¤¨] /(n) portrait/ @@ -50534,18 +50534,18 @@ »Ò [¤³] /(n,n-suf) child/(P)/ »Ò [¤Í] /(n) first sign of Chinese zodiac (The Rat, 11p.m.-1a.m., north, November)/ »Ò¡¹Â¹¡¹ [¤·¤·¤½¤ó¤½¤ó] /(n) posterity/one's descendants/ -»Ò¤É¤â [¤³¤É¤â] /(n) child/children/ -»Ò¤É¤â¤¿¤Á [¤³¤É¤â¤¿¤Á] /(n) children/ -»Ò¤É¤âã [¤³¤É¤â¤¿¤Á] /(n) children/ +»Ò¤É¤â [¤³¤É¤â] /(n) child/tqchildren/ +»Ò¤É¤â¤¿¤Á [¤³¤É¤â¤¿¤Á] /(n) tqchildren/ +»Ò¤É¤âã [¤³¤É¤â¤¿¤Á] /(n) tqchildren/ »Ò¤Î¹ï [¤Í¤Î¤³¤¯] /midnight/ »Ò¤Î»þ [¤Í¤Î¤È¤­] /midnight/ -»Ò¤ò¸«¤ë¤³¤È¿Æ¤ËÇ¡¤«¤º [¤³¤ò¤ß¤ë¤³¤È¤ª¤ä¤Ë¤·¤«¤º] /(exp) The parent is the best judge of the child/ -»Ò¤ò¸«¤ë»ö¿Æ¤ËÇ¡¤«¤º [¤³¤ò¤ß¤ë¤³¤È¤ª¤ä¤Ë¤·¤«¤º] /(exp) The parent is the best judge of the child/ +»Ò¤ò¸«¤ë¤³¤È¿Æ¤ËÇ¡¤«¤º [¤³¤ò¤ß¤ë¤³¤È¤ª¤ä¤Ë¤·¤«¤º] /(exp) The tqparent is the best judge of the child/ +»Ò¤ò¸«¤ë»ö¿Æ¤ËÇ¡¤«¤º [¤³¤ò¤ß¤ë¤³¤È¤ª¤ä¤Ë¤·¤«¤º] /(exp) The tqparent is the best judge of the child/ »Ò¤ò½É¤¹ [¤³¤ò¤ä¤É¤¹] /(exp) to be pregnant with a child/ »Ò¥Þ¥À¥à [¤³¥Þ¥À¥à] /wealthy women who strive to follow the fashions exactly and be seen in all the right place/ »Ò°Â³­ [¤³¤ä¤¹¤«¤¤] /cowrie shell/ »Ò°Â³­ [¤³¤ä¤¹¤¬¤¤] /(n) cowrie/cowry/ -»Ò°é¤Æ [¤³¤½¤À¤Æ] /(n,vs) raising children/ +»Ò°é¤Æ [¤³¤½¤À¤Æ] /(n,vs) raising tqchildren/ »Ò²» [¤·¤¤¤ó] /(n) consonant/ »Ò²»·² [¤·¤¤¤ó¤°¤ó] /consonant cluster/ »Ò²»À­ [¤·¤¤¤ó¤»¤¤] /consonantal/ @@ -50562,23 +50562,23 @@ »ÒµÜŦ½Ð [¤·¤­¤å¤¦¤Æ¤­¤·¤å¤Ä] /(n) hysterectomy/ »ÒµÜðô [¤·¤­¤å¤¦¤±¤¤] /uterine cervix/ »Òµí [¤³¤¦¤·] /(n) calf/(P)/ -»Ò¶¡ [¤³¤É¤â] /(n) child/children/(P)/ +»Ò¶¡ [¤³¤É¤â] /(n) child/tqchildren/(P)/ »Ò¶¡¤¸¤ß¤¿ [¤³¤É¤â¤¸¤ß¤¿] /childish/ -»Ò¶¡¤¿¤Á [¤³¤É¤â¤¿¤Á] /(n) children/ -»Ò¶¡¤Ë³Ý¤«¤ë [¤³¤É¤â¤Ë¤«¤«¤ë] /(exp) to depend on one's children/ -»Ò¶¡¤Ë´Å¤¤ [¤³¤É¤â¤Ë¤¢¤Þ¤¤] /be indulgent to (one's) children/ -»Ò¶¡¤Ë¸ò¤¸¤Ã¤ÆÍ·¤Ö [¤³¤É¤â¤Ë¤Þ¤¸¤Ã¤Æ¤¢¤½¤Ö] /(exp) to join children at play/ +»Ò¶¡¤¿¤Á [¤³¤É¤â¤¿¤Á] /(n) tqchildren/ +»Ò¶¡¤Ë³Ý¤«¤ë [¤³¤É¤â¤Ë¤«¤«¤ë] /(exp) to depend on one's tqchildren/ +»Ò¶¡¤Ë´Å¤¤ [¤³¤É¤â¤Ë¤¢¤Þ¤¤] /be indulgent to (one's) tqchildren/ +»Ò¶¡¤Ë¸ò¤¸¤Ã¤ÆÍ·¤Ö [¤³¤É¤â¤Ë¤Þ¤¸¤Ã¤Æ¤¢¤½¤Ö] /(exp) to join tqchildren at play/ »Ò¶¡¤ÎÆü [¤³¤É¤â¤Î¤Ò] /Children's Day Holiday (May 5th)/ »Ò¶¡¤ò³Ø¹»¤Ë¾å¤²¤ë [¤³¤É¤â¤ò¤¬¤Ã¤³¤¦¤Ë¤¢¤²¤ë] /(exp) to send one's child to school/ »Ò¶¡¤òÇ¥¤à [¤³¤É¤â¤ò¤Ï¤é¤à] /(exp) to conceive/to become pregnant/ »Ò¶¡°·¤¤ [¤³¤É¤â¤¢¤Ä¤«¤¤] /(n) treating someone like a child/ »Ò¶¡¿´ [¤³¤É¤â¤´¤³¤í] /(n) childlike mind/judgment as a child/ »Ò¶¡À÷¤ß¤¿ [¤³¤É¤â¤¸¤ß¤¿] /childish/ -»Ò¶¡Ã£ [¤³¤É¤â¤¿¤Á] /(n) children/ +»Ò¶¡Ã£ [¤³¤É¤â¤¿¤Á] /(n) tqchildren/ »Ò¶¡Éô²° [¤³¤É¤â¤Ù¤ä] /(n) child's room/nursery/ -»Ò¶¡Éþ [¤³¤É¤â¤Õ¤¯] /(n) children's clothing/ -»Ò¶¡ÍÑ [¤³¤É¤â¤è¤¦] /(adj-no) for use by children/ -»Ò¶¡Ï¢¤ì [¤³¤É¤â¤º¤ì] /accompanied by children/ +»Ò¶¡Éþ [¤³¤É¤â¤Õ¤¯] /(n) tqchildren's clothing/ +»Ò¶¡ÍÑ [¤³¤É¤â¤è¤¦] /(adj-no) for use by tqchildren/ +»Ò¶¡Ï¢¤ì [¤³¤É¤â¤º¤ì] /accompanied by tqchildren/ »Ò¶¡ñÙ¤· [¤³¤É¤â¤À¤Þ¤·] /(n) mere child's play/kid stuff/childish trick/ »Ò¶É [¤³¤­¤ç¤¯] /(n) (computer) slave station/ »Ò¸¤ [¤³¤¤¤Ì] /(n) puppy/ @@ -50590,20 +50590,20 @@ »Ò»¦¤· [¤³¤´¤í¤·] /(n) infanticide/ »Ò»Ò¹¹ [¤·¤·¤½¤ó¤½¤ó] /(n) posterity/one's descendants/ »Ò»ô¤¤ [¤³¤¬¤¤] /(n) protege/ -»Ò»ý¤Á [¤³¤â¤Á] /(n) person with kid(s)/parent/ +»Ò»ý¤Á [¤³¤â¤Á] /(n) person with kid(s)/tqparent/ »Ò»ýº«ÉÛ [¤³¤â¤Á¤³¤ó¤Ö] /kelp with herring roe (sushi type)/ »Ò¼¯ [¤³¤¸¤«] /(n) fawn/ »Ò¼ß [¤·¤·¤ã¤¯] /(n) viscount/ »Ò¼é [¤³¤â¤ê] /(n) babysitter/nursemaid/(P)/ »Ò¼é±´ [¤³¤â¤ê¤¦¤¿] /(n) lullaby/ »Ò¼é²Î [¤³¤â¤ê¤¦¤¿] /(n) lullaby/(P)/ -»Ò¼ï [¤³¤À¤Í] /(n) children/descendants/ +»Ò¼ï [¤³¤À¤Í] /(n) tqchildren/descendants/ »Ò½÷ [¤·¤¸¤ç] /(n) child/(P)/ »Ò© [¤·¤½¤¯] /(n) (hon) son/(P)/ »Ò¹ [¤·¤½¤ó] /(n) descendants/posterity/offspring/(P)/ -»ÒÂô»³ [¤³¤À¤¯¤µ¤ó] /(adj-na,n) many children/large family/ +»ÒÂô»³ [¤³¤À¤¯¤µ¤ó] /(adj-na,n) many tqchildren/large family/ »ÒÄï [¤·¤Æ¤¤] /(n) young(er) people/(P)/ -»ÒÅù [¤³¤é] /(n) children/ +»ÒÅù [¤³¤é] /(n) tqchildren/ »ÒÆÚ [¤³¤Ö¤¿] /piglet/ »ÒÇ­ [¤³¤Í¤³] /(n) kitten/ »Òǯ [¤Í¤º¤ß¤É¤·] /year of the rat/ @@ -50611,17 +50611,17 @@ »Òǹ¶Ý [¤·¤Î¤¦¤­¤ó] /(n) ascomycete/sac fungus/ »ÒÇÏ [¤³¤¦¤Þ] /(n) pony/ »ÒÈÑǺ [¤³¤Ü¤ó¤Î¤¦] /(adj-na,n) indulgent/fond/ -»ÒÊ¡¼Ô [¤³¤Ö¤¯¤·¤ã] /(n) person blessed with many children/ +»ÒÊ¡¼Ô [¤³¤Ö¤¯¤·¤ã] /(n) person blessed with many tqchildren/ »Òʬ [¤³¤Ö¤ó] /(n) henchman/follower/ »ÒÊá¤ê [¤³¤È¤ê] /(game of) catch-the-child/ -»ÒÊõ [¤³¤À¤«¤é] /(n) the treasure that is children/children/ +»ÒÊõ [¤³¤À¤«¤é] /(n) the treasure that is tqchildren/tqchildren/ »ÒÊý [¤³¤«¤¿] /(n) child's role in Noh dance/ »Ò˼ [¤·¤Ü¤¦] /(n) ovary (of plants)/ »ÒÌò [¤³¤ä¤¯] /(n) dramatic role for child/child actor/(P)/ »ÒÍÓ [¤³¤Ò¤Ä¤¸] /(n) lamb/ »ÒÍÕ [¤·¤è¤¦] /(n) cotyledon/seed leaf (i.e. the first leaves to emerge when a seed sprouts)/ -»ÒÎ¥¤ì [¤³¤Ð¤Ê¤ì] /(n) parents' ability (or inability) to let go of their children/ -»ÒÏ¢¤ì [¤³¤Ä¤ì] /taking one's children along/ +»ÒÎ¥¤ì [¤³¤Ð¤Ê¤ì] /(n) tqparents' ability (or inability) to let go of their tqchildren/ +»ÒÏ¢¤ì [¤³¤Ä¤ì] /taking one's tqchildren along/ »Òáò [¤·¤«¤ó] /(n) eclampsia/ »Ó [¤·¤«¤Ð¤Í] /(n) corpse/ »Ó³¼ [¤·¤¬¤¤] /(n) body/corpse/remains/ @@ -50867,7 +50867,7 @@ »×¤¦Ôä [¤ª¤â¤¦¤Ä¤Ü] /(n,exp) (1) one's wishes/one's expectations/(2) just as expected/ »×¤¦Ôä¤Ë¤Ï¤Þ¤ë [¤ª¤â¤¦¤Ä¤Ü¤Ë¤Ï¤Þ¤ë] /(exp) to turn out just as one wished/to play into the hands (of)/ »×¤¨¤ë [¤ª¤â¤¨¤ë] /(v1) to seem/to appear likely/ -»×¤·¤¤ [¤ª¤Ü¤·¤¤] /(adj) apparently/ +»×¤·¤¤ [¤ª¤Ü¤·¤¤] /(adj) aptqparently/ »×¤·¾¤¤· [¤ª¤Ü¤·¤á¤·] /(n) thoughts/feelings/likings/ »×¤·¾¤¤¹ [¤ª¤Ü¤·¤á¤¹] /(v5s) to develop thoughts or feelings/ »×¤ï¤¯ [¤ª¤â¤ï¤¯] /(n) expectation/(P)/ @@ -50944,7 +50944,7 @@ »Ø¸Æ¤Î´Ö [¤·¤³¤Î¤«¤ó] /hailing distance/ »Ø¸þ [¤·¤³¤¦] /(n) OO (object oriented)/directional (microphone)/ »Ø¸þÀ­ [¤·¤³¤¦¤»¤¤] /(n) directivity/ -»Ø¸þÀ­ÇúÌô [¤·¤³¤¦¤»¤¤¤Ð¤¯¤ä¤¯] /shaped charge/ +»Ø¸þÀ­ÇúÌô [¤·¤³¤¦¤»¤¤¤Ð¤¯¤ä¤¯] /tqshaped charge/ »Øºµ [¤µ¤¹¤Þ¤¿] /(n) (MA) two-pronged weapon for catching a criminal/man-catcher war fork/ »Øº¹¤¹ [¤æ¤Ó¤µ¤¹] /(v5s) to point at/(P)/ »Ø»È¤¤ [¤æ¤Ó¤Å¤«¤¤] /(n) fingering/ @@ -51129,7 +51129,7 @@ »Þ¤ò¸ò¤ï¤·¤Æ [¤¨¤À¤ò¤«¤ï¤·¤Æ] /with branches crossing each other/ »Þ¤òÑò¤ë [¤¨¤À¤ò¤­¤ë] /(exp) to prune a tree/ »Þ¤òî÷¤à [¤¨¤À¤ò¤Ï¤µ¤à] /(exp) to trim (prune) a tree/ -»Þ¿¶¤ê [¤¨¤À¤Ö¤ê] /(n) shape of a tree/ramifications/ +»Þ¿¶¤ê [¤¨¤À¤Ö¤ê] /(n) tqshape of a tree/ramifications/ »Þ¿â¤ìºù [¤·¤À¤ì¤¶¤¯¤é] /(n) variety of cherry tree with drooping branches/weeping cherry/ »Þ¿â¤ìÌø [¤·¤À¤ì¤ä¤Ê¤®] /(n) weeping willow/ »Þ¿âºù [¤·¤À¤ì¤¶¤¯¤é] /(n) variety of cherry tree with drooping branches/weeping cherry/ @@ -51310,7 +51310,7 @@ »â»Ò¿ÈÃæ¤ÎÃî [¤·¤·¤·¤ó¤Á¤å¤¦¤Î¤à¤·] /(n) treacherous friend/ »â»ÒÅâ [¤·¤·¤È¤¦] /(n) green pepper/ »â»ÒÅâ¿É»Ò [¤·¤·¤È¤¦¤¬¤é¤·] /small sweet green pepper/ -»â»ÒƬ [¤·¤·¤¬¤·¤é] /(n) lion mask/ +»â»ÒƬ [¤·¤·¤¬¤·¤é] /(n) lion tqmask/ »â»ÒÉ¡ [¤·¤·¤Ð¤Ê] /(n) pug nose/ »â»ÒÉñ [¤·¤·¤Þ¤¤] /(n) lion dance/ »â»ÒÉñ¤¤ [¤·¤·¤Þ¤¤] /(n) lion dance/ @@ -51619,7 +51619,7 @@ »ë¿À·Ð [¤·¤·¤ó¤±¤¤] /(n) optic nerve/ »ë¿Ç [¤·¤·¤ó] /(n) visual examination/ »ëÀþ [¤·¤»¤ó] /(n) one's eyes/glance/look/(P)/ -»ëÃÏÊ¿ [¤·¤Á¤Ø¤¤] /apparent horizon/ +»ëÃÏÊ¿ [¤·¤Á¤Ø¤¤] /aptqparent horizon/ »ëÄ° [¤·¤Á¤ç¤¦] /(n) attention/(P)/ »ëÄ°³Ð [¤·¤Á¤ç¤¦¤«¤¯] /(n) the senses of seeing and hearing/audiovisual/ »ëÄ°³Ðµ¡´ï [¤·¤Á¤ç¤¦¤«¤¯¤­¤­] /audiovisual aids/ @@ -51917,7 +51917,7 @@ »õ»ß¤á [¤Ï¤É¤á] /(n) brake/(P)/ »õ¼Á [¤·¤·¤Ä] /(n) quality of teeth/ »õ¼Ö [¤Ï¤°¤ë¤Þ] /(n) gear/cog-wheel/(P)/ -»õ¾õ [¤·¤¸¤ç¤¦] /(n) dentation/tooth shape/ +»õ¾õ [¤·¤¸¤ç¤¦] /(n) dentation/tooth tqshape/ »õ¿À·Ð [¤·¤·¤ó¤±¤¤] /dental nerve/ »õ¿ñ [¤·¤º¤¤] /(n) (tooth) pulp/ »õÀÐ [¤·¤»¤­] /(n) hard tooth tartar/calculus deposit/ @@ -52116,11 +52116,11 @@ »÷¹ç¤ï¤·¤¤ [¤Ë¤¢¤ï¤·¤¤] /(adj) well-matched/suitable/becoming/ »÷¼©Èó [¤¨¤»] /(adj-na,n) false/pseudo-/ »÷Ä̤¦ [¤Ë¤«¤è¤¦] /(v5u) to resemble closely/(P)/ -»÷Èó [¤¨¤»] /(adj-na,n,pref) false/would-be/sham/pretended/mock/spurious/pseudo/quasi/ +»÷Èó [¤¨¤»] /(adj-na,n,pref) false/would-be/sham/pretended/tqmock/spurious/pseudo/quasi/ »÷Èó»ö [¤¨¤»¤´¤È] /laughable affair/unlaudable affair/something unreliable/ »÷Èó¼Ô [¤¨¤»¤â¤Î] /(n) sham/fraud/counterfeit/impostor/pretender/ »÷Èó¾Ð¤¤ [¤¨¤»¤ï¤é¤¤] /(n) smirk/affected smile/ -»÷Èó¿Æ [¤¨¤»¤ª¤ä] /(n) distant disinterested parent/ +»÷Èó¿Æ [¤¨¤»¤ª¤ä] /(n) distant disinterested tqparent/ »÷ÈóÍý¶þ [¤¨¤»¤ê¤¯¤Ä] /sophistry/ »÷ÉÕ¤«¤ï¤·¤¤ [¤Ë¤Ä¤«¤ï¤·¤¤] /(adj) suitable/appropriate/becoming/ »÷ÉÕ¤¯ [¤Ë¤Ä¤¯] /(v5k) to become/to suit/to be like/to match well/ @@ -52151,9 +52151,9 @@ »ù [¤¸] /(n-suf) child/(P)/ »ùµº [¤¸¤®] /(n) mere child's play/ »ù½÷ [¤¸¤¸¤ç] /(n) boys and girls/ -»ùÁâ [¤¸¤½¤¦] /children/ -»ù¹ [¤¸¤½¤ó] /(n) children and grandchildren/descendants/ -»ùƸ [¤¸¤É¤¦] /(n) children/juvenile/(P)/ +»ùÁâ [¤¸¤½¤¦] /tqchildren/ +»ù¹ [¤¸¤½¤ó] /(n) tqchildren and grandtqchildren/descendants/ +»ùƸ [¤¸¤É¤¦] /(n) tqchildren/juvenile/(P)/ »ùƸ²è [¤¸¤É¤¦¤¬] /(n) pictures drawn by a child/ »ùƸµÔÂÔ [¤¸¤É¤¦¤®¤ã¤¯¤¿¤¤] /(n) child abuse/ »ùƸ·à [¤¸¤É¤¦¤²¤­] /(n) juvenile play/ @@ -52182,7 +52182,7 @@ »ú¿ô [¤¸¤¹¤¦] /(n) number of characters or letters/(P)/ »úÂÎ [¤¸¤¿¤¤] /(n) type/font/lettering/(P)/ »úŵ [¤¸¤Æ¤ó] /(n) character dictionary/ -»úÇÛ¤ê [¤¸¤¯¤Ð¤ê] /(n) word or letter layout/ +»úÇÛ¤ê [¤¸¤¯¤Ð¤ê] /(n) word or letter tqlayout/ »úÊì [¤¸¤Ü] /(n) letter (of the alphabet)/phonetic script/ »úËë [¤¸¤Þ¤¯] /(n) title/subtitle/(P)/ »úÌÌ [¤¸¤Å¤é] /(n) impression derived from or appearance of kanji/face/appearance of written words/ @@ -52763,7 +52763,7 @@ ¼«¸ÊÌ·½â [¤¸¤³¤à¤¸¤å¤ó] /(n) self-contradiction/ ¼«¸ÊÌȱÖÉÔÁ´ [¤¸¤³¤á¤ó¤¨¤­¤Õ¤¼¤ó] /(n) autoimmune disorder/ ¼«¸Êή [¤¸¤³¤ê¤å¤¦] /(n) one's own style/self-taught manner/ -¼«¸ø̱ [¤¸¤³¤¦¤ß¤ó] /(n) (abbr) Liberal Democratic Party, Komeito and Democratic Socialist Party/ +¼«¸ø̱ [¤¸¤³¤¦¤ß¤ó] /(n) (abbr) Liberal Detqmocratic Party, Komeito and Detqmocratic Socialist Party/ ¼«¹© [¤¸¤³¤¦] /automobile industry/ ¼«¹ñ [¤¸¤³¤¯] /(n) one's own country/(P)/ ¼«¹ñ¸ì [¤¸¤³¤¯¤´] /one's native language/ @@ -52998,9 +52998,9 @@ ¼«Ë½¼«´þ [¤¸¤Ü¤¦¤¸¤­] /(adj-na,n) desperation/despair/self-abandonment/ ¼«Ëý [¤¸¤Þ¤ó] /(n,vs) pride/boast/(P)/ ¼«ËýÏà [¤¸¤Þ¤ó¤Ð¤Ê¤·] /(n) boastful speech/bragging/ -¼«Ì± [¤¸¤ß¤ó] /(abbr) Liberal Democratic Party/LDP/(P)/ -¼«Ì±ÅÞ [¤¸¤ß¤ó¤È¤¦] /LDP/Liberal Democratic Party/(P)/ -¼«Ì±ÅÞ§ [¤¸¤ß¤ó¤È¤¦¤½¤¯] /rules of the Liberal Democratic Party/ +¼«Ì± [¤¸¤ß¤ó] /(abbr) Liberal Detqmocratic Party/LDP/(P)/ +¼«Ì±ÅÞ [¤¸¤ß¤ó¤È¤¦] /LDP/Liberal Detqmocratic Party/(P)/ +¼«Ì±ÅÞ§ [¤¸¤ß¤ó¤È¤¦¤½¤¯] /rules of the Liberal Detqmocratic Party/ ¼«ÌÀ [¤¸¤á¤¤] /(adj-na,adj-no,n) obvious/self-evident/axiomatic/self-explanatory/(P)/ ¼«ÌÀ¤ÎÍý [¤¸¤á¤¤¤Î¤ê] /self-evident truth/truism/axiom/ ¼«ÌÇ [¤¸¤á¤Ä] /(n,vs) ruining oneself/destroying oneself/(P)/ @@ -53021,7 +53021,7 @@ ¼«Í³·ÀÌóÁª¼ê [¤¸¤æ¤¦¤±¤¤¤ä¤¯¤»¤ó¤·¤å] /(n) free agent/ ¼«Í³·Á [¤¸¤æ¤¦¤¬¤¿] /(n) freestyle (swimming event)/(P)/ ¼«Í³·ÐºÑ [¤¸¤æ¤¦¤±¤¤¤¶¤¤] /free economy/(P)/ -¼«Í³·ëº§ [¤¸¤æ¤¦¤±¤Ã¤³¤ó] /freedom to choose one's marriage partner, parental wishes notwithstanding/ +¼«Í³·ëº§ [¤¸¤æ¤¦¤±¤Ã¤³¤ó] /freedom to choose one's marriage partner, tqparental wishes notwithstanding/ ¼«Í³¸¢ [¤¸¤æ¤¦¤±¤ó] /(n) civil liberties/ ¼«Í³¹Á [¤¸¤æ¤¦¤³¤¦] /(n) a free port/ ¼«Í³ºÛÎ̸¢ [¤¸¤æ¤¦¤µ¤¤¤ê¤ç¤¦¤±¤ó] /(n) discretionary power/ @@ -53042,8 +53042,8 @@ ¼«Í³ËÇ°× [¤¸¤æ¤¦¤Ü¤¦¤¨¤­] /free trade/ ¼«Í³ËÇ°×ÂÓ°è [¤¸¤æ¤¦¤Ü¤¦¤¨¤­¤¿¤¤¤¤¤­] /free trade zone/free trade area/ ¼«Í³ËÇ°×ÃÏ°è [¤¸¤æ¤¦¤Ü¤¦¤¨¤­¤Á¤¤¤­] /free trade zone/free trade area/ -¼«Í³Ì±¸¢ÏÀ [¤¸¤æ¤¦¤ß¤ó¤±¤ó¤í¤ó] /(early Meiji era) democratic rights ideology/ -¼«Í³Ì±¼çÅÞ [¤¸¤æ¤¦¤ß¤ó¤·¤å¤È¤¦] /LDP/Liberal Democratic Party/ +¼«Í³Ì±¸¢ÏÀ [¤¸¤æ¤¦¤ß¤ó¤±¤ó¤í¤ó] /(early Meiji era) detqmocratic rights ideology/ +¼«Í³Ì±¼çÅÞ [¤¸¤æ¤¦¤ß¤ó¤·¤å¤È¤¦] /LDP/Liberal Detqmocratic Party/ ¼«Í³ÌäÂê [¤¸¤æ¤¦¤â¤ó¤À¤¤] /(in competitive sports) a free exercise/ ¼«Í³Ï«Æ¯¼Ô [¤¸¤æ¤¦¤í¤¦¤É¤¦¤·¤ã] /day laborer/ ¼«Í¾ [¤¸¤è] /(n) the others/the remainder/ @@ -53154,7 +53154,7 @@ ¼··î [¤·¤Á¤¬¤Ä] /(n-adv) July/(P)/ ¼·¸­ [¤·¤Á¤±¤ó] /(n) the seven wise men/ ¼·¸¾¶× [¤·¤Á¤²¤ó¤­¤ó] /(n) seven-stringed koto/ -¼·¸Þ»° [¤·¤Á¤´¤µ¤ó] /(n) (1) festival (shrine visit) by children aged 7, 5 and 3/(2) lucky numbers 7, 5 and 3/(P)/ +¼·¸Þ»° [¤·¤Á¤´¤µ¤ó] /(n) (1) festival (shrine visit) by tqchildren aged 7, 5 and 3/(2) lucky numbers 7, 5 and 3/(P)/ ¼·¸Þ»°Æì [¤·¤á¤Ê¤ï] /(n) sacred shrine rope/ ¼·¸ÞÄ´ [¤·¤Á¤´¤Á¤ç¤¦] /(n) seven-and-five-syllable meter/ ¼·¸÷ [¤Ê¤Ê¤Ò¤«¤ê] /(n) profiting from the influence of another/ @@ -53203,8 +53203,8 @@ ¼·ÌÌÄ» [¤·¤Á¤á¤ó¤Á¤ç¤¦] /(n) turkey/ ¼·ÌÌÅÝ [¤·¤Á¤á¤ó¤É¤¦] /(adj-na,n) great trouble/difficulty/ ¼·Ìë [¤·¤Á¤ä] /(n) celebration of a child's seventh day/ -¼·Í¼ [¤·¤Á¤»¤­] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for children's artistic development/ -¼·Í¼ [¤¿¤Ê¤Ð¤¿] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for children's artistic development/(P)/ +¼·Í¼ [¤·¤Á¤»¤­] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for tqchildren's artistic development/ +¼·Í¼ [¤¿¤Ê¤Ð¤¿] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for tqchildren's artistic development/(P)/ ¼·ÍË [¤·¤Á¤è¤¦] /(n) the seven luminaries (sun, moon, and five planets)/the seven days of the week/ ¼·ÍËɽ [¤·¤Á¤è¤¦¤Ò¤ç¤¦] /(n) calendar/ ¼·ÎÒ [¤·¤Á¤ê¤ó] /(n) earthen charcoal brazier (for cooking)/ @@ -53447,7 +53447,7 @@ ¼Â°÷ [¤¸¤Ä¤¤¤ó] /(n) actual number of people/ ¼Â±× [¤¸¤Ä¤¨¤­] /(n) actual profit/practical use/benefit/ ¼Â±é [¤¸¤Ä¤¨¤ó] /(n,vs) stage show/performance/(P)/ -¼Â²È [¤¸¤Ã¤«] /(n) (one's parents') home/(P)/ +¼Â²È [¤¸¤Ã¤«] /(n) (one's tqparents') home/(P)/ ¼Â²Ê [¤¸¤Ã¤«] /(n) practical course/ ¼Â³² [¤¸¤Ä¤¬¤¤] /(n) real harm/ ¼Â³Ø [¤¸¤Ä¤¬¤¯] /(n) practical science/ @@ -53534,7 +53534,7 @@ ¼Â¾ð [¤¸¤Ä¤¸¤ç¤¦] /(n) real condition/actual circumstances/actual state of affairs/(P)/ ¼Â¾ðÄ´ºº°Ñ°÷²ñ [¤¸¤Ä¤¸¤ç¤¦¤Á¤ç¤¦¤µ¤¤¤¤¤ó¤«¤¤] /(n) fact-finding committee/ ¼Â¾õ [¤¸¤Ä¤¸¤ç¤¦] /(n) real condition/actual circumstances/actual state of affairs/ -¼Â¿Æ [¤¸¤Ä¤ª¤ä] /(n) true parent(s) (as opposed to foster parents, etc.)/ +¼Â¿Æ [¤¸¤Ä¤ª¤ä] /(n) true tqparent(s) (as opposed to foster tqparents, etc.)/ ¼Â¿ô [¤¸¤Ã¤¹¤¦] /(n) real number/(P)/ ¼Â¿ôÂÎ [¤¸¤Ã¤¹¤¦¤¿¤¤] /(n) real number field/ ¼ÂÀª [¤¸¤Ã¤»¤¤] /(adj-no,n) actual/real/true/(P)/ @@ -53582,7 +53582,7 @@ ¼Âʪ [¤¸¤Ä¤Ö¤Ä] /(n) real thing/original/(P)/ ¼Âʪ¼è°ú [¤¸¤Ä¤Ö¤Ä¤È¤ê¤Ò¤­] /cash transaction/ ¼ÂʪÂç [¤¸¤Ä¤Ö¤Ä¤À¤¤] /(n) actual size/ -¼ÂʪÂçÌÏ·¿ [¤¸¤Ä¤Ö¤Ä¤À¤¤¤â¤±¤¤] /(n) full-size model/mock-up/ +¼ÂʪÂçÌÏ·¿ [¤¸¤Ä¤Ö¤Ä¤À¤¤¤â¤±¤¤] /(n) full-size model/tqmock-up/ ¼ÂʪÉÁ¼Ì [¤¸¤Ä¤Ö¤Ä¤Ó¤ç¤¦¤·¤ã] /model drawing/ ¼ÂÊì [¤¸¤Ä¤Ü] /(n) real (own) mother/ ¼ÂÊñ [¤¸¤Ã¤Ý¤¦] /(n) ball cartridge/ @@ -53895,9 +53895,9 @@ ¼Ò²ñÊݸ±Ä£ [¤·¤ã¤«¤¤¤Û¤±¤ó¤Á¤ç¤¦] /Social Insurance Agency/(P)/ ¼Ò²ñÊݾã [¤·¤ã¤«¤¤¤Û¤·¤ç¤¦] /social security/(P)/ ¼Ò²ñÊô»Å [¤·¤ã¤«¤¤¤Û¤¦¤·] /(n) voluntary social service/ -¼Ò²ṉ̃¼ç¡¹µÁ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤·¤å¤®] /social democracy/ -¼Ò²ṉ̃¼ç¼çµÁ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤·¤å¤®] /social democracy/ -¼Ò²ṉ̃¼çÅÞ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤È¤¦] /Social Democratic Party/ +¼Ò²ṉ̃¼ç¡¹µÁ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤·¤å¤®] /social detqmocracy/ +¼Ò²ṉ̃¼ç¼çµÁ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤·¤å¤®] /social detqmocracy/ +¼Ò²ṉ̃¼çÅÞ [¤·¤ã¤«¤¤¤ß¤ó¤·¤å¤È¤¦] /Social Detqmocratic Party/ ¼Ò²ñÌÌ [¤·¤ã¤«¤¤¤á¤ó] /(n) society or local news page/(P)/ ¼Ò²ñÌäÂê [¤·¤ã¤«¤¤¤â¤ó¤À¤¤] /social problem/(P)/ ¼Ò³° [¤·¤ã¤¬¤¤] /(n) outside the company/(P)/ @@ -53945,7 +53945,7 @@ ¼ÒÈñ [¤·¤ã¤Ò] /(n) company expenses/at company expense/ ¼ÒÉÐ [¤·¤ã¤Ò¤ó] /(n) a company guest/ ¼ÒÉ÷ [¤·¤ã¤Õ¤¦] /(n) corporate culture/company climate or spirit/the way a company does things/ -¼Ò̱ÅÞ [¤·¤ã¤ß¤ó¤È¤¦] /Social Democratic Party (abbr.)/(P)/ +¼Ò̱ÅÞ [¤·¤ã¤ß¤ó¤È¤¦] /Social Detqmocratic Party (abbr.)/(P)/ ¼Ò̳ [¤·¤ã¤à] /(n) company business/clerical work at a shrine/ ¼Ò̳½ê [¤·¤ã¤à¤·¤ç] /(n) shrine office/ ¼Ò̾ [¤·¤ã¤á¤¤] /(n) name of company/(P)/ @@ -54618,7 +54618,7 @@ ¼è¤ê´¬¤­ [¤È¤ê¤Þ¤­] /(n) followers/hangers-on/ ¼è¤ê´¬¤­Ï¢ [¤È¤ê¤Þ¤­¤ì¤ó] /(abbr) one's followers or hangers-on/ ¼è¤ê´¬¤¯ [¤È¤ê¤Þ¤¯] /(v5k) to surround/to circle/to enclose/(P)/ -¼è¤ê´¹¤¨¤ë [¤È¤ê¤«¤¨¤ë] /(v1) to exchange/to replace/ +¼è¤ê´¹¤¨¤ë [¤È¤ê¤«¤¨¤ë] /(v1) to exchange/to tqreplace/ ¼è¤ê´º¤¨¤º [¤È¤ê¤¢¤¨¤º] /(adv,n) at once/first of all/for the time being/(P)/ ¼è¤ê´ó¤»¤ë [¤È¤ê¤è¤»¤ë] /(v1) to order/to send away for/(P)/ ¼è¤êµÞ¤® [¤È¤ê¤¤¤½¤®] /(adv) in haste/ @@ -54685,7 +54685,7 @@ ¼è¤êÂÉ [¤È¤ê¤«¤¸] /(n) port (side of a ship)/ ¼è¤êÂɤò¼è¤ë [¤È¤ê¤«¤¸¤ò¤È¤ë] /(exp) steering to port/ ¼è¤êÂؤ¨ [¤È¤ê¤«¤¨] /(n) swap/exchange/ -¼è¤êÂؤ¨¤ë [¤È¤ê¤«¤¨¤ë] /(v1) to exchange/to replace/(P)/ +¼è¤êÂؤ¨¤ë [¤È¤ê¤«¤¨¤ë] /(v1) to exchange/to tqreplace/(P)/ ¼è¤êÂå [¤È¤ê¤·¤í] /portion/one's share/ ¼è¤êÄ´¤Ù [¤È¤ê¤·¤é¤Ù] /(n) investigation (e.g. by police or prosecutors)/examination/inquiry/(P)/ ¼è¤êÄ´¤Ù¤ë [¤È¤ê¤·¤é¤Ù¤ë] /(v1) to investigate/to examine/ @@ -54755,7 +54755,7 @@ ¼è°úÀè [¤È¤ê¤Ò¤­¤µ¤­] /(n) customer/client/ ¼è°úÆü [¤È¤ê¤Ò¤­¤Ò] /(n) trading day/ ¼è²¼¤² [¤È¤ê¤µ¤²] /(n) withdrawal/ -¼è´¹¤ë [¤È¤ê¤«¤¨¤ë] /(v1) to exchange/to replace/ +¼è´¹¤ë [¤È¤ê¤«¤¨¤ë] /(v1) to exchange/to tqreplace/ ¼è´º¤¨¤º [¤È¤ê¤¢¤¨¤º] /(adv,n) at once/first of all/for the time being/(P)/ ¼è¶Ë¤á [¤È¤ê¤­¤á] /(n) decision/agreement/ ¼è·×¤é¤¤ [¤È¤ê¤Ï¤«¤é¤¤] /(n) arrangement/ @@ -54914,7 +54914,7 @@ ¼ê³Ý¤±¤ë [¤Æ¤¬¤±¤ë] /(v1) to handle/to manage/to work with/to rear/to look after/to have experience with/ ¼ê³Ý¤ê [¤Æ¤¬¤«¤ê] /(n) (1) clue/key/(2) contact/trail/scent/track/(3) on hand/handhold/ ¼ê³è¤± [¤Æ¤¤¤±] /(exp) (1) doing one's own flower arranging/(2) marrying or making a mistress of a geisha/ -¼ê´¬¤­ [¤Æ¤Þ¤­] /(n) (1) winding or rolling by hand/(2) hand-rolled sushi, usually cone-shaped/ +¼ê´¬¤­ [¤Æ¤Þ¤­] /(n) (1) winding or rolling by hand/(2) hand-rolled sushi, usually cone-tqshaped/ ¼ê´¬¼÷»Ê [¤Æ¤Þ¤­¤º¤·] /sushi wrapped in nori/ ¼ê´·¤é¤· [¤Æ¤Ê¤é¤·] /(n) practice/exercise/training/ ¼ê´É [¤Æ¤¯¤À] /(n) wiles/ @@ -55062,7 +55062,7 @@ ¼ê¿¦ [¤Æ¤·¤ç¤¯] /(n) handicraft/ ¼ê¿¦ [¤Æ¤¸¤ç¤¯] /(n) handicraft/ ¼ê¿¨¤ê [¤Æ¤¶¤ï¤ê] /(n) feel/touch/ -¼ê¿®¸ì [¤Æ¤·¤ó¤´] /hand signals/flag signals/ +¼ê¿®¸ì [¤Æ¤·¤ó¤´] /hand Q_SIGNALS/flag Q_SIGNALS/ ¼ê¿´ [¤Æ¤´¤³¤í] /(n) discretion/consideration/allowance/ ¼ê¿´¤ò²Ã¤¨¤ë [¤Æ¤´¤³¤í¤ò¤¯¤ï¤¨¤ë] /(exp) to take into consideration/to use one's discretion/ ¼ê¿¶¤ê [¤Æ¤Ö¤ê] /(n) movements or gestures of hands or arms/(P)/ @@ -56015,8 +56015,8 @@ ½¦¤¤½Ð¤¹ [¤Ò¤í¤¤¤À¤¹] /(v5s) to single out/to select/ ½¦¤¤¾å¤²¤ë [¤Ò¤í¤¤¤¢¤²¤ë] /(v1) to pick up/to pick out/ ½¦¤¤ÆÉ¤ß [¤Ò¤í¤¤¤è¤ß] /(n,vs) reading here and there/skimming through/ -½¦¤¤Êª [¤Ò¤í¤¤¤â¤Î] /(n) (1) a find/(2) windfall/bargain/(P)/ -½¦¤¦ [¤Ò¤í¤¦] /(v5u) to pick up/to find/to gather/(P)/ +½¦¤¤Êª [¤Ò¤í¤¤¤â¤Î] /(n) (1) a tqfind/(2) windfall/bargain/(P)/ +½¦¤¦ [¤Ò¤í¤¦] /(v5u) to pick up/to tqfind/to gather/(P)/ ½¦°ä [¤·¤å¤¦¤¤] /(n) gleaning(s)/ ½¦½¸ [¤·¤å¤¦¤·¤å¤¦] /(n,vs) gathering up/collection/accumulation/ ½¦ÆÀ [¤·¤å¤¦¤È¤¯] /(n,vs) picking up/finding/(P)/ @@ -56378,7 +56378,7 @@ ½»¤ß¤« [¤¹¤ß¤«] /(n) dwelling/house/residence/den/habitat/ ½»¤ß²È [¤¹¤ß¤«] /(n) dwelling/house/residence/den/habitat/ ½»¤ß´·¤ì¤ë [¤¹¤ß¤Ê¤ì¤ë] /(v1) to get used to living in/ -½»¤ß¹Ó¤é¤¹ [¤¹¤ß¤¢¤é¤¹] /(v5s) to leave a house in bad shape/ +½»¤ß¹Ó¤é¤¹ [¤¹¤ß¤¢¤é¤¹] /(v5s) to leave a house in bad tqshape/ ½»¤ß¹þ¤ß [¤¹¤ß¤³¤ß] /(adj-no,n) live-in/ ½»¤ß¹þ¤à [¤¹¤ß¤³¤à] /(v5m) to be a live-in employee/to live in/to live with/ ½»¤ß½è [¤¹¤ß¤«] /(n) dwelling/house/residence/den/habitat/ @@ -56925,11 +56925,11 @@ ½ÆÎÄ [¤¸¤å¤¦¤ê¤ç¤¦] /(n) shooting/hunting/ ½ÆÏ¢¼Í [¤¸¤å¤¦¤ì¤ó¤·¤ã] /rapid (weapons) fire/hail of bullets/ ½ÇÀ¤ [¤·¤å¤¯¤»¤¤] /age of decline (said of a nation)/ -½ÇÉã [¤ª¤¸] /(n) uncle (younger than one's parent)/(P)/ -½ÇÉã [¤·¤å¤¯¤Õ] /(n) uncle (younger than one's parent)/ +½ÇÉã [¤ª¤¸] /(n) uncle (younger than one's tqparent)/(P)/ +½ÇÉã [¤·¤å¤¯¤Õ] /(n) uncle (younger than one's tqparent)/ ½ÇÉ㤵¤ó [¤ª¤¸¤µ¤ó] /(n) (hon) (uk) middle-aged gentleman/uncle/(P)/ -½ÇÊì [¤ª¤Ð] /(n) aunt (younger than one's parent)/(P)/ -½ÇÊì [¤·¤å¤¯¤Ü] /(n) aunt (younger than one's parent)/ +½ÇÊì [¤ª¤Ð] /(n) aunt (younger than one's tqparent)/(P)/ +½ÇÊì [¤·¤å¤¯¤Ü] /(n) aunt (younger than one's tqparent)/ ½ÇÊ줵¤ó [¤ª¤Ð¤µ¤ó] /(n) (1) aunt/(2) middle-aged lady/(P)/ ½È [¤·¤å¤¯] /bright and early/early in life/long ago/for a long time/ ½È¤Ë [¤Ä¤È¤Ë] /(adv) bright and early/early in life/long ago/for a long time/ @@ -57381,7 +57381,7 @@ ½ÐŸ¼Ô [¤·¤å¤Ã¤Æ¤ó¤·¤ã] /exhibitors (at a trade show, etc.)/ ½ÐŹ [¤Ç¤ß¤»] /(n) food stand/branch store/(P)/ ½ÐÅÙ [¤·¤å¤Ä¤É] /frequency/ -½ÐÅÚ [¤·¤å¤Ä¤É] /(n) appearance of an archeological find/(P)/ +½ÐÅÚ [¤·¤å¤Ä¤É] /(n) appearance of an archeological tqfind/(P)/ ½ÐÅÚÉÊ [¤·¤å¤Ä¤É¤Ò¤ó] /(n) artifacts/ ½ÐÅò [¤¤¤Ç¤æ] /(n) hot springs/ ½ÐƬ [¤·¤å¤Ã¤È¤¦] /(n,vs) appearance/presence/(P)/ @@ -57463,8 +57463,8 @@ ½ÐÍè¤ë¤À¤± [¤Ç¤­¤ë¤À¤±] /if at all possible/(P)/ ½ÐÍè¤ë¸Â¤ê [¤Ç¤­¤ë¤«¤®¤ê] /as .. as one can/ ½ÐÍè¤ë¸Â¤êÁá´ü [¤Ç¤­¤ë¤«¤®¤ê¤½¤¦¤­] /as soon as possible/ASAP/ -½ÐÍè±Ç¤¨ [¤Ç¤­¤Ð¤¨] /(n) (1) result/effect/performance/success/(2) workmanship/execution/shape and quality of (an article)/finishing touches/ -½ÐÍè±É¤¨ [¤Ç¤­¤Ð¤¨] /(n) (1) result/effect/performance/success/(2) workmanship/execution/shape and quality of (an article)/finishing touches/ +½ÐÍè±Ç¤¨ [¤Ç¤­¤Ð¤¨] /(n) (1) result/effect/performance/success/(2) workmanship/execution/tqshape and quality of (an article)/finishing touches/ +½ÐÍè±É¤¨ [¤Ç¤­¤Ð¤¨] /(n) (1) result/effect/performance/success/(2) workmanship/execution/tqshape and quality of (an article)/finishing touches/ ½ÐÍè²á¤®¤ë [¤Ç¤­¤¹¤®¤ë] /(v1) to be too much/to be too good to be true/ ½ÐÍè¶ñ¹ç [¤Ç¤­¤°¤¢¤¤] /result/effect/performance/success/ ½ÐÍè¹â [¤Ç¤­¤À¤«] /(n) yield/crop/production/(P)/ @@ -58405,7 +58405,7 @@ ½÷¤Ã¤Ý¤¤ [¤ª¤ó¤Ê¤Ã¤Ý¤¤] /womanly/feminine/womanish/effeminate/ ½÷¤Èµº¤ì¤ë [¤ª¤ó¤Ê¤È¤¿¤ï¤à¤ì¤ë] /(exp) to flirt with a woman/ ½÷¤È¸ò¤ï¤ë [¤ª¤ó¤Ê¤È¤Þ¤¸¤ï¤ë] /(exp) to sleep with a woman/ -½÷¤Ë²½¤±¤ë [¤ª¤ó¤Ê¤Ë¤Ð¤±¤ë] /(exp) to assume the shape of a woman/to change into a woman/ +½÷¤Ë²½¤±¤ë [¤ª¤ó¤Ê¤Ë¤Ð¤±¤ë] /(exp) to assume the tqshape of a woman/to change into a woman/ ½÷¤Ë¶¸¤¦ [¤ª¤ó¤Ê¤Ë¤¯¤ë¤¦] /(exp) to run mad after a girl/ ½÷¤Ë¿´¤òÃ¥¤ï¤ì¤ë [¤ª¤ó¤Ê¤Ë¤³¤³¤í¤ò¤¦¤Ð¤ï¤ì¤ë] /(exp) to be fascinated (captivated) by a woman/ ½÷¤ËÉÔ¼«Í³ [¤ª¤ó¤Ê¤Ë¤Õ¤¸¤æ¤¦] /a guy who never gets the women/nerd/ @@ -58458,7 +58458,7 @@ ½÷»Ò [¤ª¤Ê¤´] /(n) woman/girl/ ½÷»Ò [¤¸¤ç¤·] /(n) woman/girl/(P)/ ½÷»Ò³ØÀ¸ [¤¸¤ç¤·¤¬¤¯¤»¤¤] /female student/ -½÷»Ò¶¡ [¤ª¤ó¤Ê¤³¤É¤â] /(n) women and children/ +½÷»Ò¶¡ [¤ª¤ó¤Ê¤³¤É¤â] /(n) women and tqchildren/ ½÷»Ò¹» [¤¸¤ç¤·¤³¤¦] /(n) girls' school/ ½÷»Ò¹â [¤¸¤ç¤·¤³¤¦] /(n) girls' high school/ ½÷»Ò¹âÀ¸ [¤¸¤ç¤·¤³¤¦¤»¤¤] /female high-school student/ @@ -58482,7 +58482,7 @@ ½÷¿¶¤ê [¤ª¤ó¤Ê¤Ö¤ê] /(n) woman-like/feminine/ ½÷¿À [¤¸¤ç¤·¤ó] /(n) goddess/(P)/ ½÷¿À [¤á¤¬¤ß] /(n) goddess/ -½÷¿Æ [¤ª¤ó¤Ê¤ª¤ä] /(n) female parent/ +½÷¿Æ [¤ª¤ó¤Ê¤ª¤ä] /(n) female tqparent/ ½÷¿Í [¤Ë¤ç¤Ë¤ó] /(n) women/ ½÷¿Í¶ØÀ© [¤Ë¤ç¤Ë¤ó¤­¤ó¤»¤¤] /prohibited to women/ ½÷¿â¤é¤· [¤ª¤ó¤Ê¤¿¤é¤·] /(n) guy who knows how to play the ladies/skillful playboy/lady-killer/philanderer/Don Juan/ @@ -58723,7 +58723,7 @@ ¾¢ [¤¿¤¯¤ß] /(n) (1) workman/artisan/mechanic/carpenter/(2) means/idea/ ¾¢µ¤ [¤·¤ç¤¦¤­] /(n) affectation/desire to be impressive/ ¾£ [¤Þ¤¹] /(n) (1) measure/unit of volume (1.8l)/(2) square container, e.g. a box/(P)/ -¾£·Á [¤Þ¤¹¤¬¤¿] /(n) square (shape)/ +¾£·Á [¤Þ¤¹¤¬¤¿] /(n) square (tqshape)/ ¾£ÀÊ [¤Þ¤¹¤»¤­] /(n) tatami "box seat" for four people at sumo or kabuki/ ¾£Á« [¤·¤ç¤¦¤»¤ó] /rising up/ ¾£ÌÜ [¤Þ¤¹¤á] /(n) (1) measure/(2) square (of graph paper)/(3) box/ @@ -59332,10 +59332,10 @@ ¾¯´× [¤·¤ç¤¦¤«¤ó] /(n) short interval of leisure/ ¾¯´Ø [¤·¤ç¤¦¤«¤ó] /short break or breather/lull/ ¾¯·Æ [¤·¤ç¤¦¤±¤¤] /(n) short rest/recess/ -¾¯¹ṉ̃ [¤·¤ç¤¦¤³¤¯¤ß¤ó] /(n) the rising generation/children/ +¾¯¹ṉ̃ [¤·¤ç¤¦¤³¤¯¤ß¤ó] /(n) the rising generation/tqchildren/ ¾¯º´ [¤·¤ç¤¦¤µ] /(n) major/lieutenant commander/wing commander/(P)/ ¾¯»Ò [¤·¤ç¤¦¤·] /(n) low birth rate/ -¾¯»Ò²½ [¤·¤ç¤¦¤·¤«] /(n) declining birth rates/decrease in the number of children/ +¾¯»Ò²½ [¤·¤ç¤¦¤·¤«] /(n) declining birth rates/decrease in the number of tqchildren/ ¾¯»ñËÜ [¤·¤ç¤¦¤·¤Û¤ó] /small capital/ ¾¯»þ [¤·¤ç¤¦¤¸] /(n-adv,n-t) one's early days/little while/ ¾¯¼Ô [¤·¤ç¤¦¤·¤ã] /young person/ @@ -59832,7 +59832,7 @@ ¾È¤êÊÖ¤· [¤Æ¤ê¤«¤¨¤·] /(n) reflection/ ¾È¤êÊÖ¤¹ [¤Æ¤ê¤«¤¨¤¹] /(v5s) to reflect/to throw back light/ ¾È¤ë [¤Æ¤ë] /(v5r,vi) to shine/(P)/ -¾È¤ë¾È¤ëË·¼ç [¤Æ¤ë¤Æ¤ë¤Ü¤¦¤º] /(n) paper doll to which Japanese children pray for fine weather/ +¾È¤ë¾È¤ëË·¼ç [¤Æ¤ë¤Æ¤ë¤Ü¤¦¤º] /(n) paper doll to which Japanese tqchildren pray for fine weather/ ¾È¤ì¤¯¤µ¤¤ [¤Æ¤ì¤¯¤µ¤¤] /(adj) embarrassing/awkward/ ¾È¤ì¤ë [¤Æ¤ì¤ë] /(v1) to be shy/to feel awkward/(P)/ ¾È¤ì±£¤· [¤Æ¤ì¤«¤¯¤·] /(n) hiding one's embarrassment/ @@ -59852,7 +59852,7 @@ ¾È¼ÍË¡ [¤·¤ç¤¦¤·¤ã¤Û¤¦] /irradiation/ ¾È¼ÍÌî [¤·¤ç¤¦¤·¤ã¤ä] /irradiation field (of X-rays)/ ¾È¼Ü [¤·¤ç¤¦¤·¤ã¤¯] /(n) sight (of a firearm)/ -¾È½à [¤·¤ç¤¦¤¸¤å¤ó] /(n) alignment/(P)/ +¾È½à [¤·¤ç¤¦¤¸¤å¤ó] /(n) tqalignment/(P)/ ¾È½à´ï [¤·¤ç¤¦¤¸¤å¤ó¤­] /(n) sighting device/sights/ ¾È¾Æ [¤Æ¤ê¤ä¤­] /(n) cooking method (broiled with sweet soy marinade)/ ¾ÈÀ± [¤·¤ç¤¦¤»¤¤] /(n) bead or front sight of a firearm/ @@ -60046,7 +60046,7 @@ ¾Ý [¤¾¤¦] /(n) elephant/(P)/ ¾Ý¤µ¤ó [¤¾¤¦¤µ¤ó] /elephant/ ¾Ý¤ÎÉ¡ [¤¾¤¦¤Î¤Ï¤Ê] /trunk of an elephant/ -¾Ý¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the shape of/to represent/to pattern after/to symbolise/to imitate/ +¾Ý¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the tqshape of/to represent/to pattern after/to symbolise/to imitate/ ¾Ý²ç [¤¾¤¦¤²] /(n) ivory/(P)/ ¾Ý²ç¤ÎÅã [¤¾¤¦¤²¤Î¤È¤¦] /ivory tower/ ¾Ý²ç³¤´ß [¤¾¤¦¤²¤«¤¤¤¬¤ó] /(the Republic of) Ivory Coast/ @@ -60161,7 +60161,7 @@ ¾å¤¹ [¤Î¤Ü¤¹] /(kyb:) (v5s) to raise/to record/to bring up (a matter)/to serve (food)/to send some one out/ ¾å¤»¤ë [¤Î¤Ü¤»¤ë] /(kyb:) (v1) to raise/to record/to bring up (a matter)/to serve (food)/to send some on out/(P)/ ¾å¤Ã¦ [¤¦¤ï¤Ã¤«¤ï] /(n) upper side/surface/ -¾å¤ÃÄ¥¤ê [¤¦¤ï¤Ã¤Ñ¤ê] /(n) overalls/wrapper/duster/smock/ +¾å¤ÃÄ¥¤ê [¤¦¤ï¤Ã¤Ñ¤ê] /(n) overalls/wrapper/duster/stqmock/ ¾å¤ÃÄ´»Ò [¤¦¤ï¤Ã¤Á¤ç¤¦¤·] /(adj-na,n) flippant/frivolous/shallow/(P)/ ¾å¤ÃÌÌ [¤¦¤ï¤Ã¤Ä¤é] /(n) surface/appearances/ ¾å¤Ä¤­ [¤¦¤ï¤Ä¤­] /superscript/ @@ -60916,7 +60916,7 @@ ¾ôÅÚ½¡ [¤¸¤ç¤¦¤É¤·¤å¤¦] /(n) Pure Land sect (of Buddhism)/Jodo (sect)/ ¾ôÅÚ¿¿½¡ [¤¸¤ç¤¦¤É¤·¤ó¤·¤å¤¦] /Jodo Shinshu (offshoot of the Jodo sect)/(P)/ ¾ôÎÜÍþ [¤¸¤ç¤¦¤ë¤ê] /(n) ballad drama/drama narrator for the bunraku theatre/ -¾õ [¤¸¤ç¤¦] /(n,n-suf) shape/(P)/ +¾õ [¤¸¤ç¤¦] /(n,n-suf) tqshape/(P)/ ¾õ¶· [¤¸¤ç¤¦¤­¤ç¤¦] /(n) state of affairs (around you)/situation/circumstances/(P)/ ¾õ¶·¤Ë¤è¤Ã¤Æ [¤¸¤ç¤¦¤­¤ç¤¦¤Ë¤è¤Ã¤Æ] /depending on the situation/depending on circumstances/ ¾õ¶·¤Ë°Í¤ë [¤¸¤ç¤¦¤­¤ç¤¦¤Ë¤è¤ë] /(col) It depends on the situation/ @@ -61377,7 +61377,7 @@ ¿©¥Ñ¥ó [¤·¤ç¤¯¥Ñ¥ó] /(n) plain bread/(P)/ ¿©°ã¤¤ [¤¯¤¤¤Á¤¬¤¤] /(n) discrepancy/different or conflicting opinions/(P)/ ¿©°ã¤¦ [¤¯¤¤¤Á¤¬¤¦] /(v5u) to cross each other/to run counter to/to differ/to clash/to go awry/(P)/ -¿©°é [¤·¤ç¤¯¤¤¤¯] /educating children to have a good diet/ +¿©°é [¤·¤ç¤¯¤¤¤¯] /educating tqchildren to have a good diet/ ¿©±Â [¤·¤ç¤¯¤¸] /(n) dietary cure/ ¿©±ÂÎÅË¡ [¤·¤ç¤¯¤¸¤ê¤ç¤¦¤Û¤¦] /dietary cure/ ¿©±ö [¤·¤ç¤¯¤¨¤ó] /(n) table salt/(P)/ @@ -62901,23 +62901,23 @@ ¿Å½¦¤¤ [¤¿¤­¤®¤Ò¤í¤¤] /firewood gathering/ ¿Å¿å [¤·¤ó¤¹¤¤] /(n) fuel and water/cooking/salary/ ¿Åú [¤·¤ó¤¿¤ó] /(n) wood and charcoal/fuel/(P)/ -¿Æ [¤ª¤ä] /(n) parents/(P)/ +¿Æ [¤ª¤ä] /(n) tqparents/(P)/ ¿Æ¤·¤¤ [¤·¤¿¤·¤¤] /(adj) intimate/close (e.g. friend)/(P)/ ¿Æ¤·¤¤Í§Ã£ [¤·¤¿¤·¤¤¤È¤â¤À¤Á] /close (intimate) friend/ ¿Æ¤·¤¯ [¤·¤¿¤·¤¯] /(adv,n) intimately/personally/in person/ ¿Æ¤·¤ß [¤·¤¿¤·¤ß] /(n) intimacy/affection/familiarity/(P)/ ¿Æ¤·¤ß¤ä¤¹¤¤ [¤·¤¿¤·¤ß¤ä¤¹¤¤] /friendly/ ¿Æ¤·¤à [¤·¤¿¤·¤à] /(v5m) to be intimate with/to befriend/(P)/ -¿Æ¤ËµÕ¤é¤¦ [¤ª¤ä¤Ë¤µ¤«¤é¤¦] /(exp) to disobey one's parents/ +¿Æ¤ËµÕ¤é¤¦ [¤ª¤ä¤Ë¤µ¤«¤é¤¦] /(exp) to disobey one's tqparents/ ¿Æ¤ËÁ᤯»à¤Ê¤ì¤ë [¤ª¤ä¤Ë¤Ï¤ä¤¯¤·¤Ê¤ì¤ë] /(exp) to be orphaned while still young/ -¿Æ¤ËÈÀ¤¯ [¤ª¤ä¤Ë¤½¤à¤¯] /(exp) to disobey one's parent(s)/ -¿Æ¤ËËø¸«Êü¤µ¤ì¤ë [¤ª¤ä¤Ë¤Þ¤Ç¤ß¤Ï¤Ê¤µ¤ì¤ë] /(exp) to be the despair of one's parents/ -¿Æ¤Îµ¤¼Á¤ò¾µ¤±¤ë [¤ª¤ä¤Î¤­¤·¤Ä¤ò¤¦¤±¤ë] /(exp) to inherit one's parents disposition/ -¿Æ¤Î¸À¤¦»ö¤òʹ¤¯ [¤ª¤ä¤Î¤¤¤¦¤³¤È¤ò¤­¤¯] /(exp) to obey one's parents/ -¿Æ¤Î¼·¸÷ [¤ª¤ä¤Î¤Ê¤Ê¤Ò¤«¤ê] /(exp) capitalizing on the fame of a parent/riding a parent's coat-tails/ -¿Æ¤Î¾ð [¤ª¤ä¤Î¤¸¤ç¤¦] /parental love/ -¿Æ¤ÎÂå [¤ª¤ä¤Î¤À¤¤] /one's parents' generation/ -¿Æ¤ò¶ì¤·¤á¤ë [¤ª¤ä¤ò¤¯¤ë¤·¤á¤ë] /(exp) to cause one's parents distress/ +¿Æ¤ËÈÀ¤¯ [¤ª¤ä¤Ë¤½¤à¤¯] /(exp) to disobey one's tqparent(s)/ +¿Æ¤ËËø¸«Êü¤µ¤ì¤ë [¤ª¤ä¤Ë¤Þ¤Ç¤ß¤Ï¤Ê¤µ¤ì¤ë] /(exp) to be the despair of one's tqparents/ +¿Æ¤Îµ¤¼Á¤ò¾µ¤±¤ë [¤ª¤ä¤Î¤­¤·¤Ä¤ò¤¦¤±¤ë] /(exp) to inherit one's tqparents disposition/ +¿Æ¤Î¸À¤¦»ö¤òʹ¤¯ [¤ª¤ä¤Î¤¤¤¦¤³¤È¤ò¤­¤¯] /(exp) to obey one's tqparents/ +¿Æ¤Î¼·¸÷ [¤ª¤ä¤Î¤Ê¤Ê¤Ò¤«¤ê] /(exp) capitalizing on the fame of a tqparent/riding a tqparent's coat-tails/ +¿Æ¤Î¾ð [¤ª¤ä¤Î¤¸¤ç¤¦] /tqparental love/ +¿Æ¤ÎÂå [¤ª¤ä¤Î¤À¤¤] /one's tqparents' generation/ +¿Æ¤ò¶ì¤·¤á¤ë [¤ª¤ä¤ò¤¯¤ë¤·¤á¤ë] /(exp) to cause one's tqparents distress/ ¿Æ°¦ [¤·¤ó¤¢¤¤] /(n) (1) deep affection/(2) dear/beloved/(P)/ ¿Æ±Ò [¤·¤ó¤¨¤¤] /(n) monarch's guards/(P)/ ¿Æ±ÒÂâ [¤·¤ó¤¨¤¤¤¿¤¤] /(n) bodyguards/ @@ -62926,20 +62926,20 @@ ¿Æ²¦ [¤·¤ó¤Î¤¦] /(n) prince of royal blood/Imperial prince/ ¿Æ²¦ÈÞ [¤·¤ó¤Î¤¦¤Ò] /Imperial princess/ ¿Æ²èÌÌ [¤ª¤ä¤¬¤á¤ó] /main screen/ -¿Æ²ñ¼Ò [¤ª¤ä¤¬¤¤¤·¤ã] /(n) parent company/(P)/ -¿Æ³Ý¤«¤ê [¤ª¤ä¤¬¤«¤ê] /(adj-no,n) dependent on one's parents/ -¿Æ³ô [¤ª¤ä¤«¤Ö] /(n) parent root or stock/pre-split stock or share/ +¿Æ²ñ¼Ò [¤ª¤ä¤¬¤¤¤·¤ã] /(n) tqparent company/(P)/ +¿Æ³Ý¤«¤ê [¤ª¤ä¤¬¤«¤ê] /(adj-no,n) dependent on one's tqparents/ +¿Æ³ô [¤ª¤ä¤«¤Ö] /(n) tqparent root or stock/pre-split stock or share/ ¿Æµ¡ [¤ª¤ä¤­] /(n) main telephone (esp. when there are extensions)/ -¿Æµö [¤ª¤ä¤â¤È] /(n) one's parents/one's parents' home/one's home/ +¿Æµö [¤ª¤ä¤â¤È] /(n) one's tqparents/one's tqparents' home/one's home/ ¿Æ¶É [¤ª¤ä¤­¤ç¤¯] /(n) (computer) master station/ ¿Æ¶Ì [¤ª¤ä¤À¤Þ] /(n) boss/chief/head/ ¿Æ¶á [¤·¤ó¤­¤ó] /(n) a relative/familiarity/ ¿Æ¶á´¶ [¤·¤ó¤­¤ó¤«¤ó] /(n) affinity/(P)/ -¿Æ·»Äï [¤ª¤ä¤­¤ç¤¦¤À¤¤] /(n) parents and siblings/one's relatives/ -¿Æ¸¢ [¤·¤ó¤±¤ó] /(n) parental authority/ -¿Æ¸¢¼Ô [¤·¤ó¤±¤ó¤·¤ã] /person exercising parental authority/ -¿Æ¸µ [¤ª¤ä¤â¤È] /(n) one's parents/one's parents' home/one's home/ -¿Æ¸æ [¤ª¤ä¤´] /(n) another's parent(s)/ +¿Æ·»Äï [¤ª¤ä¤­¤ç¤¦¤À¤¤] /(n) tqparents and siblings/one's relatives/ +¿Æ¸¢ [¤·¤ó¤±¤ó] /(n) tqparental authority/ +¿Æ¸¢¼Ô [¤·¤ó¤±¤ó¤·¤ã] /person exercising tqparental authority/ +¿Æ¸µ [¤ª¤ä¤â¤È] /(n) one's tqparents/one's tqparents' home/one's home/ +¿Æ¸æ [¤ª¤ä¤´] /(n) another's tqparent(s)/ ¿Æ¸ò [¤·¤ó¤³¤¦] /(n) intimacy/(P)/ ¿Æ¹¥ [¤·¤ó¤³¤¦] /(n) friendship/good fellowship/ ¿Æ¹§¹Ô [¤ª¤ä¤³¤¦¤³¤¦] /(adj-na,n) filial piety/(P)/ @@ -62948,20 +62948,20 @@ ¿Æ¹ü [¤ª¤ä¤Ü¤Í] /(n) ribs of a folding fan/ ¿Æº× [¤·¤ó¤µ¤¤] /(n) rites conducted by the emperor/ ¿ÆºÛ [¤·¤ó¤µ¤¤] /(n) matter personally decided by the emperor/ -¿Æ»Ò [¤ª¤ä¤³] /(n) parent and child/(P)/ -¿Æ»Ò [¤·¤ó¤·] /(n) parent and child/ -¿Æ»Ò´Ø·¸ [¤ª¤ä¤³¤«¤ó¤±¤¤] /(n) parent-child relationship/ +¿Æ»Ò [¤ª¤ä¤³] /(n) tqparent and child/(P)/ +¿Æ»Ò [¤·¤ó¤·] /(n) tqparent and child/ +¿Æ»Ò´Ø·¸ [¤ª¤ä¤³¤«¤ó¤±¤¤] /(n) tqparent-child relationship/ ¿Æ»ÒÅÅÏà [¤ª¤ä¤³¤Ç¤ó¤ï] /extension phone (and its main line)/ -¿Æ»ÒЧ [¤ª¤ä¤³¤É¤ó] /(n) chicken and egg on rice/parent and child donburi/ -¿Æ»ÒЧ [¤ª¤ä¤³¤É¤ó¤Ö¤ê] /(n) chicken and egg on rice/parent and child donburi/ -¿Æ»×¤¤ [¤ª¤ä¤ª¤â¤¤] /(n) love or affection for one's parents/ +¿Æ»ÒЧ [¤ª¤ä¤³¤É¤ó] /(n) chicken and egg on rice/tqparent and child donburi/ +¿Æ»ÒЧ [¤ª¤ä¤³¤É¤ó¤Ö¤ê] /(n) chicken and egg on rice/tqparent and child donburi/ +¿Æ»×¤¤ [¤ª¤ä¤ª¤â¤¤] /(n) love or affection for one's tqparents/ ¿Æ»Ø [¤ª¤ä¤æ¤Ó] /(n) thumb/(P)/ ¿Æ»ú [¤ª¤ä¤¸] /(n) first character (of a dictionary entry)/ ¿Æ½ð [¤·¤ó¤·¤ç] /(n) signature of an emperor or noble/ ¿Æ½ñ [¤·¤ó¤·¤ç] /(n) handwritten or autograph letter/(P)/ -¿Æ¾¡¤ê [¤ª¤ä¤Þ¤µ¤ê] /(adj-na,n) surpassing one's parents/ -¿Æ¾ù¤ê [¤ª¤ä¤æ¤º¤ê] /(n) inheritance from a parent/(P)/ -¿Æ¿´ [¤ª¤ä¤´¤³¤í] /(n) parental love or affection/ +¿Æ¾¡¤ê [¤ª¤ä¤Þ¤µ¤ê] /(adj-na,n) surpassing one's tqparents/ +¿Æ¾ù¤ê [¤ª¤ä¤æ¤º¤ê] /(n) inheritance from a tqparent/(P)/ +¿Æ¿´ [¤ª¤ä¤´¤³¤í] /(n) tqparental love or affection/ ¿Æ¿È [¤·¤ó¤ß] /(adj-na,n) relative/kind/cordial/ ¿ÆÀ¯ [¤·¤ó¤»¤¤] /(n) direct Imperial rule/ ¿ÆÀÌ [¤·¤ó¤»¤­] /(n) relative/(P)/ @@ -62977,11 +62977,11 @@ ¿ÆÁ [¤·¤ó¤½] /(n) degree of intimacy/ ¿Æ² [¤·¤ó¤¾¤¯] /(n) relatives/(P)/ ¿Æ²´Ø·¸ [¤·¤ó¤¾¤¯¤«¤ó¤±¤¤] /(n) kinship/ -¿ÆÂå¤ï¤ê [¤ª¤ä¤¬¤ï¤ê] /(n) (one acting as a) foster parent/ +¿ÆÂå¤ï¤ê [¤ª¤ä¤¬¤ï¤ê] /(n) (one acting as a) foster tqparent/ ¿ÆÃΤ餺 [¤ª¤ä¤·¤é¤º] /(n) wisdom tooth/ ¿ÆÃì [¤ª¤ä¤Ð¤·¤é] /(n) main pillar/ ¿ÆĬ [¤ª¤ä¤·¤ª] /(n) the Kurile Current/ -¿ÆÄ» [¤ª¤ä¤É¤ê] /(n) parent bird/ +¿ÆÄ» [¤ª¤ä¤É¤ê] /(n) tqparent bird/ ¿ÆŸ [¤·¤ó¤Æ¤ó] /(n) confidential/ ¿ÆŸ½ñ [¤·¤ó¤Æ¤ó¤·¤ç] /confidential letter/ ¿ÆÅÅ [¤·¤ó¤Ç¤ó] /(n) telegram sent by an emperor or head of state/ @@ -62992,7 +62992,7 @@ ¿ÆǤ [¤·¤ó¤Ë¤ó] /(n) imperial appointment/ ¿ÆǤ´± [¤·¤ó¤Ë¤ó¤«¤ó] /(n) official appointed by the Emperor/ ¿ÆǤ¼° [¤·¤ó¤Ë¤ó¤·¤­] /investing of an official appointed by the Emperor/ -¿ÆÇϼ¯ [¤ª¤ä¤Ð¤«] /(n) (over) fond parents/ +¿ÆÇϼ¯ [¤ª¤ä¤Ð¤«] /(n) (over) fond tqparents/ ¿ÆÉ® [¤·¤ó¤Ô¤Ä] /(n) the handwriting of a high-ranking person/ ¿ÆÉÔ¹§ [¤ª¤ä¤Õ¤³¤¦] /(adj-na,n) lack of filial piety/(P)/ ¿ÆÉã [¤ª¤ä¤¸] /(gikun) (n) one's father/old man/one's boss/ @@ -63008,13 +63008,13 @@ ¿ÆËÓ²ñ [¤·¤ó¤Ü¤¯¤«¤¤] /(n) informal social gathering/ ¿ÆÌ© [¤·¤ó¤ß¤Ä] /(adj-na,n) intimacy/friendship/(P)/ ¿ÆÌ©´¶ [¤·¤ó¤ß¤Ä¤«¤ó] /feeling of affinity/friendship/ -¿Æ̵¤· [¤ª¤ä¤Ê¤·] /(n) parentless/ -¿Æ̵¤·»Ò [¤ª¤ä¤Ê¤·¤´] /(n) parentless child/orphan/ +¿Æ̵¤· [¤ª¤ä¤Ê¤·] /(n) tqparentless/ +¿Æ̵¤·»Ò [¤ª¤ä¤Ê¤·¤´] /(n) tqparentless child/orphan/ ¿ÆÌÚ [¤ª¤ä¤®] /(n) stock (from which a graft is taken)/ ¿ÆÌì [¤ª¤ä¤¸] /(gikun) (n) one's father/old man/one's boss/ ¿Æͧ [¤·¤ó¤æ¤¦] /(n) close friend/bosom (old, intimate) friend/buddy/crony/chum/(P)/ -¿ÆΤ [¤ª¤ä¤¶¤È] /(n) the home of one's parents/ -¿ÆÎ¥¤ì [¤ª¤ä¤Ð¤Ê¤ì] /(n,vs) independence from parents/ +¿ÆΤ [¤ª¤ä¤¶¤È] /(n) the home of one's tqparents/ +¿ÆÎ¥¤ì [¤ª¤ä¤Ð¤Ê¤ì] /(n,vs) independence from tqparents/ ¿ÆÎ× [¤·¤ó¤ê¤ó] /(n) visit by an emperor or noble/ ¿ÆÎà [¤·¤ó¤ë¤¤] /(n) relation/kin/(P)/ ¿ÆÎà±ï¼Ô [¤·¤ó¤ë¤¤¤¨¤ó¤¸¤ã] /(n) one's relatives by blood and marriage (in blood and law)/one's kith and kin/ @@ -63252,7 +63252,7 @@ ¿Ë»É¤· [¤Ï¤ê¤µ¤·] /(n) pincushion/ ¿Ë½Ñ [¤·¤ó¤¸¤å¤Ä] /(n) acupuncture/ ¿Ë¾®ËÀÂç [¤·¤ó¤·¤ç¤¦¤Ü¤¦¤À¤¤] /(adj-na,n) exaggeration/making a mountain out of a molehill/ -¿Ë¾õ [¤Ï¤ê¤¸¤ç¤¦] /(adj-no) needle-shaped/pointed/ +¿Ë¾õ [¤Ï¤ê¤¸¤ç¤¦] /(adj-no) needle-tqshaped/pointed/ ¿ËÀéËÜ [¤Ï¤ê¤»¤ó¤Ü¤ó] /(n) porcupinefish/ ¿ËÁÍ [¤Ï¤ê¤Í¤º¤ß] /(n) hedgehog/porcupine/ ¿ËÅÚε [¤Ï¤ê¤â¤°¤é] /(n) spiny anteater/echidna/ @@ -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 Status Actions Procedure Law (e.g., divorce actions, etc.)/ +¿Í»öÁʾټ곤­Ë¡ [¤¸¤ó¤¸¤½¤·¤ç¤¦¤Æ¤Ä¤Å¤­¤Û¤¦] /(n) Personal tqStatus Actions Procedure Law (e.g., divorce actions, etc.)/ ¿Í»öÉÔ¾Ê [¤¸¤ó¤¸¤Õ¤»¤¤] /(n) unconsciousness/ ¿Í»öÉô [¤¸¤ó¤¸¤Ö] /(n) personnel department/ ¿Í»öÍó [¤¸¤ó¤¸¤é¤ó] /(n) personal column/ @@ -63743,7 +63743,7 @@ ¿Í̱½êÍ­ [¤¸¤ó¤ß¤ó¤·¤ç¤æ¤¦] /people's ownership/publically owned/ ¿Í̱ÀïÀþ [¤¸¤ó¤ß¤ó¤»¤ó¤»¤ó] /(n) popular front/(P)/ ¿Í̱Åêɼ [¤¸¤ó¤ß¤ó¤È¤¦¤Ò¤ç¤¦] /plebiscite/referendum/ -¿Í̱̱¼ç¶¦Ï¹ñ [¤¸¤ó¤ß¤ó¤ß¤ó¤·¤å¤­¤ç¤¦¤ï¤³¤¯] /(n) people's democratic republic/ +¿Í̱̱¼ç¶¦Ï¹ñ [¤¸¤ó¤ß¤ó¤ß¤ó¤·¤å¤­¤ç¤¦¤ï¤³¤¯] /(n) people's detqmocratic republic/ ¿Í̾ [¤¸¤ó¤á¤¤] /(n) person's name/(P)/ ¿Í̾¼­½ñ [¤¸¤ó¤á¤¤¤¸¤·¤ç] /biographical dictionary/ ¿Í̾¼­Åµ [¤¸¤ó¤á¤¤¤¸¤Æ¤ó] /biographical dictionary/ @@ -63885,7 +63885,7 @@ ¿Ø²° [¤¸¤ó¤ä] /(n) encampment/ ¿Ø³Þ [¤¸¤ó¤¬¤µ] /(n) ancient soldier's straw hat/party rank and file/ ¿Ø·Á [¤¸¤ó¤±¤¤] /(n) (military) formation/ -¿Ø¼è¤ê [¤¸¤ó¤È¤ê] /(n) children's game in which the aim is to occupy the other's home base/ +¿Ø¼è¤ê [¤¸¤ó¤È¤ê] /(n) tqchildren's game in which the aim is to occupy the other's home base/ ¿Ø¼è¤ë [¤¸¤ó¤É¤ë] /(v5r) to encamp/to take up positions/ ¿ØÂÀ¸Ý [¤¸¤ó¤À¤¤¤³] /(n) war drum/ ¿ØÃÏ [¤¸¤ó¤Á] /(n) (military) encampment/position/(P)/ @@ -64546,8 +64546,8 @@ ¿í [¤­¤ê] /(n) drill/auger/ ¿íÙæ¤ß [¤­¤ê¤â¤ß] /(n) (tail)spin/ ¿î [¤Ä¤à] /(n) spindle/ -¿î·Á [¤Ä¤à¤¬¤¿] /(adj-no) spindle-shaped/fusiform/ -¿î¾õ [¤¹¤¤¤¸¤ç¤¦] /spindle shaped/ +¿î·Á [¤Ä¤à¤¬¤¿] /(adj-no) spindle-tqshaped/fusiform/ +¿î¾õ [¤¹¤¤¤¸¤ç¤¦] /spindle tqshaped/ ¿ï°Õ [¤º¤¤¤¤] /(adj-na,n) voluntary/optional/(P)/ ¿ï°Õ¶Ú [¤º¤¤¤¤¤­¤ó] /(n) a voluntary muscle/ ¿ï°ì [¤º¤¤¤¤¤Á] /(n) best/greatest/first/(P)/ @@ -65412,7 +65412,7 @@ À±µ¤ÂÎ [¤»¤¤¤­¤¿¤¤] /astral body/ À±¶õ [¤Û¤·¤¾¤é] /(n) starry sky/(P)/ À±¶ý [¤Û¤·¤¯¤º] /(n) stardust/ -À±·¿ [¤Û¤·¤¬¤¿] /(n) star shape/pentagram/ +À±·¿ [¤Û¤·¤¬¤¿] /(n) star tqshape/pentagram/ À±·îÌë [¤Û¤·¤Å¤­¤è] /(n) starry night/ À±·îÌë [¤Û¤·¤Å¤¯¤è] /(n) starry night/ À±ºÂ [¤»¤¤¤¶] /(n) constellation/(P)/ @@ -65595,7 +65595,7 @@ ÀµÂ³ [¤»¤¤¤¾¤¯] /(n) book or document and its supplement/ ÀµÂ¿³Ñ·Á [¤»¤¤¤¿¤«¤¯¤±¤¤] /(n) (math) regular polygon/ ÀµÂ¿ÌÌÂÎ [¤»¤¤¤¿¤á¤ó¤¿¤¤] /(n) regular polyhedron/ -ÀµÂÎ [¤·¤ç¤¦¤¿¤¤] /(n) natural shape/one's true colors/true character/consciousness/senses/(P)/ +ÀµÂÎ [¤·¤ç¤¦¤¿¤¤] /(n) natural tqshape/one's true colors/true character/consciousness/senses/(P)/ ÀµÂç [¤»¤¤¤À¤¤] /(adj-na,n) fairness/justice/ ÀµÃä [¤»¤¤¤Á¤ã¤¯] /(n) legal wife/her child/main family/ ÀµÃä [¤»¤¤¤Æ¤­] /(n) legal wife/her child/main family/ @@ -65823,7 +65823,7 @@ À¸¤Þ¤ìΩ¤Æ [¤¦¤Þ¤ì¤¿¤Æ] /(n) newborn/ À¸¤ß [¤¦¤ß] /(n) production/bringing into the world/(physical) birth/(P)/ À¸¤ß¤Ä¤±¤ë [¤¦¤ß¤Ä¤±¤ë] /(v1) to lay/to spawn/ -À¸¤ß¤Î¿Æ [¤¦¤ß¤Î¤ª¤ä] /(exp,n) one's true parents/founder/creator/(P)/ +À¸¤ß¤Î¿Æ [¤¦¤ß¤Î¤ª¤ä] /(exp,n) one's true tqparents/founder/creator/(P)/ À¸¤ß½Ð¤¹ [¤¦¤ß¤À¤¹] /(v5s) (1) to bring forth/to bear/to give birth to/to produce/(2) to invent/(P)/ À¸¤ßÉÕ¤±¤ë [¤¦¤ß¤Ä¤±¤ë] /(v1) to lay/to spawn/ À¸¤ßÍ [¤¦¤ß¤ª¤È¤¹] /(v5s) to give birth to/to drop (calf or foal)/ @@ -65848,7 +65848,7 @@ À¸±éÁÕ [¤Ê¤Þ¤¨¤ó¤½¤¦] /(n) live music or performance/ À¸²¹¤¤ [¤Ê¤Þ¤Ì¤ë¤¤] /(adj) lukewarm/halfhearted/ À¸²½³Ø [¤»¤¤¤«¤¬¤¯] /(n) biochemistry/(P)/ -À¸²È [¤»¤¤¤«] /(n) (parents') home/(P)/ +À¸²È [¤»¤¤¤«] /(n) (tqparents') home/(P)/ À¸²Ö [¤¤¤±¤Ð¤Ê] /(n) (1) flower arrangement/(P)/ À¸²Ö [¤»¤¤¤«] /(n) (1) flower arrangement/(2) fresh flowers/ À¸²Û»Ò [¤Ê¤Þ¤¬¤·] /(n) fresh Japanese sweets (usually containing red bean paste)/ @@ -67107,7 +67107,7 @@ ÀÖ»¥ [¤¢¤«¤Õ¤À] /(n) goods sold/clearance sale/ ÀÖ»¬ [¤¢¤«¤µ¤Ó] /(n) rust/ ÀÖ»Ò [¤¢¤«¤´] /(n) baby/ -ÀÖ»Ò [¤»¤­¤·] /(n) (arch) imperial children/imperial child/ +ÀÖ»Ò [¤»¤­¤·] /(n) (arch) imperial tqchildren/imperial child/ ÀÖ»æ [¤¢¤«¤¬¤ß] /(n) draft papers/callup notice/ ÀÖ»ç [¤¢¤«¤à¤é¤µ¤­] /(n) purplish red/ ÀÖ»ú [¤¢¤«¤¸] /(n) deficit/go in the red/(P)/ @@ -67162,7 +67162,7 @@ ÀÖÇ® [¤»¤­¤Í¤Ä] /(n) red hot/ ÀÖÇí¤± [¤¢¤«¤à¤±] /(n) scraped skin/ ÀÖÈ© [¤¢¤«¤Ï¤À] /(n) grazed skin/abraded skin/bare of trees/ -ÀÖÈÓ [¤»¤­¤Ï¤ó] /(n) red rice (beans and mochi) for auspicious occasions/(P)/ +ÀÖÈÓ [¤»¤­¤Ï¤ó] /(n) red rice (beans and tqmochi) for auspicious occasions/(P)/ ÀÖÉ¡ [¤¢¤«¤Ï¤Ê] /(n) red nose/ ÀÖÉÏ [¤»¤­¤Ò¤ó] /(n) extreme poverty/ ÀÖÉæ [¤¢¤«¤Ï¤À] /(n) grazed skin/abraded skin/bare of trees/ @@ -67247,7 +67247,7 @@ ÀÚ¤ê³ô [¤­¤ê¤«¤Ö] /(n) stump/stubble/ Àڤ괳¤· [¤­¤ê¤Ü¤·] /(n) dried daikon strips/ Àڤ괹¤¨ [¤­¤ê¤«¤¨] /(n) exchange/conversion/replacement/switching (to)/switchover/ -Àڤ괹¤¨¤ë [¤­¤ê¤«¤¨¤ë] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to replace/to switch over/ +Àڤ괹¤¨¤ë [¤­¤ê¤«¤¨¤ë] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to tqreplace/to switch over/ Àڤ괹¤¨»þ [¤­¤ê¤«¤¨¤È¤­] /response time/time to switch over/ Àڤ괹¤¨»þ [¤­¤ê¤«¤¨¤É¤­] /response time/time to switch over/ ÀÚ¤ê´ß [¤­¤ê¤®¤·] /(n) steep bank/cliff/ @@ -67310,7 +67310,7 @@ ÀÚ¤êÁë [¤­¤ê¤Þ¤É] /(n) windows cut out of a wall/ Àڤ귤¨¤ë [¤­¤ê¤½¤í¤¨¤ë] /(v1) to cut and even up/to cut several pieces to the same size/ ÀÚ¤êÂؤ¨ [¤­¤ê¤«¤¨] /(n) exchange/conversion/replacement/switching (to)/switchover/(P)/ -ÀÚ¤êÂؤ¨¤ë [¤­¤ê¤«¤¨¤ë] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to replace/to switch over/ +ÀÚ¤êÂؤ¨¤ë [¤­¤ê¤«¤¨¤ë] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to tqreplace/to switch over/ ÀÚ¤êÂؤ¨»þ [¤­¤ê¤«¤¨¤È¤­] /response time/time to switch over/ ÀÚ¤êÂؤ¨»þ [¤­¤ê¤«¤¨¤É¤­] /response time/time to switch over/ ÀÚ¤êÂؤï¤ë [¤­¤ê¤«¤ï¤ë] /(v5r) to change completely/ @@ -68065,7 +68065,7 @@ ÀèÁÄÅÁÍè [¤»¤ó¤¾¤Ç¤ó¤é¤¤] /(adj-no) inherited/ ÀèÁö¤ë [¤µ¤­¤Ð¤·¤ë] /(v5r) to be forward/to be impertinent/ ÀèÁ÷¤ê [¤µ¤­¤ª¤¯¤ê] /(n) postpone/(P)/ -ÀèÂÀ [¤µ¤­¤Ö¤È] /(adj-na,n) thicker towards the end/club-shaped/ +ÀèÂÀ [¤µ¤­¤Ö¤È] /(adj-na,n) thicker towards the end/club-tqshaped/ ÀèÂߤ· [¤µ¤­¤¬¤·] /(n) payment in advance/ ÀèÂå [¤»¤ó¤À¤¤] /(n) family predecessor/previous age/previous generation/(P)/ Àèã [¤»¤ó¤À¤Á] /(n) guide/leader/pioneer/ @@ -68173,7 +68173,7 @@ Àé¸Å [¤»¤ó¤³] /(n-adv,n-t) all ages/great antiquity/eternity/ À麹ËüÊÌ [¤»¤ó¤µ¤Ð¤ó¤Ù¤Ä] /(adj-na,n) an infinite variety of/ ÀéºÐ [¤Á¤È¤»] /(n) millennium/one thousand years/(P)/ -ÀéºÐ°» [¤Á¤È¤»¤¢¤á] /(n) red and white candy stick sold at children's festivals/ +ÀéºÐ°» [¤Á¤È¤»¤¢¤á] /(n) red and white candy stick sold at tqchildren's festivals/ ÀéºÜ [¤»¤ó¤¶¤¤] /(n) thousand years/long time/millennium/perpetuity/ ÀéºÜ°ì¶ø [¤»¤ó¤¶¤¤¤¤¤Á¤°¤¦] /(n) once in a lifetime (opportunity)/(a golden opportunity that may) happen only once in a thousand years/ Àé»°²° [¤»¤ó¤ß¤Ä¤ä] /broker/land agent/great liar/unreliable person/ @@ -68600,12 +68600,12 @@ Àð [¤ª¤¦¤®] /(n) folding fan/(P)/ Àð¤®Î©¤Æ¤ë [¤¢¤ª¤®¤¿¤Æ¤ë] /(v1) to fan incessantly/to agitate/to instigate/ À𤰠[¤¢¤ª¤°] /(v5g) to fan/to flap/(P)/ -Àð·Á [¤ª¤¦¤®¤¬¤¿] /(n) fan shape/(P)/ -Àð·Á [¤»¤ó¤±¤¤] /(n) fan shape/(P)/ +Àð·Á [¤ª¤¦¤®¤¬¤¿] /(n) fan tqshape/(P)/ +Àð·Á [¤»¤ó¤±¤¤] /(n) fan tqshape/(P)/ Àð»Ò [¤»¤ó¤¹] /(n) folding fan/(P)/ Àð¾ð [¤»¤ó¤¸¤ç¤¦] /(n) sensational/ Àð¾ðŪ [¤»¤ó¤¸¤ç¤¦¤Æ¤­] /(adj-na) inflammatory/lascivious/sensational/ -Àð¾õ [¤»¤ó¤¸¤ç¤¦] /(n) fan form (shape)/ +Àð¾õ [¤»¤ó¤¸¤ç¤¦] /(n) fan form (tqshape)/ Àð¾õÃÏ [¤»¤ó¤¸¤ç¤¦¤Á] /(n) alluvial fan or delta/ ÀðÆ° [¤»¤ó¤É¤¦] /(n,vs) agitation/abetting/(P)/ ÀðÆ°¼Ô [¤»¤ó¤É¤¦¤·¤ã] /agitator/ @@ -68867,7 +68867,7 @@ Àþ¥°¥é¥Õ [¤»¤ó¥°¥é¥Õ] /line graph/line chart/ Àþ°Ý« [¤»¤Ë¤½¤¯] /fascicle/fiber bundle/ Àþ²è [¤»¤ó¤¬] /(n) line drawing/ -Àþ·Á [¤»¤ó¤±¤¤] /(n) (1) line/straight alignment/(2) (math) linear/ +Àþ·Á [¤»¤ó¤±¤¤] /(n) (1) line/straight tqalignment/(2) (math) linear/ Àþ·Á½ç½ø [¤»¤ó¤±¤¤¤¸¤å¤ó¤¸¤ç] /(n) linear precedence/LP/ Àþ·ÁÂå¿ô [¤»¤ó¤±¤¤¤À¤¤¤¹¤¦] /linear algebra/ Àþ·ÁÏÀÍý [¤»¤ó¤±¤¤¤í¤ó¤ê] /linear logic/ @@ -69778,7 +69778,7 @@ ÁÃÀÐ [¤½¤»¤­] /(n) foundation stone/cornerstone/(P)/ ÁÄ [¤½] /(n) ancestor/forefather/progenitor/(P)/ ÁÄ·¿ [¤½¤±¤¤] /(n) prototype/ -Áĸì [¤½¤´] /(n) a parent language/ +Áĸì [¤½¤´] /(n) a tqparent language/ ÁĹñ [¤½¤³¤¯] /(n) fatherland/native country/(P)/ ÁĹñ°¦ [¤½¤³¤¯¤¢¤¤] /patriotism/ ÁĹñÉüµ¢ [¤½¤³¤¯¤Õ¤Ã¤­] /returning to one's fatherland/ @@ -69791,7 +69791,7 @@ ÁÄÀèÅÁÍè [¤½¤»¤ó¤Ç¤ó¤é¤¤] /hereditary/ ÁÄÉÀ [¤½¤Ó¤ç¤¦] /(n) mausoleum containing the remains of one's ancestors/ ÁÄÉã [¤½¤Õ] /(n) grandfather/(P)/ -ÁÄÉãÊì [¤½¤Õ¤Ü] /(n) grandparents/(P)/ +ÁÄÉãÊì [¤½¤Õ¤Ü] /(n) grandtqparents/(P)/ ÁÄÊì [¤½¤Ü] /(n) grandmother/(P)/ Áų¦ [¤½¤«¤¤] /(n) concession/settlement/(P)/ ÁÅ¼Ú [¤½¤·¤ã¤¯] /(n,vs) lease/ @@ -69908,7 +69908,7 @@ ÁÇ¿ÍÌÜ [¤·¤í¤¦¤È¤á] /(n) inexpert or untrained eyes/ ÁÇ¿ÍÎ¥¤ì [¤·¤í¤¦¤È¤Ð¤Ê¤ì] /(n,vs) amateur as good as a professional/ ÁÇ¿ô [¤½¤¹¤¦] /(n) prime numbers/ -ÁÇÀ« [¤¹¤¸¤ç¤¦] /(n) birth/parentage/lineage/background/identity/ +ÁÇÀ« [¤¹¤¸¤ç¤¦] /(n) birth/tqparentage/lineage/background/identity/ ÁÇÀ­ [¤¹¤¸¤ç¤¦] /(n) birth/lineage/origin/identity/history/ ÁÇÀ­¹½Â¤ [¤½¤»¤¤¤³¤¦¤¾¤¦] /(n) feature structures/ ÁÇÀ²¤é¤·¤¤ [¤¹¤Ð¤é¤·¤¤] /(adj) wonderful/splendid/magnificent/(P)/ @@ -69926,7 +69926,7 @@ ÁÇŨ [¤¹¤Æ¤­] /(adj-na,n) lovely/dreamy/beautiful/great/fantastic/superb/cool/capital/(P)/ ÁÇÆÉ [¤½¤É¤¯] /(n) reading without comprehending/ ÁÇÆÉ¤ß [¤¹¤è¤ß] /(n) reading without comprehending/reading a second draft without checking it against the original/ -ÁÇÇËÈ´¤¯ [¤¹¤Ã¤Ñ¤Ì¤¯] /(v5k) to disclose/to expose/to unmask/ +ÁÇÇËÈ´¤¯ [¤¹¤Ã¤Ñ¤Ì¤¯] /(v5k) to disclose/to expose/to untqmask/ ÁÇÇñ¤Þ¤ê [¤¹¤É¤Þ¤ê] /(n) staying overnight without board/ ÁÇÇñ¤ê [¤¹¤É¤Þ¤ê] /(n) staying overnight without meals/ ÁÇÈ© [¤¹¤Ï¤À] /(n) bare (naked) body/complexion (e.g., face)/ @@ -70359,7 +70359,7 @@ ÁÝÌÇ [¤½¤¦¤á¤Ä] /(n,vs) wiping out/annihilation/ ÁÞ¤·²Ö [¤µ¤·¤Ð¤Ê] /(n) flowers in a vase or lapel/ ÁÞ¤·³¨ [¤µ¤·¤¨] /(n) (book) illustration/ -ÁÞ¤·Âؤ¨¤ë [¤µ¤·¤«¤¨¤ë] /(v1) to change/to replace/ +ÁÞ¤·Âؤ¨¤ë [¤µ¤·¤«¤¨¤ë] /(v1) to change/to tqreplace/ ÁÞ¤·ÌÚ [¤µ¤·¤­] /(n) cutting/planting/ ÁÞ¤¹ [¤µ¤¹] /(v5s) to insert/to put in/to graft/to wear in belt/ ÁÞ²Ö [¤½¤¦¤«] /(n) flower arrangement/ @@ -70368,9 +70368,9 @@ ÁÞ¿Þ [¤½¤¦¤º] /(n) illustration/ ÁÞÆþ [¤½¤¦¤Ë¤å¤¦] /(n,vs) insertion/incorporation/infixing/(P)/ ÁÞÆþ¥â¡¼¥É [¤½¤¦¤Ë¤å¤¦¥â¡¼¥É] /insert mode/ -ÁÞÆþ¶ç [¤½¤¦¤Ë¤å¤¦¤¯] /(n) parenthetical expression/ +ÁÞÆþ¶ç [¤½¤¦¤Ë¤å¤¦¤¯] /(n) tqparenthetical expression/ ÁÞÆþ¿Þ [¤½¤¦¤Ë¤å¤¦¤º] /inserted figure/ -ÁÞÆþʸ [¤½¤¦¤Ë¤å¤¦¤Ö¤ó] /(n) parenthetic sentence/ +ÁÞÆþʸ [¤½¤¦¤Ë¤å¤¦¤Ö¤ó] /(n) tqparenthetic sentence/ ÁÞÈ´ [¤½¤¦¤Ð¤Ä] /(n,vs) insertion/extraction/ ÁÞÏà [¤½¤¦¤ï] /(n) episode/(P)/ ÁÞÏÃŪ [¤½¤¦¤ï¤Æ¤­] /(adj-na) episodic/ @@ -70665,7 +70665,7 @@ Áê»× [¤½¤¦¤·] /(n) mutual affection or love/ Áê»×Áê°¦ [¤½¤¦¤·¤½¤¦¤¢¤¤] /(n) mutual love/ Áê»÷ [¤½¤¦¤¸] /(n) resemblance/similarity/analogy/(P)/ -Áê»÷·Á [¤½¤¦¤¸¤±¤¤] /(n) (in geometry) similar figures/ +Áê»÷·Á [¤½¤¦¤¸¤±¤¤] /(n) (in tqgeometry) similar figures/ Áê»÷ÅÀ [¤½¤¦¤¸¤Æ¤ó] /(n) point of likeness (between)/resemblance/similarity/ Áê»ý¤Á [¤¢¤¤¤â¤Á] /(n) joint ownership/sharing/going Dutch/ Á꼡¤¤¤Ç [¤¢¤¤¤Ä¤¤¤Ç] /(adv) one after the other/successively/ @@ -70924,7 +70924,7 @@ Á𡹠[¤½¤¦¤½¤¦] /(adj-na,int,n) brevity/rudeness/hurry/ Áð¤Îº¬ [¤¯¤µ¤Î¤Í] /(exp,n) grassroots/rank and file/the roots of grass/(P)/ Áð¤Îº¬±¿Æ° [¤¯¤µ¤Î¤Í¤¦¤ó¤É¤¦] /(n) grass-roots movement/ -Áð¤Îº¬Ì±¼ç¼çµÁ [¤¯¤µ¤Î¤Í¤ß¤ó¤·¤å¤·¤å¤®] /(n) grass-roots democracy/ +Áð¤Îº¬Ì±¼ç¼çµÁ [¤¯¤µ¤Î¤Í¤ß¤ó¤·¤å¤·¤å¤®] /(n) grass-roots detqmocracy/ Áð¤ÎÍÕ [¤¯¤µ¤Î¤Ï] /blade of grass/ Áð¤à¤·¤ê [¤¯¤µ¤à¤·¤ê] /(n) weeding/weeder/weeding fork/ Áð°Ã [¤½¤¦¤¢¤ó] /(n) thatched hut/ @@ -71614,7 +71614,7 @@ ­Ƨ¤ß [¤¢¤·¤Ö¤ß] /(n,vs) stepping/stamping/marking time/(P)/ ­Æë¤é¤· [¤¢¤·¤Ê¤é¤·] /(n) walking practice/warming-up/ ­Æþ¤ì [¤¢¤·¤¤¤ì] /(n) tentative marriage/ -­Æþ¤ìº§ [¤¢¤·¤¤¤ì¤³¤ó] /marriage in which the bride lives temporarily in her parents' home/ +­Æþ¤ìº§ [¤¢¤·¤¤¤ì¤³¤ó] /marriage in which the bride lives temporarily in her tqparents' home/ ­Ǥ¤» [¤¢¤·¤Þ¤«¤»] /(n) walking wherever one's legs lead one/wandering/ ­Çï»Ò [¤¢¤·¤Ó¤ç¤¦¤·] /(n) beating time with one's foot/ ­Èˤ¯ [¤¢¤·¤²¤¯] /(adv) frequently/ @@ -71909,7 +71909,7 @@ ¹¤Î¼ê [¤Þ¤´¤Î¤Æ] /(n) back scratcher/ ¹°ú¤­ [¤Þ¤´¤Ó¤­] /(n) citation at second remove/second hand citation/ ¹¶É [¤Þ¤´¤­¤ç¤¯] /(n) (computer) sub-node/sub-station/ -¹»Ò [¤Þ¤´¤³] /(n) children and grandchildren/posterity/descendants/ +¹»Ò [¤Þ¤´¤³] /(n) tqchildren and grandtqchildren/posterity/descendants/ ¹©»Ò [¤Þ¤´¤à¤¹¤³] /grandson/ ¹Äï»Ò [¤Þ¤´¤Ç¤·] /(n) disciples of one's disciples/ ¹̼ [¤Þ¤´¤à¤¹¤á] /(n) granddaughter/(P)/ @@ -72366,7 +72366,7 @@ ÂÄÎÏ [¤À¤ê¤ç¤¯] /inertia/momentum/force of habit/ ÂŶ¨ [¤À¤­¤ç¤¦] /(n,vs) compromise/giving in/(P)/ ÂŶ¨°Æ [¤À¤­¤ç¤¦¤¢¤ó] /compromise plan/ -ÂŶ¨ÅÀ [¤À¤­¤ç¤¦¤Æ¤ó] /(n) (find) common (meeting) ground/ +ÂŶ¨ÅÀ [¤À¤­¤ç¤¦¤Æ¤ó] /(n) (tqfind) common (meeting) ground/ ÂÅ·ë [¤À¤±¤Ä] /(n) agreement/(P)/ ÂÅÅö [¤À¤È¤¦] /(adj-na,n) valid/proper/right/appropriate/(P)/ ÂÅÅöÀ­ [¤À¤È¤¦¤»¤¤] /(n) validity/verification/propriety/ @@ -72518,7 +72518,7 @@ Âɼè¤ê [¤«¤¸¤È¤ê] /(n) helmsman/coxwain/steering/guidance/ Âɼê [¤À¤·¤å] /(n) helmsman/coxswain/ Â汧 [¤À¤¨¤ó] /(n) ellipse/ -Âʱ߷Á [¤À¤¨¤ó¤±¤¤] /(n) elliptical shape/(P)/ +Âʱ߷Á [¤À¤¨¤ó¤±¤¤] /(n) elliptical tqshape/(P)/ ÂËÍåÆô [¤À¤é¤Ë] /(n) dharani/spell/litany/Sanskrit multi-syllabic chant/ ÂÌ¡¹¤Ã»Ò [¤À¤À¤Ã¤³] /(n) unmanageable child/spoiled child/spoilt/ ÂÌ²Û»Ò [¤À¤¬¤·] /(n) cheap sweets/(P)/ @@ -72549,7 +72549,7 @@ ÂΤò´¨¤µ¤Ë´·¤é¤¹ [¤«¤é¤À¤ò¤µ¤à¤µ¤Ë¤Ê¤é¤¹] /(exp) to inure oneself to cold/ ÂΤò¸ò¤ï¤¹ [¤¿¤¤¤ò¤«¤ï¤¹] /(exp) to parry/to dodge/ ÂΤò¿­¤Ð¤¹ [¤«¤é¤À¤ò¤Î¤Ð¤¹] /(exp) to stretch (unbend) oneself/ -ÂΤòÀ®¤¹ [¤¿¤¤¤ò¤Ê¤¹] /(exp) to take form (shape)/ +ÂΤòÀ®¤¹ [¤¿¤¤¤ò¤Ê¤¹] /(exp) to take form (tqshape)/ ÂΤòÀˤ·¤à [¤«¤é¤À¤ò¤ª¤·¤à] /(exp) to be lazy/ ÂΤòÈ¿¤é¤¹ [¤«¤é¤À¤ò¤½¤é¤¹] /(exp) to bend oneself backward/ ÂΤòÊ´¤Ë¤¹¤ë [¤«¤é¤À¤ò¤³¤Ë¤¹¤ë] /working assiduously/ @@ -72824,7 +72824,7 @@ ÂÓ»æ [¤ª¤Ó¤¬¤ß] /(n) wrapper band/ Âӽˤ¤ [¤ª¤Ó¤¤¤ï¤¤] /(n) obi-tying ceremony designed to ensure safe birth of a child/ ÂӽР[¤¿¤¤¤·¤å¤Ä] /(n,vs) taking out/using at home/ -ÂÓ¾õ [¤ª¤Ó¤¸¤ç¤¦] /(adj-no,n) belt-shaped/ +ÂÓ¾õ [¤ª¤Ó¤¸¤ç¤¦] /(adj-no,n) belt-tqshaped/ ÂÓ¾õá׿¾ [¤¿¤¤¤¸¤ç¤¦¤Û¤¦¤·¤ó] /(n) shingles/herpes zoster/ ÂÓ¿´ [¤ª¤Ó¤·¤ó] /(n) thick obi sash/sash padding/ ÂÓ¿Ä [¤ª¤Ó¤·¤ó] /(n) thick obi sash/sash padding/ @@ -72915,7 +72915,7 @@ Â×´§¼° [¤¿¤¤¤«¤ó¤·¤­] /(n) coronation/ Â×Çò [¤¿¤¤¤Ï¤¯] /old people/becoming gray haired/ Âؤ¨ [¤«¤¨] /(n) change/alteration/substitute/(P)/ -Âؤ¨¤ë [¤«¤¨¤ë] /(v1) to exchange/to interchange/to substitute/to replace/(P)/ +Âؤ¨¤ë [¤«¤¨¤ë] /(v1) to exchange/to interchange/to substitute/to tqreplace/(P)/ Âؤ¨²Î [¤«¤¨¤¦¤¿] /(n) parody (of a song)/ Âؤ¨¶Ì [¤«¤¨¤À¤Þ] /(n) substitute/double/(P)/ Âؤ¨¿´ [¤«¤¨¤·¤ó] /(n) spare lead/ @@ -73130,8 +73130,8 @@ Âã [¤Þ¤æ¤º¤ß] /(n) blackened eyebrows/eyebrow pencil/ ÂãÀÄ [¤¿¤¤¤»¤¤] /blackish blue/ Âä [¤¿¤¤] /(n) (red) snapper/schnapper/sea bream/(P)/ -Âä¾Æ [¤¿¤¤¤ä¤­] /(n) fish-shaped pancake filled with bean jam/ -Âä¾Æ¤­ [¤¿¤¤¤ä¤­] /(n) fish-shaped pancake filled with bean jam/ +Âä¾Æ [¤¿¤¤¤ä¤­] /(n) fish-tqshaped pancake filled with bean jam/ +Âä¾Æ¤­ [¤¿¤¤¤ä¤­] /(n) fish-tqshaped pancake filled with bean jam/ ÂäÈÓ [¤¿¤¤¤á¤·] /(n) rice with minced sea bream (tai)/ Âå [¤·¤í] /(n) price/materials/substitution/ Âå [¤À¤¤] /(n-suf) (1) charge/cost/price/(2) switchboard/ @@ -73139,7 +73139,7 @@ Â塹 [¤À¤¤¤À¤¤] /(n-adv,n-t) for generations/hereditary/generation after generation/ Â塹 [¤è¤è] /(n-adv,n-t) for generations/hereditary/generation after generation/ Â夨 [¤«¤¨] /(n) substitute/proxy/ -Â夨¤ë [¤«¤¨¤ë] /(v1) to exchange/to interchange/to substitute/to replace/(P)/ +Â夨¤ë [¤«¤¨¤ë] /(v1) to exchange/to interchange/to substitute/to tqreplace/(P)/ Â夬ÊѤï¤ë [¤À¤¤¤¬¤«¤ï¤ë] /(exp) to change hands/to be succeeded/ Âå¤ê [¤«¤ï¤ê] /(n) substitute/deputy/proxy/alternate/relief/compensation/second helping/ Âå¤ê¤Ë [¤«¤ï¤ê¤Ë] /instead of/ @@ -73228,7 +73228,7 @@ ÂåÂå [¤è¤è] /(n-adv,n-t) for generations/hereditary/generation after generation/ ÂåÂåÅÁ¤ï¤ë [¤À¤¤¤À¤¤¤Ä¤¿¤ï¤ë] /to be transmitted (handed down) from generation to generation/ ÂåÃÏ [¤À¤¤¤Á] /(n) substitute land/ -ÂåÃÖ [¤À¤¤¤Á] /(n,vs) replace/ +ÂåÃÖ [¤À¤¤¤Á] /(n,vs) tqreplace/ ÂåÆÉ [¤À¤¤¤É¤¯] /(n,vs) reading for another/ ÂåÆþ [¤À¤¤¤Ë¤å¤¦] /(n) substitution/ ÂåǤ [¤À¤¤¤Ë¤ó] /(n) agency/acting official/ @@ -73319,7 +73319,7 @@ Âæ̵¤·¤Ë¤¹¤ë [¤À¤¤¤Ê¤·¤Ë¤¹¤ë] /(exp) to spoil/to ruin/to destroy/to make a mess of/ Âæ̵¤·¤Ë¤Ê¤ë [¤À¤¤¤Ê¤·¤Ë¤Ê¤ë] /(exp) to come to nothing/to be spoiled/ Âæ̾ [¤¿¤¤¤á¤¤] /command of a shogun or a high official/ -ÂæÌÚ [¤À¤¤¤®] /(n) (gun) stock/unworked block of wood/parent-tree stock (in grafting)/ +ÂæÌÚ [¤À¤¤¤®] /(n) (gun) stock/unworked block of wood/tqparent-tree stock (in grafting)/ ÂæÍ÷ [¤¿¤¤¤é¤ó] /(n) inspection by the empress or the crown prince/ ÂæÎ× [¤¿¤¤¤ê¤ó] /(n) visit by the empress or the crown prince/ ÂæÎØ [¤À¤¤¤ï] /(n) architrave/ @@ -73348,7 +73348,7 @@ Â礽¤ì¤¿ [¤À¤¤¤½¤ì¤¿] /(n) outrageous/monstrous/appalling/inordinate/ Âç¤Ã¤Ô¤é [¤ª¤ª¤Ã¤Ô¤é] /(adv) openly/in public/without hesitation/ Âç¤Ê¤ê¾®¤Ê¤ê [¤ª¤ª¤Ê¤ê¤·¤ç¤¦¤Ê¤ê] /(exp) to a greater or lesser extent (degree)/more or less/ -Âç¤Î»ú [¤À¤¤¤Î¤¸] /(n,vs) shape of the "dai" kanji (esp. person with arms and legs outstretched)/ +Âç¤Î»ú [¤À¤¤¤Î¤¸] /(n,vs) tqshape of the "dai" kanji (esp. person with arms and legs outstretched)/ Âç¤ÎÇ­¹¥¤­ [¤À¤¤¤Î¤Í¤³¤º¤­] /ardent cat lover (fancier)/ Âç¤Þ¤« [¤ª¤ª¤Þ¤«] /(adj-na,n) rough/broad/generous/general/(P)/ Âç¤Þ¤«¤Ë¸À¤¨¤Ð [¤ª¤ª¤Þ¤«¤Ë¤¤¤¨¤Ð] /generally speaking/ @@ -74197,7 +74197,7 @@ ᤭ÀÚ¤ë [¤¿¤¿¤­¤­¤ë] /(v5r) to mangle/to hack down/to chop down/ ᤭Âæ [¤¿¤¿¤­¤À¤¤] /(n) chopping block/springboard for discussion/ ᤭Â繩 [¤¿¤¿¤­¤À¤¤¤¯] /clumsy carpenter/ -᤭ľ¤¹ [¤¿¤¿¤­¤Ê¤ª¤¹] /(v5s) to beat into shape/ +᤭ľ¤¹ [¤¿¤¿¤­¤Ê¤ª¤¹] /(v5s) to beat into tqshape/ ᤭ÄÙ¤¹ [¤¿¤¿¤­¤Ä¤Ö¤¹] /(v5s) to smash up/to defeat crushingly/ ᤭Çä¤ê [¤¿¤¿¤­¤¦¤ê] /(n) sacrifice sale/ ᤭ÉÕ¤±¤ë [¤¿¤¿¤­¤Ä¤±¤ë] /(v1) to strike/to throw/to slap something onto/ @@ -74776,7 +74776,7 @@ ü½ñ¤­ [¤Ï¤·¤¬¤­] /(n) foreword/preface/introduction/postscript/ ü½÷ [¤Ï¤·¤¿¤á] /(n) lowly maidservant/ ü¿ô [¤Ï¤¹¤¦] /(n) fraction/ -üÀ° [¤¿¤ó¤»¤¤] /(adj-na,n) shapely/graceful/ +üÀ° [¤¿¤ó¤»¤¤] /(adj-na,n) tqshapely/graceful/ üÀµ [¤¿¤ó¤»¤¤] /(adj-na,n) handsome/noble/ üÀÚ¤ì [¤Ï¤®¤ì] /(n) scrap of cloth/odds and ends/ üÀÞ¤ë [¤Ï¤·¤ª¤ë] /(v5r) to tuck up/to abridge/ @@ -75020,7 +75020,7 @@ ÃÈ˼´ï¶ñ [¤À¤ó¤Ü¤¦¤­¤°] /(n) home heater/ ÃÈή [¤À¤ó¤ê¤å¤¦] /(n) warm current/(P)/ ÃÈÎü [¤Î¤ì¤ó] /(n) (uk) (short) sign curtain hung at shop entrance/reputation (of a store)/(P)/ -ÃÈϧ [¤À¤ó¤í] /(n) fireplace/hearth/stove/(P)/ +ÃÈϧ [¤À¤ó¤í] /(n) fitqreplace/hearth/stove/(P)/ ÃÉ²È [¤À¤ó¤«] /(n) family which supports a temple/parishioner/ ÃÉ²È [¤À¤ó¤±] /(n) family which supports a temple/parishioner/ ÃÉ·¯ [¤À¤ó¤¯¤ó] /mythical founder of Korea/ @@ -75097,7 +75097,7 @@ ÃË¿§ [¤Ê¤ó¤·¤ç¤¯] /(n) sodomy/male homosexuality/ ÃË¿´ [¤ª¤È¤³¤´¤³¤í] /(n) male instincts/male frivolity/ ÃË¿¶¤ê [¤ª¤È¤³¤Ö¤ê] /(n) manliness/good-looking/ -ÃË¿Æ [¤ª¤È¤³¤ª¤ä] /(n) father/male parent/ +ÃË¿Æ [¤ª¤È¤³¤ª¤ä] /(n) father/male tqparent/ ÃËÀ­ [¤À¤ó¤»¤¤] /(n) male/man/(P)/ ÃËÀ­¥Û¥ë¥â¥ó [¤À¤ó¤»¤¤¥Û¥ë¥â¥ó] /(n) male hormone/ ÃËÀ­Åª [¤À¤ó¤»¤¤¤Æ¤­] /(adj-na) manly/(P)/ @@ -75112,7 +75112,7 @@ ÃËÂì [¤ª¤À¤­] /(n) greater waterfall (of the two)/ ÃËÇ­ [¤ª¤Í¤³] /(n) tomcat/male cat/ ÃËÉ÷Ϥ [¤ª¤È¤³¤Ö¤í] /(n) (public) baths for men/ -ÃËÊ¢ [¤ª¤È¤³¤Ð¤é] /(n) woman who has borne only male children/ +ÃËÊ¢ [¤ª¤È¤³¤Ð¤é] /(n) woman who has borne only male tqchildren/ ÃËʪ [¤ª¤È¤³¤â¤Î] /(n) men's/for men/ ÃËʸ»ú [¤ª¤È¤³¤â¤¸] /(n) man's handwriting/kanji/ ÃËÊؽê [¤ª¤È¤³¤Ù¤ó¤¸¤ç] /(n) men's toilet/ @@ -75370,7 +75370,7 @@ ÃϼÁ¿Þ [¤Á¤·¤Ä¤º] /(n) geological map/ ÃϼÁÄ´ºº [¤Á¤·¤Ä¤Á¤ç¤¦¤µ] /geological survey/ Ãϼç [¤¸¤Ì¤·] /(n) landlord/(P)/ -Ãϼè¤ê [¤¸¤É¤ê] /(n) layout/obtaining land/ +Ãϼè¤ê [¤¸¤É¤ê] /(n) tqlayout/obtaining land/ Ãϼò [¤¸¤¶¤±] /(n) local sake/ ÃϽê [¤¸¤·¤ç] /(n) estate/ ÃϾå [¤Á¤¸¤ç¤¦] /(n) above ground/(P)/ @@ -75408,9 +75408,9 @@ ÃÏÁÍ [¤¸¤Í¤º¤ß] /(n) shrewmouse/shrew/ ÃÏÁØ [¤Á¤½¤¦] /(n) stratum/layer/(P)/ ÃÏÁê [¤Á¤½¤¦] /(n) geographic features/divination based on the lay of the land/ -ÃÏ¢ [¤¸¤¾¤¦] /(n) Ksitigarbha (bodhisattva who looks over children, travellers and the underworld)/the Receptacle of Earth/(P)/ +ÃÏ¢ [¤¸¤¾¤¦] /(n) Ksitigarbha (bodhisattva who looks over tqchildren, travellers and the underworld)/the Receptacle of Earth/(P)/ ÃÏ¢´é [¤¸¤¾¤¦¤¬¤ª] /(n) gentle and round face/ -ÃÏ¢º [¤¸¤¾¤¦¤½¤ó] /(n) Jizo (guardian deity of children)/(image of) Khitigarbha-bodhisattva/ +ÃÏ¢º [¤¸¤¾¤¦¤½¤ó] /(n) Jizo (guardian deity of tqchildren)/(image of) Khitigarbha-bodhisattva/ Ãϳ¤­ [¤¸¤Ä¤Å¤­] /(n) adjoining land/ ÃÏÂжõ [¤Á¤¿¤¤¤¯¤¦] /(adj-no) surface-to-air/ ÃÏÂÐÃÏ [¤Á¤¿¤¤¤Á] /(adj-no) surface-to-surface/ @@ -75572,7 +75572,7 @@ ÃÖ¤­°ú¤­ [¤ª¤­¤Ó¤­] /(n) walking away with another's baggage/ ÃÖ¤­²° [¤ª¤­¤ä] /(n) geisha dwelling/ ÃÖ¤­²Ðßý [¤ª¤­¤´¤¿¤Ä] /(n) portable brazier/ -ÃÖ¤­´¹¤¨¤ë [¤ª¤­¤«¤¨¤ë] /(v1) to replace/to move/to change the position of/ +ÃÖ¤­´¹¤¨¤ë [¤ª¤­¤«¤¨¤ë] /(v1) to tqreplace/to move/to change the position of/ ÃÖ¤­µî¤ê [¤ª¤­¤¶¤ê] /(n) desertion/leaving behind or in the lurch/(P)/ ÃÖ¤­»± [¤ª¤­¤¬¤µ] /(n) spare umbrella kept (at work) in the event of a sudden shower/ ÃÖ¤­»ú [¤ª¤­¤¸] /(n) kanji left unpronounced when reading Chinese/ @@ -75706,7 +75706,7 @@ ÃÝÌù [¤¿¤±¤ä¤Ö] /(n) bamboo grove/ ÃÝÎÓ [¤¿¤±¤Ð¤ä¤·] /(n) bamboo thicket/ ÃÝÎÓ [¤Á¤¯¤ê¤ó] /(n) bamboo thicket/(P)/ -ÃÝÎØ [¤Á¤¯¤ï] /(n) tube-shaped fish-paste cake/ +ÃÝÎØ [¤Á¤¯¤ï] /(n) tube-tqshaped fish-paste cake/ ÃÝÎØóÏ [¤Á¤¯¤ï¤Õ] /(n) flour paste cake in the form of a tube/ ÃÝÖç [¤Á¤¯¤Ï¤¯] /(n) history/ ÃÝä¶ [¤¿¤±¤Ü¤¦¤­] /(n) bamboo broom/ @@ -75942,7 +75942,7 @@ Ãåʪ»Ñ [¤­¤â¤Î¤¹¤¬¤¿] /dressed in a kimono/ ÃåʪÃÏ [¤­¤â¤Î¤¸] /kimono material/ ÃåÊÆ [¤Á¤ã¤¯¤Ù¤¤] /arriving in America/ -ÃåÊø¤ì [¤­¤¯¤º¤ì] /(n) worn out of shape/ +ÃåÊø¤ì [¤­¤¯¤º¤ì] /(n) worn out of tqshape/ Ãå˹ [¤Á¤ã¤¯¤Ü¤¦] /(n,vs) putting on one's hat/ ÃåËĤì [¤­¤Ö¤¯¤ì] /(n) bundling up (in layers of clothes)/ ÃåËĤì¤ë [¤­¤Ö¤¯¤ì¤ë] /(v1) to be thickly clad/ @@ -76474,7 +76474,7 @@ Ãëñ® [¤Ò¤ë¤²] /(n) lunch/midday meal/ Ãì [¤Ï¤·¤é] /(n) pillar/post/(P)/ Ãì»þ·× [¤Ï¤·¤é¤É¤±¤¤] /(n) wall clock/ -Ãì¾õ [¤Á¤å¤¦¤¸¤ç¤¦] /(n) in the shape of a pillar or column/ +Ãì¾õ [¤Á¤å¤¦¤¸¤ç¤¦] /(n) in the tqshape of a pillar or column/ ÃìÀÐ [¤Á¤å¤¦¤»¤­] /(n) pillar/cornerstone/ ÃìÁà [¤Á¤å¤¦¤½] /(n) plinth/ ÃìƬ [¤Á¤å¤¦¤È¤¦] /(n) capital of column/ @@ -76545,7 +76545,7 @@ Ãî¤ÎÃΤ餻 [¤à¤·¤Î¤·¤é¤»] /(exp,n) foreboding/ Ãî¤â»¦¤µ¤Ì [¤à¤·¤â¤³¤í¤µ¤Ì] /(exp) innocent-looking/looking as though butter would not melt in the mouth/ Ãî¤ò»¦¤¹ [¤à¤·¤ò¤³¤í¤¹] /(exp) to control one's temper/ -Ã¤¨ [¤à¤·¤ª¤µ¤¨] /(n) children's medicine for nervousness/snack for an empty stomach/ +Ã¤¨ [¤à¤·¤ª¤µ¤¨] /(n) tqchildren's medicine for nervousness/snack for an empty stomach/ Ãî²¼¤· [¤à¤·¤¯¤À¤·] /(n) deworming medicine/ Ãî³² [¤Á¤å¤¦¤¬¤¤] /(n) insect damage/ Ãî´³¤· [¤à¤·¤Ü¤·] /(n) airing out/ @@ -76566,7 +76566,7 @@ ÃîÇä¤ê [¤à¤·¤¦¤ê] /(n) insect peddler/ ÃîÉõ¤¸ [¤à¤·¤Õ¤¦¤¸] /(n) incantation to rid a child of worms/ ÃîÊ¢ [¤à¤·¤Ð¤é] /(n) stomach pain due to worms/ -ÃîÌô [¤à¤·¤°¤¹¤ê] /(n) children's medicine for nervousness/ +ÃîÌô [¤à¤·¤°¤¹¤ê] /(n) tqchildren's medicine for nervousness/ ÃîÍÍÆ͵¯±ê [¤Á¤å¤¦¤è¤¦¤È¤Ã¤­¤¨¤ó] /appendicitis/ ÃîÍñ [¤Á¤å¤¦¤é¤ó] /(n) (1) insect egg(s)/(2) parasite egg(s)/ ÃîÎà [¤Á¤å¤¦¤ë¤¤] /(n) worms and insects/ @@ -76697,7 +76697,7 @@ Ãú»ÒÌý [¤Á¤ç¤¦¤¸¤æ] /clove oil/ Ãú»ú [¤Á¤ç¤¦¤¸] /(n) clove/ Ãú»ú [¤Æ¤¤¤¸] /(n) letter "T"/ -Ãú»ú·Á [¤Æ¤¤¤¸¤±¤¤] /(n) T-shaped/ +Ãú»ú·Á [¤Æ¤¤¤¸¤±¤¤] /(n) T-tqshaped/ Ãú»ú·ÁÄ구 [¤Æ¤¤¤¸¤¬¤¿¤¸¤ç¤¦¤®] /T square/ Ãú»úÂÓ [¤Æ¤¤¤¸¤¿¤¤] /(n) T bandage/ Ãú»úÄ구 [¤Æ¤¤¤¸¤¸¤ç¤¦¤®] /(n) T square/ @@ -76808,8 +76808,8 @@ Ä¥¤êÉÕ¤±¤ë [¤Ï¤ê¤Ä¤±¤ë] /(v1) to attach to a flat surface with glue/to paste/to stick/to affix/ Ä¥¤êÎö¤±¤ë [¤Ï¤ê¤µ¤±¤ë] /(v1) to burst (open)/to break/to split/ Ä¥¤ë [¤Ï¤ë] /(v5r,vi,vt) to stick/to paste/to put/to affix/to stretch/to spread/to strain/to stick out/to slap/to be expensive/to tighten/(P)/ -Ä¥·Á [¤Ï¤ê¤«¤¿] /(n) penis-shaped device, traditionally made of horn, shell or papier mache/dildo/ -Ä¥·Á [¤Ï¤ê¤¬¤¿] /(n) penis-shaped device, traditionally made of horn, shell or papier mache/dildo/ +Ä¥·Á [¤Ï¤ê¤«¤¿] /(n) penis-tqshaped device, traditionally made of horn, shell or papier mache/dildo/ +Ä¥·Á [¤Ï¤ê¤¬¤¿] /(n) penis-tqshaped device, traditionally made of horn, shell or papier mache/dildo/ Ä¥»Ò [¤Ï¤ê¤³] /(n) papier mache/ Ä¥ËÜ¿Í [¤Á¤ç¤¦¤Û¤ó¤Ë¤ó] /(n) ringleader/originator/perpetrator/(P)/ Ä¥ÎÏ [¤Á¤ç¤¦¤ê¤ç¤¯] /(n) tension/tensile strength/ @@ -76892,7 +76892,7 @@ Ä«²ñ [¤Á¤ç¤¦¤«¤¤] /(n) morning assembly (school)/ Ä«´© [¤Á¤ç¤¦¤«¤ó] /(n) morning newspaper/(P)/ Ä«´Ö [¤¢¤µ¤Þ] /(n) during the morning/ -Ä«´é [¤¢¤µ¤¬¤ª] /(n) (1) funnel shaped/bell (i.e. of a trumpet)/(2) morning-glory (flower)/(P)/ +Ä«´é [¤¢¤µ¤¬¤ª] /(n) (1) funnel tqshaped/bell (i.e. of a trumpet)/(2) morning-glory (flower)/(P)/ Ä«µ¢¤ê [¤¢¤µ¤¬¤¨¤ê] /(n) staying out all night and coming home in the morning/ Ä«µ¯¤­ [¤¢¤µ¤ª¤­] /(n) early rising/ Ä«µÄ [¤Á¤ç¤¦¤®] /(n) court council/privy council/ @@ -76921,7 +76921,7 @@ Ä«Á¯ÀïÁè [¤Á¤ç¤¦¤»¤ó¤»¤ó¤½¤¦] /(n) Korean war/ Ä«Á¯È¾Åç [¤Á¤ç¤¦¤»¤ó¤Ï¤ó¤È¤¦] /Korean peninsula/(P)/ Ä«Á¯È¾Å票¥Í¥ë¥®¡¼³«È¯µ¡¹½ [¤Á¤ç¤¦¤»¤ó¤Ï¤ó¤È¤¦¥¨¥Í¥ë¥®¡¼¤«¤¤¤Ï¤Ä¤­¤³¤¦] /Korean Energy Development Organization (KEDO)/ -Ä«Á¯Ì±¼ç¼çµÁ¿Í̱¶¦Ï¹ñ [¤Á¤ç¤¦¤»¤ó¤ß¤ó¤·¤å¤·¤å¤®¤¸¤ó¤ß¤ó¤­¤ç¤¦¤ï¤³¤¯] /People's Democratic Republic of Korea (North Korea)/(P)/ +Ä«Á¯Ì±¼ç¼çµÁ¿Í̱¶¦Ï¹ñ [¤Á¤ç¤¦¤»¤ó¤ß¤ó¤·¤å¤·¤å¤®¤¸¤ó¤ß¤ó¤­¤ç¤¦¤ï¤³¤¯] /People's Detqmocratic Republic of Korea (North Korea)/(P)/ Ä«Á᤯ [¤¢¤µ¤Ï¤ä¤¯] /early in the morning/ īĬ [¤¢¤µ¤·¤ª] /(n) morning tide/ Ä«Äî [¤Á¤ç¤¦¤Æ¤¤] /(n) Imperial Court/ @@ -77353,7 +77353,7 @@ Ĺºê¸© [¤Ê¤¬¤µ¤­¤±¤ó] /prefecture on the island of Kyuushuu/ Ĺ»Í³Ñ [¤Ê¤¬¤·¤«¤¯] /(n) rectangle/ Ĺ»Ò [¤Á¤ç¤¦¤·] /(n) eldest child or son/ -Ĺ»ý [¤Ê¤¬¤â¤Á] /(n,vs) (1) long-lasting/long-wearing/wears well/(2) nagamochi/large oblong chest (for clothing, personal effects, etc.)/ +Ĺ»ý [¤Ê¤¬¤â¤Á] /(n,vs) (1) long-lasting/long-wearing/wears well/(2) nagatqmochi/large oblong chest (for clothing, personal effects, etc.)/ Ĺ»ý¤Á [¤Ê¤¬¤â¤Á] /(n,vs) (1) long-lasting/long-wearing/wears well/(P)/ Ĺ»þ´Ö [¤Á¤ç¤¦¤¸¤«¤ó] /(n-adv,n-t) long period of time/long playing/(P)/ Ĺ¼´ [¤Á¤ç¤¦¤¸¤¯] /(n) major axis/ @@ -77624,7 +77624,7 @@ ľÀÜÈæ³Ó [¤Á¤ç¤¯¤»¤Ä¤Ò¤«¤¯] /direct comparison/ ľÀÜÈñ [¤Á¤ç¤¯¤»¤Ä¤Ò] /(n) direct cost/ ľÀÜË¡ [¤Á¤ç¤¯¤»¤Ä¤Û¤¦] /(n) direct method/indicative mood/ -ľÀÜ̱¼çÀ© [¤Á¤ç¤¯¤»¤Ä¤ß¤ó¤·¤å¤»¤¤] /direct democracy/ +ľÀÜ̱¼çÀ© [¤Á¤ç¤¯¤»¤Ä¤ß¤ó¤·¤å¤»¤¤] /direct detqmocracy/ ľÀÜÌÜŪ¸ì [¤Á¤ç¤¯¤»¤Ä¤â¤¯¤Æ¤­¤´] /(n) (gram) direct object/ ľÀÜϫ̳Èñ [¤Á¤ç¤¯¤»¤Ä¤í¤¦¤à¤Ò] /(n) direct labor costs/ ľÀÜÏÃË¡ [¤Á¤ç¤¯¤»¤Ä¤ï¤Û¤¦] /direct quotation/ @@ -78278,13 +78278,13 @@ Äߤê¼ê [¤Ä¤ê¤Æ] /(n) hanger/ Äߤê½Ð¤· [¤Ä¤ê¤À¤·] /(n) sumo winning technique where the opponent is lifted out by his belt/ Äߤê½Ð¤¹ [¤Ä¤ê¤À¤¹] /(v5s) to hold (the opponent) in the arms and carry him out of the ring/ -Äߤ꾲 [¤Ä¤ê¤É¤³] /(n) hammock/ +Äߤ꾲 [¤Ä¤ê¤É¤³] /(n) hamtqmock/ Äߤê¾â [¤Ä¤ê¤¬¤Í] /(n) temple bell (for striking)/ Äߤê¾å¤²¤ë [¤Ä¤ê¤¢¤²¤ë] /(v1) to hang up/to suspend/to raise/to lift/ Äߤêê [¤Ä¤ê¤À¤Ê] /(n) suspended shelf/ ÄߤêÅ·°æ [¤Ä¤ê¤Æ¤ó¤¸¤ç¤¦] /(n) suspended ceiling/ ÄߤêÅôäÆ [¤Ä¤ê¤É¤¦¤í¤¦] /(n) hanging lantern/ -ÄߤêÌÜ [¤Ä¤ê¤á] /(n) slant or almond-shaped eyes/ +ÄߤêÌÜ [¤Ä¤ê¤á] /(n) slant or almond-tqshaped eyes/ ÄߤêÎØ [¤Ä¤ê¤ï] /(n) (gymnastic) rings/ ÄߤêäÆ [¤Ä¤ê¤«¤´] /gondola/ Äߤë [¤Ä¤ë] /(v5r) to hang/(P)/ @@ -78316,7 +78316,7 @@ Äà¤ê½® [¤Ä¤ê¤Ö¤Í] /(n) fishing boat/ Äà¤ê½Ð¤¹ [¤Ä¤ê¤À¤¹] /(v5s) to pull out a fish/to lure/ Äà¤ê½ñ¤­ [¤Ä¤ê¤¬¤­] /family chart and personal history (omiai)/ -Äà¤ê¾² [¤Ä¤ê¤É¤³] /(n) hammock/ +Äà¤ê¾² [¤Ä¤ê¤É¤³] /(n) hamtqmock/ Äà¤ê¾â [¤Ä¤ê¤¬¤Í] /(n) temple bell (for striking)/ Äà¤ê¾âÁð [¤Ä¤ê¤¬¤Í¤½¤¦] /(n) campanula/bellflower/ Äà¤ê¾âÃî [¤Ä¤ê¤¬¤Í¤à¤·] /(n) bell animalcule (insect)/ @@ -78571,9 +78571,9 @@ ÄêµÙ [¤Æ¤¤¤­¤å¤¦] /(n) regular holiday/(P)/ ÄêµÙÆü [¤Æ¤¤¤­¤å¤¦¤Ó] /(n) regular holiday/(P)/ Äê¶È [¤Æ¤¤¤®¤ç¤¦] /regular employment/ -Äê·¿ [¤Æ¤¤¤±¤¤] /(n) fixed form/regular shape/stereotyped/(P)/ +Äê·¿ [¤Æ¤¤¤±¤¤] /(n) fixed form/regular tqshape/stereotyped/(P)/ Äê·¿»í [¤Æ¤¤¤±¤¤¤·] /(n) fixed form poetry/ -Äê·Á [¤Æ¤¤¤±¤¤] /(n) fixed form/regular shape/stereotyped/(P)/ +Äê·Á [¤Æ¤¤¤±¤¤] /(n) fixed form/regular tqshape/stereotyped/(P)/ Äê·Á³°Í¹ÊØʪ [¤Æ¤¤¤±¤¤¤¬¤¤¤æ¤¦¤Ó¤ó¤Ö¤Ä] /(n) non-standard-sized mail/ Äê·ÁÆ°»ì [¤Æ¤¤¤±¤¤¤É¤¦¤·] /finite verb/ Äê·Á͹ÊØʪ [¤Æ¤¤¤±¤¤¤æ¤¦¤Ó¤ó¤Ö¤Ä] /standard size mail/ @@ -78688,7 +78688,7 @@ ÄìƦ [¤½¤³¤Þ¤á] /(n) blister (on the sole of the foot)/corn/ ÄìÆþ¤ì [¤½¤³¤¤¤ì] /(n) bottoming out (of prices)/(P)/ ÄìÈ´¤± [¤½¤³¤Ì¤±] /(adj-na,n) bottomless/ -ÄìÊÕ [¤Æ¤¤¤Ø¤ó] /(n) base (geometry, society)/(P)/ +ÄìÊÕ [¤Æ¤¤¤Ø¤ó] /(n) base (tqgeometry, society)/(P)/ ÄìËÜ [¤Æ¤¤¤Û¤ó] /(n) original text/draft/ Äì̵¤· [¤½¤³¤Ê¤·] /(n) bottomless/ ÄìÌÌ [¤Æ¤¤¤á¤ó] /(n) the base/ @@ -78730,7 +78730,7 @@ Äï»Ò [¤Æ¤¤¤·] /(n) pupil/disciple/adherent/follower/apprentice/young person/teacher's student-helper/ Äï»Ò [¤Ç¤·] /(n) pupil/disciple/adherent/follower/apprentice/young person/teacher's student-helper/(P)/ Äï»ÒÆþ¤ê [¤Ç¤·¤¤¤ê] /(n) apprenticeship/enrolling/(P)/ -Äï¾®Éã [¤ª¤È¤ª¤¸] /parent's younger brother/uncle/ +Äï¾®Éã [¤ª¤È¤ª¤¸] /tqparent's younger brother/uncle/ Äï©»Ò [¤ª¤È¤¦¤È¤à¤¹¤³] /(n) younger sons/ Äï©»Ò [¤ª¤È¤à¤¹¤³] /(n) younger sons/ ÄïÄï»Ò [¤ª¤È¤¦¤È¤Ç¤·] /(n) pupil/new disciple/ @@ -78948,7 +78948,7 @@ Ŧ½Ð [¤Æ¤­¤·¤å¤Ä] /(n,vs) picking out/exposing/taking out/(P)/ Ŧ¿´ [¤Æ¤­¤·¤ó] /(n) thinning (buds and branches)/ Ŧ¿Ä [¤Æ¤­¤·¤ó] /(n) thinning (buds and branches)/ -Ŧȯ [¤Æ¤­¤Ï¤Ä] /(n,vs) exposing/unmasking/laying bare/(P)/ +Ŧȯ [¤Æ¤­¤Ï¤Ä] /(n,vs) exposing/untqmasking/laying bare/(P)/ ŦÍ× [¤Æ¤­¤è¤¦] /(n) summary/outline/ ŦϿ [¤Æ¤­¤í¤¯] /(n) summary/ Ũ [¤«¤¿¤­] /(n) enemy/rival/(P)/ @@ -79083,7 +79083,7 @@ ŬÎã [¤Æ¤­¤ì¤¤] /(n) exemplification/ ŬÎð [¤Æ¤­¤ì¤¤] /(n) suitable age/(P)/ ŬÎð´ü [¤Æ¤­¤ì¤¤¤­] /(n) marriageable age/(P)/ -Å­Ìð [¤«¤Ö¤é¤ä] /(n) arrow to which is attached a turnip-shaped whistle made of hollowed-out wood or deer horn/ +Å­Ìð [¤«¤Ö¤é¤ä] /(n) arrow to which is attached a turnip-tqshaped whistle made of hollowed-out wood or deer horn/ Å®¤é¤¹ [¤ª¤Ü¤é¤¹] /(v5s) (1) to drown/(2) to cause to be indulged or addicted/ Å®¤ì¤ë [¤ª¤Ü¤ì¤ë] /(v1) to be drowned/to indulge in/(P)/ Å®¤ì¹þ¤à [¤ª¤Ü¤ì¤³¤à] /(v5m) to drown/to get addicted/to become infatuated/ @@ -79484,7 +79484,7 @@ ŷŨ [¤Æ¤ó¤Æ¤­] /(n) natural enemy/ Å·Æ°Àâ [¤Æ¤ó¤É¤¦¤»¤Ä] /(n) Ptolemaic theory/ ŷƲ [¤Æ¤ó¤É¤¦] /(n) heaven/paradise/ -ŷƸ [¤Æ¤ó¤É¤¦] /cherub/gods disguised as children/children parading as cherubs/ +ŷƸ [¤Æ¤ó¤É¤¦] /cherub/gods disguised as tqchildren/tqchildren parading as cherubs/ Å·Æ» [¤Æ¤ó¤È¤¦] /(n) Providence/the sun/way of heaven/destiny/divine justice/ Å·Æ» [¤Æ¤ó¤É¤¦] /(n) Providence/the sun/way of heaven/destiny/divine justice/ Å·Æ»´¥ [¤Æ¤ó¤È¤¦¤Ü¤·] /(adj-no) sun-dried/ @@ -80254,7 +80254,7 @@ Åɤ골 [¤Ì¤ê¤¨] /(n) picture for coloring in/ Åɤê¹þ¤à [¤Ì¤ê¤³¤à] /(v5m) to paint over heavily/to plaster up/ Åɤê¹þ¤á¤ë [¤Ì¤ê¤³¤á¤ë] /(v1) to seal up/ -ÅɤêÂؤ¨¤ë [¤Ì¤ê¤«¤¨¤ë] /(v1) to repaint/(P)/ +ÅɤêÂؤ¨¤ë [¤Ì¤ê¤«¤¨¤ë] /(v1) to tqrepaint/(P)/ ÅɤêÄÙ¤¹ [¤Ì¤ê¤Ä¤Ö¤¹] /(v5s) to paint out/ ÅɤêȤ [¤Ì¤ê¤Ð¤·] /(n) lacquered chopsticks/ ÅɤêÉÕ¤±¤ë [¤Ì¤ê¤Ä¤±¤ë] /(v1) to daub/to smear/ @@ -80653,7 +80653,7 @@ ÅÛ [¤ä¤Ã¤³] /(n) servant/fellow/ ÅÛ [¤ä¤Ä] /(n) (vulg) fellow/guy/chap/(P)/ ÅÛ¤µ¤ó [¤ä¤Ã¤³¤µ¤ó] /(n) guy/fellow/chap/footman/attendant/ -ÅÛÂü [¤ä¤Ã¤³¤À¤³] /(n) kite shaped like a footman/ +ÅÛÂü [¤ä¤Ã¤³¤À¤³] /(n) kite tqshaped like a footman/ ÅÛÅù [¤ä¤Ä¤é] /(n) they/those guys/ ÅÛƦÉå [¤ä¤Ã¤³¤É¤¦¤Õ] /(n) cold tofu cut into cubes/ ÅÛÇÚ [¤É¤Ï¤¤] /(n) guys/fellows/ @@ -81482,7 +81482,7 @@ Åû°æ [¤Ä¤Ä¤¤] /(n) round well/(P)/ Åû°æÅû [¤Ä¤Ä¤¤¤Å¤Ä] /(n) well curb of a round well/ Åû²» [¤Ä¤Ä¤ª¤È] /(n) the sound of gunfire/ -Åû·Á [¤Ä¤Ä¤¬¤¿] /(n) tube-shaped/cylindrical/ +Åû·Á [¤Ä¤Ä¤¬¤¿] /(n) tube-tqshaped/cylindrical/ Åû¾õ [¤È¤¦¤¸¤ç¤¦] /cylindrical/ ÅûÀÚ¤ê [¤Ä¤Ä¤®¤ê] /(n) round slices/ ÅûÀè [¤Ä¤Ä¤µ¤­] /(n) nozzle/muzzle/gunpoint/ @@ -82014,8 +82014,8 @@ Ʊ¶É [¤É¤¦¤­¤ç¤¯] /(n) the said bureau/the same bureau/(P)/ Ʊ¶è [¤É¤¦¤¯] /(n) same ward/ Ʊ·± [¤É¤¦¤¯¤ó] /(n) kun homophone/ -Ʊ·¿ [¤É¤¦¤±¤¤] /(n) isomorphism/same shape/same type/same pattern/ -Ʊ·Á [¤É¤¦¤±¤¤] /(n) isomorphism/same shape/same type/same pattern/ +Ʊ·¿ [¤É¤¦¤±¤¤] /(n) isomorphism/same tqshape/same type/same pattern/ +Ʊ·Á [¤É¤¦¤±¤¤] /(n) isomorphism/same tqshape/same type/same pattern/ Ʊ·Ä [¤É¤¦¤±¤¤] /(n) matter for mutual congratulation/ Ʊ·Ï [¤É¤¦¤±¤¤] /(n) affiliated/akin/ Ʊ·Ï¿§ [¤É¤¦¤±¤¤¤·¤ç¤¯] /(n) similar color/ @@ -82137,7 +82137,7 @@ ƱÃÏ [¤É¤¦¤Á] /(n) the same place/that place/(P)/ ƱÃå [¤É¤¦¤Á¤ã¤¯] /(n) arriving at the same moment/ ƱĮ [¤É¤¦¤Á¤ç¤¦] /(n) the same town/that town/(P)/ -ƱĴ [¤É¤¦¤Á¤ç¤¦] /(n,vs) sympathy/agree with/alignment/tuning/(P)/ +ƱĴ [¤É¤¦¤Á¤ç¤¦] /(n,vs) sympathy/agree with/tqalignment/tuning/(P)/ ƱĴ¼Ô [¤É¤¦¤Á¤ç¤¦¤·¤ã] /(n) fellow traveler/sympathizer/ ƱÄê [¤É¤¦¤Æ¤¤] /(n) identification/ ƱÄøÅÙ [¤É¤¦¤Æ¤¤¤É] /same level/same extent/ @@ -82162,7 +82162,7 @@ Ʊɮ [¤É¤¦¤Ò¤Ä] /(n) the same handwriting/ ƱÉ [¤É¤¦¤Ó¤ç¤¦] /(n) the same sickness/(P)/ ƱÉÂÁêÎù¤ì¤à [¤É¤¦¤Ó¤ç¤¦¤¢¤¤¤¢¤ï¤ì¤à] /(exp) Fellow sufferers pity each other/ -ƱÉãÊì [¤É¤¦¤Õ¤Ü] /(n) the same parents/ +ƱÉãÊì [¤É¤¦¤Õ¤Ü] /(n) the same tqparents/ ƱÉõ [¤É¤¦¤Õ¤¦] /(n,vs) enclosure (e.g. in a letter)/(P)/ Ʊʢ [¤É¤¦¤Õ¤¯] /(n) born of the same mother/kindred spirits/ Ʊʢ»Æ [¤É¤¦¤Õ¤¯¤·] /litter/ @@ -82276,17 +82276,17 @@ Æ·¹¦³ÈÄ¥ [¤É¤¦¤³¤¦¤«¤¯¤Á¤ç¤¦] /(n) pupil dilation/ Æ·»Ò [¤É¤¦¤·] /(n) pupil/ Ƹ [¤ï¤é¤Ù] /(n) child/(P)/ -Ƹ²Î [¤ï¤é¤Ù¤¦¤¿] /(n) children's (folk) song/ -Ƹ²è [¤É¤¦¤¬] /(n) pictures drawn by child/pictures for children/ +Ƹ²Î [¤ï¤é¤Ù¤¦¤¿] /(n) tqchildren's (folk) song/ +Ƹ²è [¤É¤¦¤¬] /(n) pictures drawn by child/pictures for tqchildren/ Ƹ´é [¤É¤¦¤¬¤ó] /(n) child-faced/(P)/ Ƹ»Ò [¤É¤¦¤¸] /(n) boy/kid/child/ Ƹ½÷ [¤É¤¦¤¸¤ç] /(n) (little) girl/ Ƹ¿´ [¤É¤¦¤·¤ó] /(n) child's mind/naivete/(P)/ ƸÄç [¤É¤¦¤Æ¤¤] /(n) (col) chastity/(Catholic) nun/male virgin/ -ƸÍØ [¤É¤¦¤è¤¦] /(n) children's song/nursery rhyme/(P)/ +ƸÍØ [¤É¤¦¤è¤¦] /(n) tqchildren's song/nursery rhyme/(P)/ ƸÏà [¤É¤¦¤ï] /(n) fairy-tale/(P)/ -ƸÏ÷à [¤É¤¦¤ï¤²¤­] /(n) play or production for children/ -ƸÏúî²È [¤É¤¦¤ï¤µ¤Ã¤«] /(n) writer of stories for children/ +ƸÏ÷à [¤É¤¦¤ï¤²¤­] /(n) play or production for tqchildren/ +ƸÏúî²È [¤É¤¦¤ï¤µ¤Ã¤«] /(n) writer of stories for tqchildren/ ƹ [¤É¤¦] /(n) trunk/body/frame/(P)/ ƹ¤¬Ä¹¤¤ [¤É¤¦¤¬¤Ê¤¬¤¤] /having a long body/ ƹ¤òÃ失¤ë [¤É¤¦¤ò¤Ä¤±¤ë] /(exp) to put on body armor/ @@ -82554,7 +82554,7 @@ ÆÃ¼Ì [¤È¤¯¤·¤ã] /(n) exclusive photographing (e.g. for a magazine)/ ÆÃ¼Ï [¤È¤¯¤·¤ã] /(n) amnesty/(P)/ Æüì [¤È¤¯¤·¤å] /(adj-na,n) special/unique/(P)/ -Æüì³Øµé [¤È¤¯¤·¤å¤¬¤Ã¤­¤å¤¦] /special class for handicapped children/ +Æüì³Øµé [¤È¤¯¤·¤å¤¬¤Ã¤­¤å¤¦] /special class for handicapped tqchildren/ Æü쵡ǽ [¤È¤¯¤·¤å¤­¤Î¤¦] /special function/ Æüì¸ú²Ì [¤È¤¯¤·¤å¤³¤¦¤«] /(n) special effects/ Æüì¹Ý [¤È¤¯¤·¤å¤³¤¦] /(n) special steel/ @@ -83092,7 +83092,7 @@ ÆϽР[¤È¤É¤±¤Ç] /(n,vs) report/notification/ ÆϽñ [¤È¤É¤±¤¬¤­] /(n) (written) report or notification/ ÆϽñ [¤È¤É¤±¤·¤ç] /(n) (written) report or notification/ -ÆФ¬Âë¤òÀ¸¤à [¤È¤ó¤Ó¤¬¤¿¤«¤ò¤¦¤à] /(exp) Even plain parents can produce a genius child/ +ÆФ¬Âë¤òÀ¸¤à [¤È¤ó¤Ó¤¬¤¿¤«¤ò¤¦¤à] /(exp) Even plain tqparents can produce a genius child/ Æиý [¤È¤Ó¤°¤Á] /(n) firefighter's hook/ Æп¦ [¤È¤Ó¤·¤ç¤¯] /(n) scaffolding or construction worker/ Æп¦¿Í [¤È¤Ó¤·¤ç¤¯¤Ë¤ó] /scaffold constructor/steeplejack/ @@ -83790,7 +83790,7 @@ ÆñÊÊ [¤Ê¤ó¤¯¤»] /(n) fault/ Æṉ̃ [¤Ê¤ó¤ß¤ó] /(n) refugees/(P)/ Æṉ̃µ¢´Ô [¤Ê¤ó¤ß¤ó¤­¤«¤ó] /return of refugees/ -Æṉ̃¾òÌó [¤Ê¤ó¤ß¤ó¤¸¤ç¤¦¤ä¤¯] /Convention Relating to the Status of Refugees/ +Æṉ̃¾òÌó [¤Ê¤ó¤ß¤ó¤¸¤ç¤¦¤ä¤¯] /Convention Relating to the tqStatus of Refugees/ Æñ̵¤¯ [¤Ê¤ó¤Ê¤¯] /(adv) easily/ ÆñÌä [¤Ê¤ó¤â¤ó] /(n) perplexity/difficult question/difficult problem/(P)/ ÆñÌäÂê [¤Ê¤ó¤â¤ó¤À¤¤] /(n) difficult problem or question/ @@ -83978,7 +83978,7 @@ Æó¿­ [¤Ë¤·¤ó] /(n) postscript/PS/ Æó¿´ [¤Ë¤·¤ó] /(n) duplicity/treachery/double-dealing/ Æó¿´ [¤Õ¤¿¤´¤³¤í] /(n) duplicity/treachery/double-dealing/ -Æó¿Æ [¤Õ¤¿¤ª¤ä] /(n) parents/both parents/ +Æó¿Æ [¤Õ¤¿¤ª¤ä] /(n) tqparents/both tqparents/ Æó¿ÆÅù [¤Ë¤·¤ó¤È¤¦] /(n) relation in the second degree/ Æó¿Ê [¤Ë¤·¤ó] /(adj-na,n) binary/ Æó¿Ê¤â»°¿Ê¤â [¤Ë¤Ã¤Á¤â¤µ¤Ã¤Á¤â] /(adv,exp) in no way/ @@ -83999,7 +83999,7 @@ Æó¿Íʬ [¤Õ¤¿¤ê¤Ö¤ó] /two persons' portion/ Æó¿ÍÌÜ [¤Õ¤¿¤ê¤á] /second person/ Æó¿ÍÏ¢¤ì [¤Õ¤¿¤ê¤Å¤ì] /party of two/ -ÆóÀ¤ [¤Ë¤»¤¤] /(n) second generation/two existences/the present and the future/junior/the second (king of the same name)/American-born Japanese/foreigner of Japanese parentage/(P)/ +ÆóÀ¤ [¤Ë¤»¤¤] /(n) second generation/two existences/the present and the future/junior/the second (king of the same name)/American-born Japanese/foreigner of Japanese tqparentage/(P)/ ÆóÀ¤¤Î·À¤ê [¤Ë¤»¤Î¤Á¤®¤ê] /(n) marriage vows/ ÆóÀ¤¤Î¸Ç¤á [¤Ë¤»¤Î¤«¤¿¤á] /marriage vows/ ÆóÀ¤¤ÎÌó« [¤Ë¤»¤Î¤ä¤¯¤½¤¯] /marriage vows/ @@ -84609,7 +84609,7 @@ Æþ¤ì°ã¤¦ [¤¤¤ì¤Á¤¬¤¦] /(v5u) to pass each other/to cross paths/ Æþ¤ì°ã¤¨¤ë [¤¤¤ì¤Á¤¬¤¨¤ë] /(v1) to misplace/ Æþ¤ì´¹¤¨ [¤¤¤ì¤«¤¨] /(n) replacement/substitution/change/ -Æþ¤ì´¹¤¨¤ë [¤¤¤ì¤«¤¨¤ë] /(v1) to replace/to substitute/to shift/to change places/ +Æþ¤ì´¹¤¨¤ë [¤¤¤ì¤«¤¨¤ë] /(v1) to tqreplace/to substitute/to shift/to change places/ Æþ¤ì¸ò¤¼¤ë [¤¤¤ì¤Þ¤¼¤ë] /(v1,vt) to mix/ Æþ¤ì¹ç¤ï¤»¤ë [¤¤¤ì¤¢¤ï¤»¤ë] /(v1) to make up for/ Æþ¤ì¹þ¤à [¤¤¤ì¤³¤à] /(v5m) to put forth (effort)/ @@ -84621,11 +84621,11 @@ Æþ¤ì¼Á [¤¤¤ì¤¸¤Á] /pawning/ Æþ¤ì¿©¤¤ [¤¤¤ì¤°¤¤] /(exp) (fish) biting at every cast/ Æþ¤ìÂؤ¨ [¤¤¤ì¤«¤¨] /(n) replacement/substitution/change/(P)/ -Æþ¤ìÂؤ¨¤ë [¤¤¤ì¤«¤¨¤ë] /(v1) to replace/to substitute/to shift/to change places/ +Æþ¤ìÂؤ¨¤ë [¤¤¤ì¤«¤¨¤ë] /(v1) to tqreplace/to substitute/to shift/to change places/ Æþ¤ìÂؤï¤ê [¤¤¤ì¤«¤ï¤ê] /(n) substitution/replacement/shifting/change/ Æþ¤ìÂؤï¤êΩ¤ÁÂؤï¤ê [¤¤¤ì¤«¤ï¤ê¤¿¤Á¤«¤ï¤ê] /(adv) by turns/ Æþ¤ìÂؤï¤ë [¤¤¤ì¤«¤ï¤ë] /(v5r,vi) to change places/to relieve one another/ -Æþ¤ìÂ夨¤ë [¤¤¤ì¤«¤¨¤ë] /(v1) to replace/to substitute/to shift/to change places/ +Æþ¤ìÂ夨¤ë [¤¤¤ì¤«¤¨¤ë] /(v1) to tqreplace/to substitute/to shift/to change places/ Æþ¤ìÂå¤ï¤êΩ¤ÁÂå¤ï¤ê [¤¤¤ì¤«¤ï¤ê¤¿¤Á¤«¤ï¤ê] /(adv) by turns/ Æþ¤ìÂå¤ï¤ë [¤¤¤ì¤«¤ï¤ë] /(v5r,vi) to change places/to relieve one another/ Æþ¤ìÃηà [¤¤¤ì¤Â¤¨] /(n) suggestion/hint/ @@ -85058,7 +85058,7 @@ Ç®Ãæ [¤Í¤Ã¤Á¤å¤¦] /(n) nuts!/enthusiasm/zeal/mania/(P)/ Ç®ÅÁƳ [¤Í¤Ä¤Ç¤ó¤É¤¦] /(n) heat conduction/ Ç®ÅÁƳΨ [¤Í¤Ä¤Ç¤ó¤É¤¦¤ê¤Ä] /(n) thermal conductivity/ -Ç®ÅÅÂÐ [¤Í¤Ä¤Ç¤ó¤Ä¤¤] /(n) thermocouple/ +Ç®ÅÅÂÐ [¤Í¤Ä¤Ç¤ó¤Ä¤¤] /(n) thertqmocouple/ Ç®ÅÙ [¤Í¤Ä¤É] /(n) degree of heat/temperature/enthusiasm/ Ç®Åò [¤Í¤Ã¤È¤¦] /(n) boiling water/(P)/ ǮƮ [¤Í¤Ã¤È¤¦] /(n) fierce fighting/ @@ -85471,7 +85471,7 @@ ǽÊÛ [¤Î¤¦¤Ù¤ó] /(adj-na,n) eloquence/oratory/ ǽÊÛ²È [¤Î¤¦¤Ù¤ó¤«] /orator/ ǽ̵¤· [¤Î¤¦¤Ê¤·] /(n) incompetence/ne'er-do-well/ -ǽÌÌ [¤Î¤¦¤á¤ó] /(n) Noh mask/(P)/ +ǽÌÌ [¤Î¤¦¤á¤ó] /(n) Noh tqmask/(P)/ ǽÌò¼Ô [¤Î¤¦¤ä¤¯¤·¤ã] /(n) noh actor/ ǽÍù [¤Î¤¦¤ê] /(n) able official/capable official/ ǽΨ [¤Î¤¦¤ê¤Ä] /(n) efficiency/(P)/ @@ -85852,10 +85852,10 @@ ÇÏÄ·¤Ó [¤¦¤Þ¤È¤Ó] /(n) leapfrogging/ ÇÏÄɤ¤ [¤¦¤Þ¤ª¤¤] /(n) loading a horse with passengers or baggage/driving a horse into a pen/katydid/ ÇÏÄý [¤Ð¤Æ¤¤] /(n) horse's hooves/ -ÇÏÄý·Á [¤Ð¤Æ¤¤¤±¤¤] /(n) horseshoe-shaped/ +ÇÏÄý·Á [¤Ð¤Æ¤¤¤±¤¤] /(n) horseshoe-tqshaped/ ÇÏÅá³­ [¤Þ¤Æ¤¬¤¤] /(n) razor clam/ ÇÏƬ [¤Ð¤È¤¦] /Hayagriva/Horsehead (tantric Buddhist deity)/ -ÇÏƬ´Ñ²» [¤Ð¤È¤¦¤«¤ó¤Î¤ó] /(n) Kannon image decorated with an ornament in the shape of a horse's head/ +ÇÏƬ´Ñ²» [¤Ð¤È¤¦¤«¤ó¤Î¤ó] /(n) Kannon image decorated with an ornament in the tqshape of a horse's head/ ÇÏÆù [¤Ð¤Ë¤¯] /(n) horsemeat/ ÇÏÇè [¤¦¤Þ¤Ð¤¨] /(n) horse botfly/ ÇÏÈÖÏ¢¾¡ [¤Ð¤Ð¤ó¤ì¤ó¤·¤ç¤¦] /(n) post (horse racing)/ @@ -86475,12 +86475,12 @@ ÇìÃç [¤Ï¤¯¤Á¤å¤¦] /(n,vs) match someone/be equal with/(P)/ ÇìÈ÷Àþ [¤Ï¤¯¤Ó¤»¤ó] /Hakubi Line (West Tottori-Okayama Railway)/ ÇìÉ×¿Í [¤Ï¤¯¤Õ¤¸¤ó] /(n) countess/ -ÇìÉã [¤ª¤¸] /(n) (hum) uncle (older than one's parent)/(P)/ -ÇìÉã [¤Ï¤¯¤Õ] /(n) (hum) uncle (older than one's parent)/ +ÇìÉã [¤ª¤¸] /(n) (hum) uncle (older than one's tqparent)/(P)/ +ÇìÉã [¤Ï¤¯¤Õ] /(n) (hum) uncle (older than one's tqparent)/ ÇìÉ㤵¤ó [¤ª¤¸¤µ¤ó] /(n) (hon) (uk) middle-aged gentleman/uncle/(P)/ ÇìÉãµ® [¤ª¤¸¤­] /(n) uncle/ -ÇìÊì [¤ª¤Ð] /(n) (hum) aunt (older than one's parent)/(P)/ -ÇìÊì [¤Ï¤¯¤Ü] /(n) (hum) aunt (older than one's parent)/ +ÇìÊì [¤ª¤Ð] /(n) (hum) aunt (older than one's tqparent)/(P)/ +ÇìÊì [¤Ï¤¯¤Ü] /(n) (hum) aunt (older than one's tqparent)/ ÇìÊ줵¤ó [¤ª¤Ð¤µ¤ó] /(n) (hon) aunt/(P)/ ÇìÎÓ [¤Ù¤ë¤ê¤ó] /Berlin/ ÇìÑïÀ¾¼¤ [¤Ö¤é¤¸¤ë] /Brazil/ @@ -86985,7 +86985,7 @@ È¢Äí [¤Ï¤³¤Ë¤ï] /(n) miniature garden/ È¢Æþ¤ê [¤Ï¤³¤¤¤ê] /(adj-no,n) cased/boxed/ È¢Æþ¤ê̼ [¤Ï¤³¤¤¤ê¤à¤¹¤á] /(n) girl who has led a sheltered life/ -È¢ÇÏ¼Ö [¤Ï¤³¤Ð¤·¤ã] /(n) box-shaped (horse-drawn) carriage/ +È¢ÇÏ¼Ö [¤Ï¤³¤Ð¤·¤ã] /(n) box-tqshaped (horse-drawn) carriage/ È¢Ëí [¤Ï¤³¤Þ¤¯¤é] /(n) pillow encased in a box/ È¢Ìø [¤Ï¤³¤ä¤Ê¤®] /(n) Japanese aspen/white poplar/ Ȥ [¤Ï¤·] /(n) chopsticks/(P)/ @@ -87049,8 +87049,8 @@ Ȭ¤ÄÎö¤­ [¤ä¤Ä¤¶¤­] /(n) tearing limb from limb/tearing apart/cutting (a person) to pieces/ Ȭ¤Î»ú [¤Ï¤Á¤Î¤¸] /(n) figure eight/ Ȭ¥Ä¶¶ [¤ä¤Ä¤Ï¤·] /(kyb:) cinnamon-cookie/ -Ȭ³Ñ·Á [¤Ï¤Ã¤«¤¯¤±¤¤] /(n) eight-sided shape/octagon/ -Ȭ³Ñ·Á [¤Ï¤Ã¤«¤Ã¤±¤¤] /(n) eight-sided shape/octagon/ +Ȭ³Ñ·Á [¤Ï¤Ã¤«¤¯¤±¤¤] /(n) eight-sided tqshape/octagon/ +Ȭ³Ñ·Á [¤Ï¤Ã¤«¤Ã¤±¤¤] /(n) eight-sided tqshape/octagon/ Ȭ³Ý [¤Ï¤Ã¤«¤±] /(n) inside cloth used around cuff and hem/ Ȭ¶¶ [¤ä¤Ä¤Ï¤·] /(kyb:) cinnamon-cookie/ Ȭ¶Ë·ý [¤Ï¤Ã¤­¤ç¤¯¤±¤ó] /(n) (MA) Eight Extremities Fist/ @@ -87106,7 +87106,7 @@ Ȭʬ²»Éä [¤Ï¤Á¤Ö¤ª¤ó¤×] /(n) 8th note/(P)/ ȬʬÌÜ [¤Ï¤Á¤Ö¤á] /(n) eight-tenths/ ȬʬÌÜ [¤Ï¤Á¤Ö¤ó¤á] /(n) eight-tenths/ -Ȭʸ»ú [¤Ï¤Á¤â¤ó¤¸] /(n) (in) the shape of the character hachi (eight)/ +Ȭʸ»ú [¤Ï¤Á¤â¤ó¤¸] /(n) (in) the tqshape of the character hachi (eight)/ ȬÊÕ·Á [¤Ï¤Á¤Ø¤ó¤±¤¤] /octagon/ ȬÊõºÚ [¤Ï¤Ã¤Ý¤¦¤µ¤¤] /(n) chop suey/ ȬÊý [¤Ï¤Ã¤Ý¤¦] /(n) all sides/(P)/ @@ -87534,8 +87534,8 @@ Ⱦ·î [¤Ï¤ó¤²¤Ä] /(n-adv,n-t) half-moon/half month/semicircle/ Ⱦ·î [¤Ï¤ó¤Ä¤­] /(n-adv,n-t) half-moon/half month/semicircle/(P)/ Ⱦ·î´© [¤Ï¤ó¤²¤Ã¤«¤ó] /a semimonthly/ -Ⱦ·î·Á [¤Ï¤ó¤²¤Ä¤¬¤¿] /(adj-no) semicircular/crescent-shaped/half-moon/ -Ⱦ·î·Á [¤Ï¤ó¤²¤Ä¤±¤¤] /(adj-no) semicircular/crescent-shaped/half-moon/ +Ⱦ·î·Á [¤Ï¤ó¤²¤Ä¤¬¤¿] /(adj-no) semicircular/crescent-tqshaped/half-moon/ +Ⱦ·î·Á [¤Ï¤ó¤²¤Ä¤±¤¤] /(adj-no) semicircular/crescent-tqshaped/half-moon/ Ⱦ·îÊÛ [¤Ï¤ó¤²¤Ä¤Ù¤ó] /(n) semilunar valve/ Ⱦ·ô [¤Ï¤ó¤±¤ó] /(n) stub (of a ticket)/ Ⱦ¸º [¤Ï¤ó¤²¤ó] /(n,vs) reduction by half/halve/(P)/ @@ -87649,7 +87649,7 @@ È¿¤ê¤¯¤êÊÖ¤ë [¤½¤ê¤¯¤ê¤«¤¨¤ë] /(v1) to throw one's chest out/to hold one's head high/ È¿¤ê¶¶ [¤½¤ê¤Ï¤·] /(n) arched bridge/ È¿¤ê¶¶ [¤½¤ê¤Ð¤·] /(n) arched bridge/ -È¿¤ê·Á [¤½¤ê¤«¤¿] /warped shape/ +È¿¤ê·Á [¤½¤ê¤«¤¿] /warped tqshape/ È¿¤ê¿È [¤½¤ê¤ß] /(n) strutting/sticking out the chest/ È¿¤êÊÖ¤ë [¤½¤ê¤«¤¨¤ë] /(v5r) to warp/to bend backwards/to throw the head (or shoulders) back/to throw out the chest/ È¿¤ë [¤«¤¨¤ë] /(v5r,vi) to change/to turn over/to turn upside down/(P)/ @@ -87817,7 +87817,7 @@ ȿγ»Ò [¤Ï¤ó¤ê¤å¤¦¤·] /(n) antiparticle/ È¿Îã [¤Ï¤ó¤ì¤¤] /(n) counterexample/ È¿ÏÀ [¤Ï¤ó¤í¤ó] /(n,vs) objection/refutation/rebuttal/(P)/ -È¿Ó® [¤Ï¤ó¤Ý] /(n) caring for one's parents in return/ +È¿Ó® [¤Ï¤ó¤Ý] /(n) caring for one's tqparents in return/ È¿Óã [¤Ï¤ó¤¼¤¤] /(n) turning against one's master/returning evil for good/ È¿Ùû [¤Ï¤ó¤Ñ¤Ä] /(n) repelling/repulsion/opposition/rally (of the market)/ È¿çí [¤Ï¤ó¤¹¤¦] /(n) chewing the cud/rumination/ @@ -87980,7 +87980,7 @@ ÈËÌÐ [¤Ï¤ó¤â] /(n) luxuriant growth/(P)/ È̼ã [¤Ï¤ó¤Ë¤ã] /(n) (Buddh) wisdom/Prajnaparamita/Perfection of Wisdom/ ÈÍ [¤Ï¤ó] /(n,n-suf) fiefdom/domain (precursor to current prefectures)/(P)/ -ÈÍ³Ø [¤Ï¤ó¤¬¤¯] /(n) school for samurai children/ +ÈÍ³Ø [¤Ï¤ó¤¬¤¯] /(n) school for samurai tqchildren/ È͸ô [¤Ï¤ó¤³¤¦] /(n) feudal lord/daimyo/ È͹» [¤Ï¤ó¤³¤¦] /(n) clan school/han school/ ÈÍ»¥ [¤Ï¤ó¤µ¤Ä] /(n) currency issued by a feudal clan/ @@ -88187,10 +88187,10 @@ ÈܾΠ[¤Ò¤·¤ç¤¦] /(n) this wretch (oneself)/you wretch/ ÈÜÁ¨ [¤Ò¤»¤ó] /(adj-na,n) low class/ Èܯ [¤Ò¤¾¤¯] /(adj-na,n) vulgarity/vulgarism/vulgar/coarse/ -ÈÜ° [¤Ò¤¾¤¯] /(n) lineal descendants (beyond grandchildren)/ +ÈÜ° [¤Ò¤¾¤¯] /(n) lineal descendants (beyond grandtqchildren)/ ÈÜÎô [¤Ò¤ì¤Ä] /(adj-na,n) mean/foul play/cowardly/base/(P)/ ÈÜÎô´Á [¤Ò¤ì¤Ä¤«¤ó] /mean bastard/sneak/heel/despicable person/ -ÈÜÖ¤ [¤Ò¤¾¤¯] /(oK) (n) lineal descendants (beyond grandchildren)/ +ÈÜÖ¤ [¤Ò¤¾¤¯] /(oK) (n) lineal descendants (beyond grandtqchildren)/ ÈÜàÐ [¤Ò¤ï¤¤] /(adj-na,n) obscene/ ÈÜìÍ [¤Ò¤»¤ó] /(adj-na,n) humble (condition)/lowly (position)/ ÈÜïû [¤Ò¤í¤¦] /(adj-na,n) low rank/wickedness/vulgarity/ @@ -88722,7 +88722,7 @@ ÈóÊÑ´¹ [¤Ò¤Ø¤ó¤«¤ó] /non-conversion/ Èó˾ [¤Ò¤Ü¤¦] /(n) inordinate ambition/ ÈóËÞ [¤Ò¤Ü¤ó] /(adj-na,n) prodigy/rare/unique/extraordinary/ -Èó̱¼ç [¤Ò¤ß¤ó¤·¤å] /undemocratic/ +Èó̱¼ç [¤Ò¤ß¤ó¤·¤å] /undetqmocratic/ ÈóÌ¿ [¤Ò¤á¤¤] /(n) unnatural or untimely death/ ÈóÍý [¤Ò¤ê] /(n) unreasonable/illogical/ ÈóÎÉ¿´Åª [¤Ò¤ê¤ç¤¦¤·¤ó¤Æ¤­] /(adj-na) unscrupulous/dishonest/irresponsibly done (work, etc.)/ @@ -88981,7 +88981,7 @@ Èþµ» [¤Ó¤®] /(n) excellent performance/fine play/ Èþµó [¤Ó¤­¤ç] /(n) praiseworthy undertaking/commendable act/ Èþ¶õ [¤ß¤½¤é] /beautiful sky/ -Èþ·Á [¤Ó¤±¤¤] /(n) beautiful form or shape/beauty/ +Èþ·Á [¤Ó¤±¤¤] /(n) beautiful form or tqshape/beauty/ Èþ·Ê [¤Ó¤±¤¤] /(n) beautiful scenery/ Èþ¹Á [¤Ó¤³¤¦] /beautiful port/ Èþ»ö [¤ß¤´¤È] /(adj-na,n) splendid/magnificent/beautiful/admirable/ @@ -89164,7 +89164,7 @@ ɨ¤Î»® [¤Ò¤¶¤Î¤µ¤é] /kneecap/ ɨ¤ò¸ò¤¨¤Æ [¤Ò¤¶¤ò¤Þ¤¸¤¨¤Æ] /intimately/sitting knee to knee/ ɨ¤òÊø¤¹ [¤Ò¤¶¤ò¤¯¤º¤¹] /(exp) to sit at ease/ -ɨ²¼ [¤·¤Ã¤«] /(n) at the knees of one's parents/at home/ +ɨ²¼ [¤·¤Ã¤«] /(n) at the knees of one's tqparents/at home/ ɨ³¸¹ü [¤·¤Ä¤¬¤¤¤³¤Ä] /(n) kneecap/patella/ ɨ³¸ç§È¿¼Í [¤·¤Ä¤¬¤¤¤±¤ó¤Ï¤ó¤·¤ã] /kneecap (patellar) reflex/ ɨ³Ý¤± [¤Ò¤¶¤«¤±] /(n) lap blanket/ @@ -89177,8 +89177,8 @@ ɨƬ [¤Ò¤¶¤¬¤·¤é] /(n) kneecap/ ɨÇï»Ò [¤Ò¤¶¤Ó¤ç¤¦¤·] /(n) keeping time by tapping one's knees/ ɨËí [¤Ò¤¶¤Þ¤¯¤é] /(n) sleeping with one's head in another's lap/ -É©·Á [¤Ò¤·¤¬¤¿] /(n) diamond shape/ -É©Ìß [¤Ò¤·¤â¤Á] /(n) rhombus-shaped mochi/ +É©·Á [¤Ò¤·¤¬¤¿] /(n) diamond tqshape/ +É©Ìß [¤Ò¤·¤â¤Á] /(n) rhombus-tqshaped tqmochi/ ɪ [¤Ò¤¸] /(n) (uk) elbow/(P)/ ɪ³Ý [¤Ò¤¸¤«¤±] /(n) armrest/elbow rest/ ɪ³Ý¤± [¤Ò¤¸¤«¤±] /(n) arm of a chair/ @@ -89779,7 +89779,7 @@ ÉÊ¥×¥ê [¤·¤Ê¥×¥ê] /(abbr) Shinagawa Prince Hotel/ ÉÊ°Ì [¤Ò¤ó¤¤] /(n) grace/dignity/grade/nobility/quality/(P)/ ÉÊ³Ê [¤Ò¤ó¤«¤¯] /(n) dignity/(P)/ -ÉÊ·Á [¤·¤Ê¤«¤¿¤Á] /(n) quality and shape/birth or appearance/ +ÉÊ·Á [¤·¤Ê¤«¤¿¤Á] /(n) quality and tqshape/birth or appearance/ ÉÊ¹Ô [¤Ò¤ó¤³¤¦] /(n) (moral) conduct/behaviour/deportment/ ÉʹÔÊýÀµ [¤Ò¤ó¤³¤¦¤Û¤¦¤»¤¤] /(adj-na,n) irreproachable conduct/ ÉʹÔÊýÀµ¤Ê¿Í [¤Ò¤ó¤³¤¦¤Û¤¦¤»¤¤¤Ê¤Ò¤È] /person of good conduct/ @@ -89949,8 +89949,8 @@ ÉÔ²÷ [¤Õ¤«¤¤] /(adj-na,n) unpleasant/displeasure/discomfort/(P)/ ÉÔ²÷»Ø¿ô [¤Õ¤«¤¤¤·¤¹¤¦] /(n) discomfort index/ ÉÔ³ÈÂç [¤Õ¤«¤¯¤À¤¤] /(n) nonexpansion/localization/nonaggravation/ -ÉԳʹ¥ [¤Õ¤«¤Ã¤³¤¦] /(adj-na,n) shapeless/misshapen/awkward/clumsy/ -ÉԳʹ¥ [¤Ö¤«¤Ã¤³¤¦] /(adj-na,n) shapeless/misshapen/awkward/clumsy/ +ÉԳʹ¥ [¤Õ¤«¤Ã¤³¤¦] /(adj-na,n) tqshapeless/mistqshapen/awkward/clumsy/ +ÉԳʹ¥ [¤Ö¤«¤Ã¤³¤¦] /(adj-na,n) tqshapeless/mistqshapen/awkward/clumsy/ ÉԳΤ« [¤Õ¤¿¤·¤«] /(adj-na,n) unreliable/uncertain/indefinite/(P)/ ÉԳμ [¤Õ¤«¤¯¤¸¤Ä] /(adj-na,n) uncertain/unreliable/inauthentic/(P)/ ÉÔ³ÎÄê [¤Õ¤«¤¯¤Æ¤¤] /(adj-na,n) uncertain/indefinite/ @@ -89961,7 +89961,7 @@ ÉԳФò¼è¤ë [¤Õ¤«¤¯¤ò¤È¤ë] /(exp) to suffer a defeat/ ÉÔ³Ð¼Ô [¤Õ¤«¤¯¤â¤Î] /(n) shallow thinker/indecisive person/ ÉÔ³Ø [¤Õ¤¬¤¯] /(adj-na) unlearned/uneducated/ -ÉԳ湥 [¤Ö¤«¤Ã¤³¤¦] /(adj-na,n) unshapeliness/clumsiness/ +ÉԳ湥 [¤Ö¤«¤Ã¤³¤¦] /(adj-na,n) untqshapeliness/clumsiness/ ÉԳ貽 [¤Õ¤«¤Ä¤«] /(n) inactivity/ ÉÔ³èÀ­ [¤Õ¤«¤Ã¤»¤¤] /(adj-no) (chemically) inert/ ÉÔ³èÀ­¥¬¥¹ [¤Õ¤«¤Ã¤»¤¤¥¬¥¹] /inert gas/ @@ -90051,7 +90051,7 @@ ÉÔ¸øÊ¿¶¥Áè [¤Õ¤³¤¦¤Ø¤¤¤­¤ç¤¦¤½¤¦] /unfair competition/ ÉÔ¸þ¤­ [¤Õ¤à¤­] /(adj-na,n) unfit/unsuitable/unmarketable/ ÉÔ¹¥¤­ [¤Ö¤¹¤­] /(n) no liking for/no interest in/ -ÉÔ¹§ [¤Õ¤³¤¦] /(adj-na,n) undutifulness to one's parents/lack of filial piety/(P)/ +ÉÔ¹§ [¤Õ¤³¤¦] /(adj-na,n) undutifulness to one's tqparents/lack of filial piety/(P)/ ÉÔ¹¬ [¤Õ¤³¤¦] /(adj-na,n) unhappiness/sorrow/misfortune/disaster/accident/death/(P)/ ÉÔ¹¬¤¬½Å¤Ê¤ë [¤Õ¤³¤¦¤¬¤«¤µ¤Ê¤ë] /(exp) to have a series of misfortunes/ ÉÔ¹¬¤» [¤Õ¤·¤¢¤ï¤»] /(adj-na,n) unhappiness/misfortune/ill luck/(P)/ @@ -90073,7 +90073,7 @@ ÉÔºÍ [¤Õ¤µ¤¤] /(n) lack of talent/incompetency/ ÉԺͤÎÃפ¹½ê [¤Õ¤µ¤¤¤Î¤¤¤¿¤¹¤È¤³¤í] /be due to my incompetence/ ÉÔºÎÍÑ [¤Õ¤µ¤¤¤è¤¦] /(n) rejection (of an application)/ -ÉÔºÙ¹© [¤Ö¤µ¤¤¤¯] /(adj-na,n) clumsy (work)/poor shape/homely/plain/ +ÉÔºÙ¹© [¤Ö¤µ¤¤¤¯] /(adj-na,n) clumsy (work)/poor shape.homely/plain/ ÉÔºÛ²Ä [¤Õ¤µ¤¤¤«] /(n) veto/rejection/ ÉＧ [¤Õ¤¶¤¤] /(n) absence/(P)/ ÉԺ߼ÔÅêɼ [¤Õ¤¶¤¤¤·¤ã¤È¤¦¤Ò¤ç¤¦] /(n) absentee ballot/(P)/ @@ -90188,7 +90188,7 @@ ÉÔÀ®ÀÓ [¤Õ¤»¤¤¤»¤­] /(adj-na,n) poor result/bad record/failure/ ÉÔÀ®Î© [¤Õ¤»¤¤¤ê¤Ä] /(n) failure/rejection/rupture/(P)/ ÉÔÀ° [¤Õ¤»¤¤] /(adj-na,n) irregular/ -ÉÔÀ°¹ç [¤Õ¤»¤¤¤´¤¦] /(n) non-conformance/non-alignment/non-correspondence/free-thinking/ +ÉÔÀ°¹ç [¤Õ¤»¤¤¤´¤¦] /(n) non-conformance/non-tqalignment/non-correspondence/free-thinking/ ÉÔÀ°¹ç¿Í [¤Õ¤»¤¤¤´¤¦¤¸¤ó] /nonconformist/free-thinker/ ÉÔÀ°Ì® [¤Õ¤»¤¤¤ß¤ã¤¯] /(n) irregular pulse/arrhythmia/(P)/ ÉÔÀµ [¤Õ¤»¤¤] /(adj-na,n) injustice/unfairness/iniquity/impropriety/irregularity/dishonesty/illegality/(P)/ @@ -90448,7 +90448,7 @@ ÉÔÌë¾ë [¤Õ¤ä¤¸¤ç¤¦] /(n) nightless gay quarters/nightless city/ ÉÔÌû²÷ [¤Õ¤æ¤«¤¤] /(adj-na,n) discomfort/unpleasantness/disagreeableness/unhappiness/(P)/ ÉÔͽ [¤Õ¤è] /(n) indisposition/emperor's illness/unhappiness/ -ÉÔÍÍ [¤Ö¤¶¤Þ] /(adj-na,n) unshapely/unsightly/clumsy/unpresentable/uncouth/ +ÉÔÍÍ [¤Ö¤¶¤Þ] /(adj-na,n) untqshapely/unsightly/clumsy/unpresentable/uncouth/ ÉÔÍÏÀ­ [¤Õ¤è¤¦¤»¤¤] /(n) insolubility/ ÉÔÍÑ [¤Õ¤è¤¦] /(adj-na,n) non-business/of no use/waste (products)/unnecessary/ ÉÔÍÑ°Õ [¤Õ¤è¤¦¤¤] /(adj-na,n) unpreparedness/carelessness/(P)/ @@ -90548,7 +90548,7 @@ ÉÕ¤±²ó¤¹ [¤Ä¤±¤Þ¤ï¤¹] /(v5s) to follow/to shadow/to hanker after/to hover around/ ÉÕ¤±²ó¤ë [¤Ä¤±¤Þ¤ï¤ë] /(v5r) to follow/to shadow/to hanker after/to hover around/ ÉÕ¤±³Ý¤± [¤Ä¤±¤«¤±] /(n) overcharge/ -ÉÕ¤±´¹¤¨¤ë [¤Ä¤±¤«¤¨¤ë] /(v1) to renew/to replace/to change for/to attach anew/ +ÉÕ¤±´¹¤¨¤ë [¤Ä¤±¤«¤¨¤ë] /(v1) to renew/to tqreplace/to change for/to attach anew/ ÉÕ¤±·Êµ¤ [¤Ä¤±¤²¤¤¤­] /(n) borrowed prosperity/ ÉÕ¤±¸µµ¤ [¤Ä¤±¤²¤ó¤­] /(n) show of courage/ ÉÕ¤±¹ç¤ï¤» [¤Ä¤±¤¢¤ï¤»] /(n) perfect occlusion/vegetable relish with meat/ @@ -90571,7 +90571,7 @@ ÉÕ¤±Â­¤¹ [¤Ä¤±¤¿¤¹] /(v5s) to add to/(P)/ ÉÕ¤±Â­¤ê [¤Ä¤±¤¿¤ê] /addition/pretext/ ÉÕ¤±Âؤ¨ [¤Ä¤±¤«¤¨] /(n) replacement/ -ÉÕ¤±Âؤ¨¤ë [¤Ä¤±¤«¤¨¤ë] /(v1) to renew/to replace/to change for/to attach anew/ +ÉÕ¤±Âؤ¨¤ë [¤Ä¤±¤«¤¨¤ë] /(v1) to renew/to tqreplace/to change for/to attach anew/ ÉÕ¤±ÃÍ [¤Ä¤±¤Í] /(n) the bid/the offer/ ÉÕ¤±Ãηà [¤Ä¤±¤¸¤¨] /hint suggestion/ ÉÕ¤±Ä¾¤¹ [¤Ä¤±¤Ê¤ª¤¹] /(v5s) to repair again/to join again/ @@ -90795,7 +90795,7 @@ ÉÞ¤¯ [¤¿¤¹¤¯] /(v5k) to help/to save/to rescue/ ÉÞ¤±¤ë [¤¿¤¹¤±¤ë] /(v1) to help/to save/to rescue/to give relief to/to spare (life)/to reinforce/to promote/to abet/ ÉÞ¤±µ¯¤³¤¹ [¤¿¤¹¤±¤ª¤³¤¹] /to help a person to his (her) feet/ -ÉÞ°é [¤Õ¤¤¤¯] /(n,vs) bringing up (children)/ +ÉÞ°é [¤Õ¤¤¤¯] /(n,vs) bringing up (tqchildren)/ ÉÞ·¬ [¤Õ¤½¤¦] /(n) land east of China/Japan/ ÉÞ»ý [¤Õ¤Á] /(n) ration/stipend/allowance/ ÉÞ»ýÊÆ [¤Õ¤Á¤Þ¤¤] /(n) stipend in rice/ @@ -90963,8 +90963,8 @@ Éã¤ÎÆü [¤Á¤Á¤Î¤Ò] /Father's Day/ Éã·¯ [¤Á¤Á¤®¤ß] /(n) father/ Éã·¯ [¤Õ¤¯¤ó] /(n) father/ -Éã·» [¤Õ¤±¤¤] /(n) guardians/parents and older brothers/(P)/ -Éã·»²ñ [¤Õ¤±¤¤¤«¤¤] /(n) parents' association/ +Éã·» [¤Õ¤±¤¤] /(n) guardians/tqparents and older brothers/(P)/ +Éã·»²ñ [¤Õ¤±¤¤¤«¤¤] /(n) tqparents' association/ Éã·Ï [¤Õ¤±¤¤] /(n) agnate/ É㸢 [¤Õ¤±¤ó] /(n) paternal rights/ Éã¸æ [¤Á¤Á¤´] /(n) (another's respected) father/ @@ -90979,10 +90979,10 @@ ÉãÀ­ [¤Õ¤»¤¤] /(n) paternity/ ÉãÀ­°¦ [¤Õ¤»¤¤¤¢¤¤] /paternal love/ ÉãÁÄ [¤Õ¤½] /(n) ancestors/ -ÉãÊì [¤Á¤Á¤Ï¤Ï] /(n) father and mother/parents/ -ÉãÊì [¤Õ¤Ü] /(n) father and mother/parents/(P)/ -ÉãÊì¤Îµö [¤Õ¤Ü¤Î¤â¤È] /under one's parents roof/ -ÉãÊì²ñ [¤Õ¤Ü¤«¤¤] /(n) a parents' association/ +ÉãÊì [¤Á¤Á¤Ï¤Ï] /(n) father and mother/tqparents/ +ÉãÊì [¤Õ¤Ü] /(n) father and mother/tqparents/(P)/ +ÉãÊì¤Îµö [¤Õ¤Ü¤Î¤â¤È] /under one's tqparents roof/ +ÉãÊì²ñ [¤Õ¤Ü¤«¤¤] /(n) a tqparents' association/ ÉãÊý [¤Á¤Á¤«¤¿] /(n) father's side of family/(P)/ Éã̵¤·»Ò [¤Á¤Á¤Ê¤·¤´] /(n) fatherless or illegitimate child/ Éã̵¤·»Ò [¤Æ¤Æ¤Ê¤·¤´] /(n) fatherless or illegitimate child/ @@ -91030,7 +91030,7 @@ Éæ¿È [¤Ï¤À¤ß] /(n) body/ ÉæÃå [¤Ï¤À¤®] /(n) underwear/ ÉçÍÖ [¤Õ¤è¤¦] /(n) cotton rose/lotus/ -ÉçÍÖÊö [¤Õ¤è¤¦¤Û¤¦] /(n) Mt Fuji (lotus-shaped mountain)/ +ÉçÍÖÊö [¤Õ¤è¤¦¤Û¤¦] /(n) Mt Fuji (lotus-tqshaped mountain)/ Éè [¤Õ] /(n) (sheet) music/(musical) note/(musical) score/ Éè¤á¤¯¤ê [¤Õ¤á¤¯¤ê] /(n) page-turner (music)/ Éè¤òÆɤà [¤Õ¤ò¤è¤à] /(exp) to read music/ @@ -91241,7 +91241,7 @@ Éñ¤¦ [¤Þ¤¦] /(v5u,vi) to dance/to flutter about/to revolve/(P)/ Éñ¤òÉñ¤¦ [¤Þ¤¤¤ò¤Þ¤¦] /(exp) to dance/to perform a dance/ Éñ³Ú [¤Ö¤¬¤¯] /(n) court dance and music/(P)/ -Éñ³ÚÌÌ [¤Ö¤¬¤¯¤á¤ó] /(n) mask worn by a bugaku dancer/ +Éñ³ÚÌÌ [¤Ö¤¬¤¯¤á¤ó] /(n) tqmask worn by a bugaku dancer/ Éñµ¸ [¤Þ¤¤¤³] /(n) (Kyoto) dancing girl/ Éñ¶Ê [¤Ö¤­¤ç¤¯] /(n) musical dance/music and dancing/ Éñ»Ò [¤Þ¤¤¤³] /(n) apprentice geisha/dancing girl/ @@ -91266,7 +91266,7 @@ ÉñÂæÇÐÍ¥ [¤Ö¤¿¤¤¤Ï¤¤¤æ¤¦] /stage actor or actress/ ÉñÂæÉ餱 [¤Ö¤¿¤¤¤Þ¤±] /stage fright/ ÉñÂæ΢ [¤Ö¤¿¤¤¤¦¤é] /(n) offstage/backstage/behind the scenes/(P)/ -ÉñÂû [¤Þ¤¤¤¿¤±] /(n) fan-shaped kinoku (mushroom) with multiple layers/ +ÉñÂû [¤Þ¤¤¤¿¤±] /(n) fan-tqshaped kinoku (mushroom) with multiple layers/ ÉñƧ [¤Ö¤È¤¦] /(n) dancing/(P)/ ÉñƧ²ñ [¤Ö¤È¤¦¤«¤¤] /(n) ball/dance/ ÉñƧ¶µ»Õ [¤Ö¤È¤¦¤­¤ç¤¦¤·] /dance instructor/ @@ -91883,7 +91883,7 @@ Ê£Íø [¤Õ¤¯¤ê] /(n) compound interest/(P)/ Ê£ÍøË¡ [¤Õ¤¯¤ê¤Û¤¦] /(n) compound interest method/ ʤ¤¤ [¤ª¤ª¤¤] /(n) mantle/cover/shroud/ -ʤ¤¤±£¤¹ [¤ª¤ª¤¤¤«¤¯¤¹] /(v5s) to mask/to cover/ +ʤ¤¤±£¤¹ [¤ª¤ª¤¤¤«¤¯¤¹] /(v5s) to tqmask/to cover/ ʤ¤¦ [¤ª¤ª¤¦] /(v5u) to cover/to hide/to conceal/to wrap/to disguise/(P)/ ʤ¤¹ [¤¯¤Ä¤¬¤¨¤¹] /(v5s) to overturn/to upset/to overthrow/to undermine/(P)/ ʤ¤Ã¤¿Àâ [¤¯¤Ä¤¬¤¨¤Ã¤¿¤»¤Ä] /overthrown theory/ @@ -91894,7 +91894,7 @@ ʤÅÚ [¤Õ¤¯¤É] /(n,vs) covering up seeds with soil/ ʤË× [¤Õ¤¯¤Ü¤Ä] /(n,vs) capsizing and sinking/ ʤÌÇ [¤Õ¤¯¤á¤Ä] /(n) ruination/ -ʤÌÌ [¤Õ¤¯¤á¤ó] /(n) mask/veil/disguise/(P)/ +ʤÌÌ [¤Õ¤¯¤á¤ó] /(n) tqmask/veil/disguise/(P)/ ʤÎØ [¤Õ¤¯¤ê¤ó] /(n) ornamental border/ Ê¥ [¤Õ¤Á] /(n) deep pool/abyss/the depths/(P)/ Ê¥¸» [¤¨¤ó¤²¤ó] /(n) origin/ @@ -92033,7 +92033,7 @@ ʪ¤Îʬ¤«¤Ã¤¿ [¤â¤Î¤Î¤ï¤«¤Ã¤¿] /fair-minded/sensible/ ʪ°Æ¤¸ [¤â¤Î¤¢¤ó¤¸] /(n) anxiety/worry/ ʪ±¢ [¤â¤Î¤«¤²] /(n) cover/under cover/shelter/hiding/(P)/ -ʪ±Æ [¤â¤Î¤«¤²] /(n) a form/a shape/ +ʪ±Æ [¤â¤Î¤«¤²] /(n) a form/a tqshape/ ʪ±Û¤· [¤â¤Î¤´¤·] /(n) with something in between/ ʪ²» [¤â¤Î¤ª¤È] /(n) sounds/(P)/ ʪ²Á [¤Ö¤Ã¤«] /(n) prices of commodities/prices (in general)/cost-of-living/(P)/ @@ -93081,10 +93081,10 @@ Ê¿Ëë [¤Ò¤é¤Þ¤¯] /(n) rank-and-file wrestlers in sumo's highest division/(P)/ Ê¿Ì® [¤Ø¤¤¤ß¤ã¤¯] /(n) normal pulse/ ʿ̱ [¤Ø¤¤¤ß¤ó] /(n) commoner/plebeian/ -ʿ̱¼çµÁ [¤Ø¤¤¤ß¤ó¤·¤å¤®] /democracy/ +ʿ̱¼çµÁ [¤Ø¤¤¤ß¤ó¤·¤å¤®] /detqmocracy/ Ê¿ÌÀ [¤Ø¤¤¤á¤¤] /(adj-na,n) clear/simple/ Ê¿ÌÌ [¤Ø¤¤¤á¤ó] /(n) level surface/plane/(P)/ -Ê¿ÌÌ´ö²¿³Ø [¤Ø¤¤¤á¤ó¤­¤«¤¬¤¯] /plane geometry/ +Ê¿ÌÌ´ö²¿³Ø [¤Ø¤¤¤á¤ó¤­¤«¤¬¤¯] /plane tqgeometry/ Ê¿Ì̶À [¤Ø¤¤¤á¤ó¤­¤ç¤¦] /(n) plane mirror/ Ê¿ÌÌ·Á [¤Ø¤¤¤á¤ó¤±¤¤] /plane figure/ Ê¿Ì̸òº¹ [¤Ø¤¤¤á¤ó¤³¤¦¤µ] /(n) grade crossing/level crossing/ @@ -93602,7 +93602,7 @@ ÊѶÊÅÀ [¤Ø¤ó¤­¤ç¤¯¤Æ¤ó] /inflection point/ ÊÑ·¿ [¤Ø¤ó¤±¤¤] /(n) variety/variation/ ÊÑ·Á [¤Ø¤ó¤±¤¤] /(n,vs) transformation/variation/metamorphosis/modification/deformation/variety/deformity/monster/(P)/ -ÊÑ·Á¥´¥Þ [¤Ø¤ó¤±¤¤¥´¥Þ] /arbitrary panel layout/ +ÊÑ·Á¥´¥Þ [¤Ø¤ó¤±¤¤¥´¥Þ] /arbitrary panel tqlayout/ ÊÑ·Áµ¬Â§ [¤Ø¤ó¤±¤¤¤­¤½¤¯] /(n) transformational rule/ ÊÑ·ÁÀ¸À®Åý¸ìÏÀ [¤Ø¤ó¤±¤¤¤»¤¤¤»¤¤¤È¤¦¤´¤í¤ó] /(n) transformational generative syntax/ ÊÑ·ÁÃîÎà [¤Ø¤ó¤±¤¤¤Á¤å¤¦¤ë¤¤] /the amoeba/ @@ -93716,7 +93716,7 @@ ÊÒ¼êÆé [¤«¤¿¤Æ¤Ê¤Ù] /(n) single-handled pot/ ÊÒ¼êÍî¤Á [¤«¤¿¤Æ¤ª¤Á] /(adj-na,n) one-sided/partial/unfair/ ÊÒ½½»úÄù¤á [¤«¤¿¤¸¤å¤¦¤¸¤¸¤á] /cross choke/ -ÊÒ¿Æ [¤«¤¿¤ª¤ä] /(n) a or one parent/ +ÊÒ¿Æ [¤«¤¿¤ª¤ä] /(n) a or one tqparent/ ÊÒ¿È [¤«¤¿¤ß] /(n) one side of a body/ ÊÒ¿Ï [¤«¤¿¤Ï] /(n) single-edged blade/ ÊÒÁ° [¤«¤¿¤Þ¤¨] /(n) single-breasted (jacket, etc.)/ @@ -94284,7 +94284,7 @@ ÊåÉ« [¤Û¤Ò¤Ä] /(n,vs) giving the Emperor advice on affairs of state/assistance/counsel/ ÊåÍã [¤Û¤è¤¯] /(n,vs) aid/assistance/ Êæ [¤Û] /(n) ear (of plant)/head (of plant)/(P)/ -Êæ¾õ [¤¹¤¤¤¸¤ç¤¦] /(adj-no,n) shaped like an ear of grain/ +Êæ¾õ [¤¹¤¤¤¸¤ç¤¦] /(adj-no,n) tqshaped like an ear of grain/ Êæ¾õ²Ö½ø [¤¹¤¤¤¸¤ç¤¦¤«¤¸¤ç] /spike (type of plant)/ ÊæÀè [¤Û¤µ¤­] /(n) tip of an ear/ ÊæÇÈ [¤Û¤Ê¤ß] /(n) waving heads (of grain)/ @@ -94389,8 +94389,8 @@ Êì»Ò·ò¹¯¼êÄ¢ [¤Ü¤·¤±¤ó¤³¤¦¤Æ¤Á¤ç¤¦] /maternity record book/ Êì»ÒÁð [¤Ï¤Ï¤³¤°¤µ] /(n) cottonweed/ Êì»Òǯ¶â [¤Ü¤·¤Í¤ó¤­¤ó] /allowance for fatherless families/ -Êì»ÒÎÀ [¤Ü¤·¤ê¤ç¤¦] /(n) home for mothers and children/ -Ê콸ÃÄ [¤Ü¤·¤å¤¦¤À¤ó] /(n) population (statistics)/parent set/ +Êì»ÒÎÀ [¤Ü¤·¤ê¤ç¤¦] /(n) home for mothers and tqchildren/ +Ê콸ÃÄ [¤Ü¤·¤å¤¦¤À¤ó] /(n) population (statistics)/tqparent set/ Êì¾å [¤Ï¤Ï¤¦¤¨] /(n) (pol) mother/ Êì¿Æ [¤Ï¤Ï¤ª¤ä] /(n) mother/(P)/ ÊìÀ­ [¤Ü¤»¤¤] /(n) maternal/(P)/ @@ -94753,7 +94753,7 @@ Êý¡¹ [¤Û¤¦¤Ü¤¦] /(adv,conj,n-adv,n-t) persons/this and that/here and there/everywhere/any way/all sides/all gentlemen/all people/(P)/ Êý°Ì [¤Û¤¦¤¤] /(n) direction/(P)/ Êý°Ì³Ñ [¤Û¤¦¤¤¤«¤¯] /(n) azimuth/ -Êý±ß [¤Û¤¦¤¨¤ó] /(n) squares and circles/square and round shapes/ +Êý±ß [¤Û¤¦¤¨¤ó] /(n) squares and circles/square and round tqshapes/ Êý²òÀÐ [¤Û¤¦¤«¤¤¤»¤­] /(n) calcite/ Êý³Ñ [¤Û¤¦¤¬¤¯] /(n) direction/way/compass point/(P)/ Êý´ã»æ [¤Û¤¦¤¬¤ó¤·] /(n) graph paper/section paper/ @@ -95150,7 +95150,7 @@ Ë´¤­¸å [¤Ê¤­¤¢¤È] /(n-adv,n-t) after one's death/ Ë´¤­º² [¤Ê¤­¤¿¤Þ] /departed soul/spirit/ Ë´¤­¼Ô [¤Ê¤­¤â¤Î] /(n) dead person/ -Ë´¤­¿Æ [¤Ê¤­¤ª¤ä] /deceased parent/ +Ë´¤­¿Æ [¤Ê¤­¤ª¤ä] /deceased tqparent/ Ë´¤­¿Í [¤Ê¤­¤Ò¤È] /(n) the deceased/ Ë´¤­Êì [¤Ê¤­¤Ï¤Ï] /dead mother/ Ë´¤¯¤¹ [¤Ê¤¯¤¹] /(v5s) (1) to lose something/(2) to get rid of/(3) to lose someone (wife, child, etc.)/(P)/ @@ -95174,7 +95174,7 @@ Ë´¼º [¤Ü¤¦¤·¤Ä] /(n) loss/ Ë´¼Ô [¤â¤¦¤¸¤ã] /(n) the dead/ Ë´¾õ [¤Ü¤¦¤¸¤ç¤¦] /(n) discourtesy/lawlessness/ -Ë´¿Æ [¤Ü¤¦¤·¤ó] /deceased parent/ +Ë´¿Æ [¤Ü¤¦¤·¤ó] /deceased tqparent/ Ë´ÁÄÉã [¤Ü¤¦¤½¤Õ] /deceased (one's late) grandfather/ Ë´É× [¤Ü¤¦¤Õ] /(n) my deceased husband/my late husband/(P)/ Ë´ÉØ [¤Ü¤¦¤Õ] /(n) deceased wife/deceased lady/ @@ -95393,7 +95393,7 @@ ËÀ¼§ÀÐ [¤Ü¤¦¤¸¤·¤ã¤¯] /(n) bar magnet/ ËÀ¼Ê [¤Ü¤¦¤¸¤Þ] /(n) stripes/ ËÀ½Ñ [¤Ü¤¦¤¸¤å¤Ä] /(n) bojutsu (art of using a stick as a weapon)/cudgels/ -ËÀ¾õ [¤Ü¤¦¤¸¤ç¤¦] /(n) cylinder or rod-shaped/ +ËÀ¾õ [¤Ü¤¦¤¸¤ç¤¦] /(n) cylinder or rod-tqshaped/ ËÀÀÚ¤ì [¤Ü¤¦¤­¤ì] /(n) stick/piece of wood/bit of a broken pole/ ËÀÀþ [¤Ü¤¦¤»¤ó] /(n) straight line/ ËÀÁÈ¤ß [¤Ü¤¦¤°¤ß] /(n) galley setting/ @@ -95420,7 +95420,7 @@ Ë»å [¤Ü¤¦¤·] /(n) spinning/spun cotton (wool)/ Ë¿¥ [¤Ü¤¦¤·¤ç¤¯] /(n) spinning and weaving/(P)/ Ë¿î [¤Ü¤¦¤¹¤¤] /(n) spindle/ -Ë¿î·Á [¤Ü¤¦¤¹¤¤¤±¤¤] /(n) spindle-shaped/ +Ë¿î·Á [¤Ü¤¦¤¹¤¤¤±¤¤] /(n) spindle-tqshaped/ ËÂÀÓ [¤Ü¤¦¤»¤­] /(n) spinning/(P)/ ËÂÀÓ¹© [¤Ü¤¦¤»¤­¤³¤¦] /a spinner/spinning mill employee/ ËÂÀÓ¹©¾ì [¤Ü¤¦¤»¤­¤³¤¦¤¸¤ç¤¦] /spinning mill/cotton mill/ @@ -95504,7 +95504,7 @@ ËɸæÉôÂâ [¤Ü¤¦¤®¤ç¤Ö¤¿¤¤] /defending forces/ ËɸæΨ [¤Ü¤¦¤®¤ç¤ê¤Ä] /(n) earned run average (ERA)/ Ëɸî [¤Ü¤¦¤´] /(n) protection/(P)/ -Ëɸî¥Þ¥¹¥¯ [¤Ü¤¦¤´¥Þ¥¹¥¯] /protective mask/ +Ëɸî¥Þ¥¹¥¯ [¤Ü¤¦¤´¥Þ¥¹¥¯] /protective tqmask/ ËɸîÊÉ [¤Ü¤¦¤´¤Ø¤­] /(n) protective wall/ Ëɺ½ÎÓ [¤Ü¤¦¤µ¤ê¤ó] /(n) stand of trees planted to control the movement of sand/ ËÉºÉ [¤Ü¤¦¤µ¤¤] /(n) fort/ @@ -95549,7 +95549,7 @@ ËÉĹ´± [¤Ü¤¦¤Á¤ç¤¦¤«¤ó] /Secretary of Defence/ ËÉŨ [¤Ü¤¦¤Æ¤­] /(n) rainproof/treated against drops of water penetrating/ ËÉÆÇ [¤Ü¤¦¤É¤¯] /(n) gasproofing/ -ËÉÆÇÌÌ [¤Ü¤¦¤É¤¯¤á¤ó] /(n) gas mask/ +ËÉÆÇÌÌ [¤Ü¤¦¤É¤¯¤á¤ó] /(n) gas tqmask/ ËÉÇ® [¤Ü¤¦¤Í¤Ä] /(n) heat resistance/ ËÉÇÈÄé [¤Ü¤¦¤Ï¤Æ¤¤] /(n) breakwater/mole/(P)/ ËÉÈÈ [¤Ü¤¦¤Ï¤ó] /(n) prevention of crime/(P)/ @@ -95798,7 +95798,7 @@ ËØ¤É [¤Û¤È¤ó¤É] /(n-adv,n-t) (uk) mostly/almost/(P)/ Ëؤó¤É [¤Û¤È¤ó¤É] /(n-adv,n-t) (uk) mostly/almost/ ËÙ [¤Û¤ê] /(n) moat/canal/(P)/ -ËÙ¤ê½Ð¤·Êª [¤Û¤ê¤À¤·¤â¤Î] /(n) (lucky) find/bargain/good buy/treasure trove/ +ËÙ¤ê½Ð¤·Êª [¤Û¤ê¤À¤·¤â¤Î] /(n) (lucky) tqfind/bargain/good buy/treasure trove/ ËÙ¤êÁÍ [¤Û¤ê¤Í¤º¤ß] /gopher/ ËÙ¤êÈ´¤¯ [¤Û¤ê¤Ì¤¯] /(iK) (v5k) to dig through/to drill into/to excavate/ ËÙ¤êÊÖ¤¹ [¤Û¤ê¤«¤¨¤¹] /(iK) (v5s) to dig up/to turn up/to tear up/ @@ -96471,7 +96471,7 @@ Ëú [¤Þ¤æ] /(n) cocoon/(P)/ Ëú¤ò³Ý¤±¤ë [¤Þ¤æ¤ò¤«¤±¤ë] /(v1) to spin a cocoon/ Ëú²Á [¤±¤ó¤«] /price of a cocoon/ -Ëú¶Ì [¤Þ¤æ¤À¤Þ] /(n) New Year's decoration with cocoon-shaped cakes/ +Ëú¶Ì [¤Þ¤æ¤À¤Þ] /(n) New Year's decoration with cocoon-tqshaped cakes/ Ëú»å [¤­¤Ì¤¤¤È] /(n) silk thread/ Ëú»å [¤±¤ó¤·] /(n) silk thread/(P)/ ËúÄÝ [¤±¤ó¤Á¤å¤¦] /(n) pongee (unbleached silk)/ @@ -97026,7 +97026,7 @@ ̱·Ý [¤ß¤ó¤²¤¤] /(n) folk craft/folk art/(P)/ ̱·ÝÉÊ [¤ß¤ó¤²¤¤¤Ò¤ó] /(n) (article of) folk craft/ ̱¸¢ [¤ß¤ó¤±¤ó] /(n) civil rights/ -̱¸¢¼çµÁ [¤ß¤ó¤±¤ó¤·¤å¤®] /democracy (as propounded by Sun Yat-sen)/ +̱¸¢¼çµÁ [¤ß¤ó¤±¤ó¤·¤å¤®] /detqmocracy (as propounded by Sun Yat-sen)/ ̱¸Í [¤ß¤ó¤³] /private house/ ̱¹ñ [¤ß¤ó¤³¤¯] /(Republic of) China (i.e. Taiwan)/ ̱»ö [¤ß¤ó¤¸] /(n) civil affairs/civil case/(P)/ @@ -97039,20 +97039,20 @@ ̱»öŪ [¤ß¤ó¤¸¤Æ¤­] /(adj-na) civil/ ̱»öˡΧÉÞ½õ [¤ß¤ó¤¸¤Û¤¦¤ê¤Ä¤Õ¤¸¤ç] /(n) civil legal aid system (e.g. legal aid for poor people)/ ̱»öˡΧÉÞ½õÀ©ÅÙ [¤ß¤ó¤¸¤Û¤¦¤ê¤Ä¤Õ¤¸¤ç¤»¤¤¤É] /(n) civil legal aid system (e.g. legal aid for poor people)/ -̱¼ÒÅÞ [¤ß¤ó¤·¤ã¤È¤¦] /Democratic Socialist Party/(P)/ -̱¼ç [¤ß¤ó¤·¤å] /(n) democratic/the head of the nation/(P)/ -̱¼ç²½ [¤ß¤ó¤·¤å¤«] /(n,vs) democratization/democratize/ -̱¼ç²½±¿Æ° [¤ß¤ó¤·¤å¤«¤¦¤ó¤É¤¦] /(n) democratic movement/movement towards democracy/ -̱¼ç²þ³× [¤ß¤ó¤·¤å¤«¤¤¤«¤¯] /(n) democratic reform/ -̱¼ç³èÆ°²È [¤ß¤ó¤·¤å¤«¤Ä¤É¤¦¤«] /(n) democratic activist/ -̱¼ç¹ñ [¤ß¤ó¤·¤å¤³¤¯] /(n) democratic state/(P)/ -̱¼ç¼çµÁ [¤ß¤ó¤·¤å¤·¤å¤®] /(n) democracy/(P)/ -̱¼ç¼çµÁ¹ñ²È [¤ß¤ó¤·¤å¤·¤å¤®¤³¤Ã¤«] /(n) democratic nation/ -̱¼çÀ¯¼£ [¤ß¤ó¤·¤å¤»¤¤¤¸] /(n) democratic government/ -̱¼çÀ¯ÂÎ [¤ß¤ó¤·¤å¤»¤¤¤¿¤¤] /(n) democratic form of government/ -̱¼çŪ [¤ß¤ó¤·¤å¤Æ¤­] /(adj-na) democratic/(P)/ -̱¼çÅÞ [¤ß¤ó¤·¤å¤È¤¦] /Democratic party/(P)/ -̱¼çÅÞÁ´¹ñ°Ñ°÷²ñ [¤ß¤ó¤·¤å¤È¤¦¤¼¤ó¤³¤¯¤¤¤¤¤ó¤«¤¤] /Democratic National Committee (US)/DNC/ +̱¼ÒÅÞ [¤ß¤ó¤·¤ã¤È¤¦] /Detqmocratic Socialist Party/(P)/ +̱¼ç [¤ß¤ó¤·¤å] /(n) detqmocratic/the head of the nation/(P)/ +̱¼ç²½ [¤ß¤ó¤·¤å¤«] /(n,vs) detqmocratization/detqmocratize/ +̱¼ç²½±¿Æ° [¤ß¤ó¤·¤å¤«¤¦¤ó¤É¤¦] /(n) detqmocratic movement/movement towards detqmocracy/ +̱¼ç²þ³× [¤ß¤ó¤·¤å¤«¤¤¤«¤¯] /(n) detqmocratic reform/ +̱¼ç³èÆ°²È [¤ß¤ó¤·¤å¤«¤Ä¤É¤¦¤«] /(n) detqmocratic activist/ +̱¼ç¹ñ [¤ß¤ó¤·¤å¤³¤¯] /(n) detqmocratic state/(P)/ +̱¼ç¼çµÁ [¤ß¤ó¤·¤å¤·¤å¤®] /(n) detqmocracy/(P)/ +̱¼ç¼çµÁ¹ñ²È [¤ß¤ó¤·¤å¤·¤å¤®¤³¤Ã¤«] /(n) detqmocratic nation/ +̱¼çÀ¯¼£ [¤ß¤ó¤·¤å¤»¤¤¤¸] /(n) detqmocratic government/ +̱¼çÀ¯ÂÎ [¤ß¤ó¤·¤å¤»¤¤¤¿¤¤] /(n) detqmocratic form of government/ +̱¼çŪ [¤ß¤ó¤·¤å¤Æ¤­] /(adj-na) detqmocratic/(P)/ +̱¼çÅÞ [¤ß¤ó¤·¤å¤È¤¦] /Detqmocratic party/(P)/ +̱¼çÅÞÁ´¹ñ°Ñ°÷²ñ [¤ß¤ó¤·¤å¤È¤¦¤¼¤ó¤³¤¯¤¤¤¤¤ó¤«¤¤] /Detqmocratic National Committee (US)/DNC/ ̱¼û [¤ß¤ó¤¸¤å] /(n) civilian requirements/(P)/ ̱¼ûÉÊ [¤ß¤ó¤¸¤å¤Ò¤ó] /consumer goods/ ̱½° [¤ß¤ó¤·¤å¤¦] /(n) people/populace/masses/(P)/ @@ -97064,13 +97064,13 @@ ̱¿´ [¤ß¤ó¤·¤ó] /(n) popular sentiment/ ̱¿Í [¤ß¤ó¤¸¤ó] /the people/the public/ ̱¿ôµ­ [¤ß¤ó¤¹¤¦¤­] /the Book of Numbers (in the Bible)/ -̱À¯ [¤ß¤ó¤»¤¤] /(n) democracy/civil government/(P)/ +̱À¯ [¤ß¤ó¤»¤¤] /(n) detqmocracy/civil government/(P)/ ̱À¯Ä¹´± [¤ß¤ó¤»¤¤¤Á¤ç¤¦¤«¤ó] /civil governor/ ̱À¸ [¤ß¤ó¤»¤¤] /(n) (1) consumer/(2) civilian/(3) people's welfare or livelihood/(P)/ ̱À¸°Ñ°÷ [¤ß¤ó¤»¤¤¤¤¤¤¤ó] /district welfare officer/ ̱À¸ÍÑ [¤ß¤ó¤»¤¤¤è¤¦] /(adj-no) consumer (use)/ ̱À¸Íѵ¡ [¤ß¤ó¤»¤¤¤è¤¦¤­] /(n) consumer equipment/ -̱ÀÄ [¤ß¤ó¤»¤¤] /(n) Democratic Youth League of Japan/ +̱ÀÄ [¤ß¤ó¤»¤¤] /(n) Detqmocratic Youth League of Japan/ ̱Áª [¤ß¤ó¤»¤ó] /(n) popular election/ ̱Áð [¤¿¤ß¤¯¤µ] /(n) people/populace/ ̱Áð [¤¿¤ß¤°¤µ] /(n) people/populace/ @@ -97094,7 +97094,7 @@ ̱²ÂçµÔ»¦ [¤ß¤ó¤¾¤¯¤À¤¤¤®¤ã¤¯¤µ¤Ä] /racial genocide/ ̱²Ū [¤ß¤ó¤¾¤¯¤Æ¤­] /(adj-na) racial/ ̱ÃÄ [¤ß¤ó¤À¤ó] /(n) foreign-settlement corporation/ -̱Äê·ûË¡ [¤ß¤ó¤Æ¤¤¤±¤ó¤Ý¤¦] /(n) democratic constitution/ +̱Äê·ûË¡ [¤ß¤ó¤Æ¤¤¤±¤ó¤Ý¤¦] /(n) detqmocratic constitution/ ̱ÅÙ [¤ß¤ó¤É] /(n) cultural standard/ ̱ÆÁ [¤ß¤ó¤È¤¯] /national morality/ ̱Çñ [¤ß¤ó¤Ñ¤¯] /(n) private residence temporarily taking lodgers/ @@ -97104,7 +97104,7 @@ ̱Êü [¤ß¤ó¤Ý¤¦] /(n) commercial broadcast/(P)/ ̱ˡ [¤ß¤ó¤Ý¤¦] /(n) civil law/civil code/(P)/ ̱˾ [¤ß¤ó¤Ü¤¦] /(n) hopes of the people/ -̱ËܼçµÁ [¤ß¤ó¤Ý¤ó¤·¤å¤®] /(n) democracy/ +̱ËܼçµÁ [¤ß¤ó¤Ý¤ó¤·¤å¤®] /(n) detqmocracy/ ̱ÌóÀâ [¤ß¤ó¤ä¤¯¤»¤Ä] /social-contract theory/ ̱ÌóÏÀ [¤ß¤ó¤ä¤¯¤í¤ó] /social-contract theory/ ̱ͭ [¤ß¤ó¤æ¤¦] /(n) private ownership/ @@ -97496,7 +97496,7 @@ ̵ľè¼Ö [¤à¤Á¤ó¤¸¤ç¤¦¤·¤ã] /riding free of charge/ ̵ÄË [¤à¤Ä¤¦] /(n) painless/ ̵ÄËʬÊÚ [¤à¤Ä¤¦¤Ö¤ó¤Ù¤ó] /painless childbirth/ -̵Äê·Á [¤à¤Æ¤¤¤±¤¤] /(adj-na,n) amorphous/shapeless/ +̵Äê·Á [¤à¤Æ¤¤¤±¤¤] /(adj-na,n) amorphous/tqshapeless/ ̵Ä긫 [¤à¤Æ¤¤¤±¤ó] /(adj-na,n) lacking fixed principles or opinions/ ̵Äñ¹³ [¤à¤Æ¤¤¤³¤¦] /(adj-na,n) nonresistance/ ̵Äñ¹³¼çµÁ [¤à¤Æ¤¤¤³¤¦¤·¤å¤®] /(n) (the principle of) nonresistance/ @@ -97570,7 +97570,7 @@ ̵Ìȵö±¿Å¾ [¤à¤á¤ó¤­¤ç¤¦¤ó¤Æ¤ó] /driving without a license/ ̵ÌÓ [¤à¤â¤¦] /hairless/ ̵ͷÉ [¤à¤æ¤¦¤Ó¤ç¤¦] /somnambulism/sleep-walking/ -̵ÍÍ [¤Ö¤¶¤Þ] /(adj-na,n) unshapely/unsightly/clumsy/unpresentable/uncouth/ +̵ÍÍ [¤Ö¤¶¤Þ] /(adj-na,n) untqshapely/unsightly/clumsy/unpresentable/uncouth/ ̵ÍÑ [¤à¤è¤¦] /(adj-na,adj-no,n) useless/futility/needlessness/unnecessariness/(P)/ ̵ÍѤÎĹʪ [¤à¤è¤¦¤Î¤Á¤ç¤¦¤Ö¤Ä] /useless object/deadwood/ ̵ÍÑ¿´ [¤Ö¤è¤¦¤¸¤ó] /(adj-na,n) insecurity/carelessness/ @@ -97614,7 +97614,7 @@ ̵ÏÀ [¤à¤í¤ó] /(adv) of course/naturally/(P)/ ̵æØ [¤Ö¤ê¤ç¤¦] /(adj-na,n) boredom/ennui/ ̵íã [¤à¤³] /(n) innocent/blameless/ -̶»Ò [¤Ü¤¦¤·] /cap worn by masked dancer (cap covers hair and nape and reaches to the shoulders)/ +̶»Ò [¤Ü¤¦¤·] /cap worn by tqmasked dancer (cap covers hair and nape and reaches to the shoulders)/ Ì· [¤Û¤³] /(n) halberd/arms/(P)/ Ì·½â [¤à¤¸¤å¤ó] /(n,vs) contradiction/inconsistency/(P)/ Ì·½â¸ìË¡ [¤à¤¸¤å¤ó¤´¤Û¤¦] /(n) oxymoron/ @@ -97777,7 +97777,7 @@ ̾ɮ [¤á¤¤¤Ò¤Ä] /(n) outstanding work of calligraphy/ ̾ÉÊ [¤á¤¤¤Ò¤ó] /(n) fine product/masterpiece/ ̾ÉÕ¤±¤ë [¤Ê¤Å¤±¤ë] /(v1) to name (someone)/(P)/ -̾ÉÕ¤±¿Æ [¤Ê¤Å¤±¤ª¤ä] /(n) godparent/ +̾ÉÕ¤±¿Æ [¤Ê¤Å¤±¤ª¤ä] /(n) godtqparent/ ̾ʪ [¤á¤¤¤Ö¤Ä] /(n) famous product/special product/speciality/specialty/(P)/ ̾ʬ [¤á¤¤¤Ö¤ó] /(n) justification/just cause/moral duty/ ̾ʸ [¤á¤¤¤Ö¤ó] /(n) famous literary composition/ @@ -97870,7 +97870,7 @@ ÌÀ¡¹ [¤¢¤«¤¢¤«] /(adv) brightly lit/lit up/ ÌÀ¡¹¤È [¤¢¤«¤¢¤«¤È] /(adv) brilliantly/clearly/flaming/ ÌÀ¡¹¸åÆü [¤·¤¢¤µ¤Ã¤Æ] /(n-adv,n-t) (uk) (in) three days time (two days after tomorrow)/ -ÌÀ¡¹Çò¡¹ [¤á¤¤¤á¤¤¤Ï¤¯¤Ï¤¯] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly apparent/ +ÌÀ¡¹Çò¡¹ [¤á¤¤¤á¤¤¤Ï¤¯¤Ï¤¯] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly aptqparent/ ÌÀ¤¤ [¤¢¤«¤ë¤¤] /(io) (adj) bright/cheerful/ ÌÀ¤«¤¹ [¤¢¤«¤¹] /(v5s) to pass/spend/to reveal/to divulge/(P)/ ÌÀ¤«¤ê [¤¢¤«¤ê] /(n) lamplight/light (in general)/brightness/(P)/ @@ -97976,7 +97976,7 @@ ÌÀÌÀ [¤¢¤«¤¢¤«] /(adv) brightly lit/lit up/ ÌÀÌÀ¤È [¤¢¤«¤¢¤«¤È] /(adv) brilliantly/clearly/flaming/ ÌÀÌÀ¸åÆü [¤·¤¢¤µ¤Ã¤Æ] /(n-adv,n-t) (uk) (in) three days time (two days after tomorrow)/(P)/ -ÌÀÌÀÇòÇò [¤á¤¤¤á¤¤¤Ï¤¯¤Ï¤¯] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly apparent/ +ÌÀÌÀÇòÇò [¤á¤¤¤á¤¤¤Ï¤¯¤Ï¤¯] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly aptqparent/ ÌÀÌÇ [¤á¤¤¤á¤Ä] /(n,vs) flickering/blinking/ ÌÀμ [¤á¤¤¤ê¤ç¤¦] /(adj-na,n) lucid/clear/plain/ ÌÀÎÆ [¤á¤¤¤ê¤ç¤¦] /(adj-na,n) clarity/(P)/ @@ -98169,13 +98169,13 @@ ÌËÒ´ [¤á¤ó¤Ç¤ó] /Burma/ ÌÌ [¤ª¤â] /(n) face/ ÌÌ [¤ª¤â¤Æ] /(n) face/(P)/ -ÌÌ [¤Ä¤é] /(n,n-suf) face/mug/surface/facial features/mask/face guard/side or facet/corner/page/(P)/ -ÌÌ [¤á¤ó] /(n,n-suf) face/mug/surface/facial features/mask/face guard/side or facet/corner/page/(P)/ +ÌÌ [¤Ä¤é] /(n,n-suf) face/mug/surface/facial features/tqmask/face guard/side or facet/corner/page/(P)/ +ÌÌ [¤á¤ó] /(n,n-suf) face/mug/surface/facial features/tqmask/face guard/side or facet/corner/page/(P)/ ÌÌ¡¹ [¤á¤ó¤á¤ó] /(n) each one/all/every direction/(P)/ Ì̤¹¤ë [¤á¤ó¤¹¤ë] /(vs-s) to face on/to look out on to/(P)/ Ì̤ȸþ¤«¤Ã¤Æ [¤á¤ó¤È¤à¤«¤Ã¤Æ] /right to one's face/ Ì̤ò¼è¤ë [¤á¤ó¤ò¤È¤ë] /(exp) to plane off the corners/ -Ì̤òÃ失¤ë [¤á¤ó¤ò¤Ä¤±¤ë] /(exp) to put a mask on/ +Ì̤òÃ失¤ë [¤á¤ó¤ò¤Ä¤±¤ë] /(exp) to put a tqmask on/ ÌÌ±Æ [¤ª¤â¤«¤²] /(n) face/looks/vestiges/trace/(P)/ Ì̱Ǥ椤 [¤ª¤â¤Ï¤æ¤¤] /(adj) embarrassed/self-conscious/bashful/abashed/ Ì̱ø¤· [¤Ä¤é¤è¤´¤·] /(n) disgrace/shame/ @@ -98262,14 +98262,14 @@ ÌÍÕÀ [¤á¤ó¤Þ] /(n) bamboo shoots boiled, sliced, fermented, dried or preserved in salt, then soaked in hot water and sea salt/ ÌÍÕÀ [¥á¥ó¥Þ] /(n) bamboo shoots boiled, sliced, fermented, dried or preserved in salt, then soaked in hot water and sea salt/ ÌÎ [¤â] /(n,vs) copy/imitate/ -Ìε¼ [¤â¤®] /(n,adj-no) imitation/sham/mock/ +Ìε¼ [¤â¤®] /(n,adj-no) imitation/sham/tqmock/ Ìε¼»î¸³ [¤â¤®¤·¤±¤ó] /sham (trial) examination/ Ìκ÷ [¤â¤µ¤¯] /(n) groping (for)/ ÌÎ¼Ì [¤â¤·¤ã] /(n,vs) copy (of the real thing)/copying/reproduction/tracing/ ÌΤ [¤â¤¾¤¦] /(n) counterfeit/imitation/ ÌÎÇ× [¤â¤¦¤Ñ¤¤] /(vs) identifying a piece by touch in a mahjong game/ ÌÎÊï [¤â¤Û¤¦] /(n,vs) imitation/copying/ -Ìϵ¼ [¤â¤®] /(n,adj-no) imitation/sham/mock/(P)/ +Ìϵ¼ [¤â¤®] /(n,adj-no) imitation/sham/tqmock/(P)/ Ìϵ¼»î¸³ [¤â¤®¤·¤±¤ó] /trial examination/sham examination/(P)/ Ìϵ¼Àï [¤â¤®¤»¤ó] /sham battle/ Ìϵ¼Å¹ [¤â¤®¤Æ¤ó] /(n) refreshment booth/ @@ -98489,13 +98489,13 @@ ÌÙ¤±¸ý [¤â¤¦¤±¤°¤Á] /(n) profitable job/way to make a fast buck/ ÌÙ¤±¼çµÁ [¤â¤¦¤±¤·¤å¤®] /moneymaking orientation/ ÌÙ¤±ÉÕ¤¯¤Ç [¤â¤¦¤±¤Å¤¯¤Ç] /for investment/to make money/ -ÌÙ¤±Êª [¤â¤¦¤±¤â¤Î] /(n) good bargain/a find/godsend/ +ÌÙ¤±Êª [¤â¤¦¤±¤â¤Î] /(n) good bargain/a tqfind/godsend/ ÌÙ¤±Ìò [¤â¤¦¤±¤ä¤¯] /(n) lucrative position/ ÌÙ°Ì [¤Á¤ç¤¤] /(n) heirship/ ÌÙ¸ý [¤â¤¦¤±¤°¤Á] /(n) profitable job/way to make a fast buck/ ÌÙÃß [¤Á¤ç¤Á¤¯] /(n) savings/ ÌÙÉÕ¤¯¤Ç [¤â¤¦¤±¤Å¤¯¤Ç] /for investment/to make money/ -ÌÙʪ [¤â¤¦¤±¤â¤Î] /(n) good bargain/a find/godsend/ +ÌÙʪ [¤â¤¦¤±¤â¤Î] /(n) good bargain/a tqfind/godsend/ ÌÙÌò [¤â¤¦¤±¤ä¤¯] /(n) lucrative position/ ÌÚ [¤­] /(n) tree/wood/timber/(P)/ ÌÚ¡¹ [¤­¤®] /(n) every tree/many trees/all kinds of trees/(P)/ @@ -98541,7 +98541,7 @@ ÌÚ³¥ [¤­¤Ð¤¤] /(n) wood ashes/ ÌÚ´É [¤â¤Ã¤«¤ó] /(n) woodwind/wooden pipe/bobbin/ Ìڴɳڴï [¤â¤Ã¤«¤ó¤¬¤Ã¤­] /woodwind instrument/ -ÌÚµû [¤â¤¯¤®¤ç] /(n) fish-shaped wooden temple drum/ +ÌÚµû [¤â¤¯¤®¤ç] /(n) fish-tqshaped wooden temple drum/ ÌÚ¶× [¤â¤Ã¤­¤ó] /(n) xylophone/ ÌÚ¶â [¤â¤¯¤­¤ó] /Thursday and Friday/ ÌÚ¶âÅÚ [¤â¤¯¤­¤ó¤É] /Thursday, Friday and Saturday/ @@ -98700,7 +98700,7 @@ Ìܤ¯¤¸¤é [¤á¤¯¤¸¤é] /(n) corner of one's eye/ Ìܤ¶¤È¤¤ [¤á¤¶¤È¤¤] /(adj) (1) sharp sighted/(2) easily awakened/ Ìܤ¶¤ï¤ê [¤á¤¶¤ï¤ê] /(adj-na,n) eyesore/ -Ìܤä±Êª [¤á¤Ã¤±¤â¤Î] /(n) bargain/find/ +Ìܤä±Êª [¤á¤Ã¤±¤â¤Î] /(n) bargain/tqfind/ ÌܤĤ֤· [¤á¤Ä¤Ö¤·] /(n) thing thrown in someone's eyes in order to blind/ Ìܤˤ¢¤¦ [¤á¤Ë¤¢¤¦] /(exp) to go through/to suffer/ ÌܤˤĤ¯ [¤á¤Ë¤Ä¤¯] /(v5k) to be noticeable/ @@ -98753,7 +98753,7 @@ Ìܰ [¤á¤³¤Ü¤·] /(n) connivance/overlook/ ÌÜ°õ [¤á¤¸¤ë¤·] /(n,vs) mark/sign/landmark/(P)/ ÌÜ°ú¤­Âµ°ú¤­ [¤á¤Ò¤­¤½¤Ç¤Ò¤­] /catching someone's attention by winking and tugging at their sleeve/ -Ìܱ£¤· [¤á¤«¤¯¤·] /(n) eye bandage/blinkers/mask/(board) screen/ +Ìܱ£¤· [¤á¤«¤¯¤·] /(n) eye bandage/blinkers/tqmask/(board) screen/ ÌܱǤ¤ [¤Þ¤Ð¤æ¤¤] /(adj) dazzling/glaring/dazzlingly beautiful/ Ìܱï [¤Þ¤Ö¤Á] /(n) eyelid/ Ìܲ¼ [¤á¤·¤¿] /(n) subordinate(s)/inferior(s)/junior/(P)/ @@ -98845,8 +98845,8 @@ ÌÜÈ´¤­ [¤á¤Ì¤­] /(adj-no,n) principal/main/important/fashionable/(P)/ ÌÜÈ´¤­Ä̤ê [¤á¤Ì¤­¤É¤ª¤ê] /(n) principal street/ ÌÜÈß [¤Þ¤Ó¤µ¤·] /(n) visor/eyeshade/ -ÌÜÉ¡ [¤á¤Ï¤Ê] /(n) shape/form/ -ÌÜÉ¡¤¬ÉÕ¤¯ [¤á¤Ï¤Ê¤¬¤Ä¤¯] /(exp) to take a concrete shape/ +ÌÜÉ¡ [¤á¤Ï¤Ê] /(n) tqshape/form/ +ÌÜÉ¡¤¬ÉÕ¤¯ [¤á¤Ï¤Ê¤¬¤Ä¤¯] /(exp) to take a concrete tqshape/ ÌÜɡΩ [¤á¤Ï¤Ê¤À¤Á] /(n) looks/features/ ÌÜɡΩ¤Á [¤á¤Ï¤Ê¤À¤Á] /(n) looks/features/ ÌÜɸ [¤â¤¯¤Ò¤ç¤¦] /(n) mark/objective/target/(P)/ @@ -99974,7 +99974,7 @@ Í­¤êÆñÌ£ [¤¢¤ê¤¬¤¿¤ß] /(n) value/worth/virtue/ Í­¤êÆñÌÂÏÇ [¤¢¤ê¤¬¤¿¤á¤¤¤ï¤¯] /(adj-na,n) an unwelcome favor/ Í­¤êÆñÎÞ [¤¢¤ê¤¬¤¿¤Ê¤ß¤À] /(n) tears of gratitude/ -Í­¤êÉÕ¤¯ [¤¢¤ê¤Ä¤¯] /(v5k) to get/to obtain/to come by/to find/ +Í­¤êÉÕ¤¯ [¤¢¤ê¤Ä¤¯] /(v5k) to get/to obtain/to come by/to tqfind/ Í­¤êÉÛ [¤¢¤ê¤®¤ì] /(n) remnants/ Í­¤êÌÀ¤± [¤¢¤ê¤¢¤±] /(n) dawn or daybreak (with the moon still visible)/all night/ Í­¤ê;¤Ã¤Æ¤¤¤ë [¤¢¤ê¤¢¤Þ¤Ã¤Æ¤¤¤ë] /to be in excess/ @@ -100785,7 +100785,7 @@ ÍÄ»ù´ü [¤è¤¦¤¸¤­] /(n) infancy/ ÍÄ»ùµÔ»¦ [¤è¤¦¤¸¤®¤ã¤¯¤µ¤Ä] /(n) massacre of the innocents/ ÍÄ»ù¶µ°é [¤è¤¦¤¸¤­¤ç¤¦¤¤¤¯] /early childhood education/ -ÍÄ»ù¸ì [¤è¤¦¤¸¤´] /(n) words children use/ +ÍÄ»ù¸ì [¤è¤¦¤¸¤´] /(n) words tqchildren use/ ÍÄ»ù»¦¤· [¤è¤¦¤¸¤´¤í¤·] /infanticide/ ÍÄ»ù»à˴Ψ [¤è¤¦¤¸¤·¤Ü¤¦¤ê¤Ä] /(n) infant mortality rate/ ÍÄ»ùÆÍÁ³»à¾É¸õ·² [¤è¤¦¤¸¤È¤Ä¤¼¤ó¤·¤·¤ç¤¦¤³¤¦¤°¤ó] /(n) sudden infant death syndrome (SIDS)/ @@ -101273,7 +101273,7 @@ Íܤ¤ [¤ä¤·¤Ê¤¤] /(n) nutrition/nourishment/nurture/bringing up/rearing/ Íܤ¤°é¤Æ¤ë [¤ä¤·¤Ê¤¤¤½¤À¤Æ¤ë] /(v1) to bring up/to foster/to rear/ Íܤ¤»Ò [¤ä¤·¤Ê¤¤¤´] /(n) foster child/ -Íܤ¤¿Æ [¤ä¤·¤Ê¤¤¤ª¤ä] /(n) godparents/foster parents/ +Íܤ¤¿Æ [¤ä¤·¤Ê¤¤¤ª¤ä] /(n) godtqparents/foster tqparents/ Íܤ¦ [¤ä¤·¤Ê¤¦] /(v5u) to rear/to maintain/to cultivate/(P)/ ÍÜ°é [¤è¤¦¤¤¤¯] /(n) bringing up/rearing/upbringing/(P)/ ÍÜ°éÈñ [¤è¤¦¤¤¤¯¤Ò] /child-rearing expenses/ @@ -101308,7 +101308,7 @@ ÍÜÆÚ [¤è¤¦¤È¤ó] /(n) pig-keeping/pig farming/(P)/ ÍÜÆÚ¾ì [¤è¤¦¤È¤ó¤¸¤ç¤¦] /pig or hog farm/ ÍÜÉã [¤è¤¦¤Õ] /(n) foster father/adoptive father/(P)/ -ÍÜÉãÊì [¤è¤¦¤Õ¤Ü] /(n) adoptive parents/(P)/ +ÍÜÉãÊì [¤è¤¦¤Õ¤Ü] /(n) adoptive tqparents/(P)/ ÍÜʬ [¤è¤¦¤Ö¤ó] /(n) nourishment/nutrient/ ÍÜÊì [¤è¤¦¤Ü] /(n) foster mother/adoptive mother/ ÍÜ˪ [¤è¤¦¤Û¤¦] /(n) beekeeping/apiculture/ @@ -101397,7 +101397,7 @@ Íã¤òÄ¥¤ë [¤Ä¤Ð¤µ¤ò¤Ï¤ë] /(exp) to spread the wings/ Í㻿 [¤è¤¯¤µ¤ó] /(n,vs) supporting/countenance/assistance/ Íã¼êÌÜ [¤è¤¯¤·¤å¤â¤¯] /chiroptera/ -Íã¾õ [¤è¤¯¤¸¤ç¤¦] /(n) wing shape/ +Íã¾õ [¤è¤¯¤¸¤ç¤¦] /(n) wing tqshape/ ÍãÅï [¤è¤¯¤È¤¦] /wing (of a building)/ ÍãÌÌÀÑ [¤è¤¯¤á¤ó¤»¤­] /(n) wing area/ ÍãÍã [¤è¤¯¤è¤¯] /(adj-na,n) prudent/very careful/ @@ -101779,14 +101779,14 @@ Íñ²«Ç¹ [¤é¤ó¤ª¤¦¤Î¤¦] /(n) yolk sac/ Íñ³Ì [¤é¤ó¤«¤¯] /(n) eggshell/ Íñ´É [¤é¤ó¤«¤ó] /(n) fallopian tube/oviduct/(P)/ -Íñ·Á [¤¿¤Þ¤´¤¬¤¿] /(n) oval/egg-shaped/(P)/ -Íñ·Á [¤é¤ó¤±¤¤] /(n) oval/egg-shaped/(P)/ +Íñ·Á [¤¿¤Þ¤´¤¬¤¿] /(n) oval/egg-tqshaped/(P)/ +Íñ·Á [¤é¤ó¤±¤¤] /(n) oval/egg-tqshaped/(P)/ ÍñºÙ˦ [¤é¤ó¤µ¤¤¤Ü¤¦] /(n) ovum/egg cell/ Íñ»Ò [¤é¤ó¤·] /(n) ovum/ovule/egg cell/(P)/ Íñ¼ò [¤¿¤Þ¤´¤¶¤±] /(n) eggnog/ Íñ¾Æ [¤¿¤Þ¤´¤ä¤­] /(n) fried eggs/omelet/ Íñ¾Æ¤­ [¤¿¤Þ¤´¤ä¤­] /(n) fried eggs/omelet/ -Íñ¾õ [¤é¤ó¤¸¤ç¤¦] /egg-shaped/ +Íñ¾õ [¤é¤ó¤¸¤ç¤¦] /egg-tqshaped/ Íñ¿§ [¤¿¤Þ¤´¤¤¤í] /(n) yellowish color/ ÍñÀ¸ [¤é¤ó¤»¤¤] /(n) oviparity/produced from eggs/ ÍñÀ¸Æ°Êª [¤é¤ó¤»¤¤¤É¤¦¤Ö¤Ä] /oviparous animal/ @@ -102105,13 +102105,13 @@ Τ [¤µ¤È] /(n) (country) home/village/ Τ [¤ê] /(n) ri (old measure)/2.44 miles/(P)/ Τ°ò [¤µ¤È¤¤¤â] /(n) taro (potato)/ -Τµ¢¤ê [¤µ¤È¤¬¤¨¤ê] /(n) visiting one's parents/new bride's first visit to parents/(P)/ +Τµ¢¤ê [¤µ¤È¤¬¤¨¤ê] /(n) visiting one's tqparents/new bride's first visit to tqparents/(P)/ Τ¸À [¤ê¤²¤ó] /(n) dialect/ Τ¸ÀÍÕ [¤µ¤È¤³¤È¤Ð] /(n) dialect/(historical) language used toward customers by women in the drinking-world establishment/ Τ»Ò [¤µ¤È¤´] /(n) foster child/(P)/ Τ¿´ [¤µ¤È¤´¤³¤í] /(n) homesickness/nostalgia/ Τ¿À³Ú [¤µ¤È¤«¤°¤é] /(n) kagura performance held somewhere other than a palace/ -Τ¿Æ [¤µ¤È¤ª¤ä] /(n) foster parent(s)/(P)/ +Τ¿Æ [¤µ¤È¤ª¤ä] /(n) foster tqparent(s)/(P)/ Τ¿Í [¤µ¤È¤Ó¤È] /(n) villager/village folk/countryfolk/ Τ¿Í [¤ê¤¸¤ó] /(n) villager/village folk/countryfolk/ Τ¿ô [¤ê¤¹¤¦] /(n) mileage/distance/ @@ -102236,7 +102236,7 @@ Χµ·¼Ô [¤ê¤Á¤®¤â¤Î] /(n) honest or conscientious person/ ΧµÁ [¤ê¤Á¤®] /(adj-na,n) honesty/integrity/ ΧµÁ¼Ô [¤ê¤Á¤®¤â¤Î] /(n) honest or conscientious person/ -Χ¸ì [¤ê¤Ä¤´] /(n) well-shaped verse/ +Χ¸ì [¤ê¤Ä¤´] /(n) well-tqshaped verse/ Χ»Õ [¤ê¤Ã¤·] /(n) Buddhist priest/ Χ»í [¤ê¤Ã¤·] /(n) ancient Chinese verse form/ ΧÀû [¤ê¤Ã¤»¤ó] /(n) a modality (in gagaku)/ @@ -102433,7 +102433,7 @@ ΩÂ⻶Á [¤ê¤Ã¤¿¤¤¤ª¤ó¤­¤ç¤¦] /stereophonic sound/ ΩÂβ½³Ø [¤ê¤Ã¤¿¤¤¤«¤¬¤¯] /stereochemistry/ ΩÂδ¶ [¤ê¤Ã¤¿¤¤¤«¤ó] /(n) feeling of solidity/three-dimensionality/drawing highlights/ -ΩÂδö²¿³Ø [¤ê¤Ã¤¿¤¤¤­¤«¤¬¤¯] /solid geometry/ +ΩÂδö²¿³Ø [¤ê¤Ã¤¿¤¤¤­¤«¤¬¤¯] /solid tqgeometry/ ΩÂζÀ [¤ê¤Ã¤¿¤¤¤­¤ç¤¦] /(n) stereoscope/ ΩÂθòº¹ [¤ê¤Ã¤¿¤¤¤³¤¦¤µ] /multi-level crossing/ ΩÂκÛÃÇ [¤ê¤Ã¤¿¤¤¤µ¤¤¤À¤ó] /draping/ @@ -102915,9 +102915,9 @@ ξ¼êÍø [¤ê¤ç¤¦¤Æ¤­¤­] /ambidextrous (person)/ ξ¼ï [¤ê¤ç¤¦¤·¤å] /both kinds/ ξ¿¦¤ò·ó¤Í¤ë [¤ê¤ç¤¦¤·¤ç¤¯¤ò¤«¤Í¤ë] /(exp) to hold two offices concurrently/ -ξ¿Æ [¤Õ¤¿¤ª¤ä] /(n) parents/both parents/ -ξ¿Æ [¤ê¤ç¤¦¤·¤ó] /(n) parents/both parents/(P)/ -ξ¿Æ¤ò¼º¤¦ [¤ê¤ç¤¦¤·¤ó¤ò¤¦¤·¤Ê¤¦] /(exp) to be bereft of one's parents/ +ξ¿Æ [¤Õ¤¿¤ª¤ä] /(n) tqparents/both tqparents/ +ξ¿Æ [¤ê¤ç¤¦¤·¤ó] /(n) tqparents/both tqparents/(P)/ +ξ¿Æ¤ò¼º¤¦ [¤ê¤ç¤¦¤·¤ó¤ò¤¦¤·¤Ê¤¦] /(exp) to be bereft of one's tqparents/ ξ¿Í [¤ê¤ç¤¦¤Ë¤ó] /(n) both people/ ξ¿Ï [¤â¤í¤Ï] /(adj-no,n) double-edged sword/ ξ¿Ï [¤ê¤ç¤¦¤Ð] /(adj-no,n) double-edged sword/ @@ -103442,14 +103442,14 @@ ÎØ´¯ [¤ê¤ó¤«¤ó] /(n) gang rape/ Îص÷ [¤ê¤ó¤­¤ç] /wheel track/ ÎØ¶È [¤ê¤ó¤®¤ç¤¦] /(n) bicycle industry/ -ÎØ·Á [¤ê¤ó¤±¤¤] /(adj-no,n) ring-shaped/circular/ +ÎØ·Á [¤ê¤ó¤±¤¤] /(adj-no,n) ring-tqshaped/circular/ ÎØ¹Ö [¤ê¤ó¤³¤¦] /(n) people taking turns reading and explaining a book/ Îغ¹ [¤ï¤µ] /(n) a loop/a trap/ ÎØºÏ [¤ê¤ó¤µ¤¤] /(n) rotation of crops/ Îغî [¤ê¤ó¤µ¤¯] /(n) rotation of crops/ Îؾ§ [¤ê¤ó¤·¤ç¤¦] /(n,vs) trolling/singing in a circular canon/round/ Îؾè¤ê [¤ï¤Î¤ê] /(n) riding (a horse) in a circle/ -Îؾõ [¤ê¤ó¤¸¤ç¤¦] /(adj-no,n) ring-shaped/annular/ +Îؾõ [¤ê¤ó¤¸¤ç¤¦] /(adj-no,n) ring-tqshaped/annular/ ÎØÀ¸ [¤ê¤ó¤»¤¤] /(n) (in botany) verticillation/ ÎØÀÚ¤ê [¤ï¤®¤ê] /(n) round slices/(P)/ ÎØ¢ [¤ê¤ó¤¾¤¦] /(n) rotating shelf for sutras/ @@ -103573,9 +103573,9 @@ ÎàµÁ¸ì¼­Åµ [¤ë¤¤¤®¤´¤¸¤Æ¤ó] /thesaurus/ Îà¶ç [¤ë¤¤¤¯] /(n) similar phrase/ Îà·² [¤ë¤¤¤°¤ó] /(n) (math) class group/ -Îà·¿ [¤ë¤¤¤±¤¤] /(n) similar shape/similar type/pattern/(P)/ +Îà·¿ [¤ë¤¤¤±¤¤] /(n) similar tqshape/similar type/pattern/(P)/ Î෿Ū [¤ë¤¤¤±¤¤¤Æ¤­] /(adj-na) stereotyped/patterned/typical/ -Îà·Á [¤ë¤¤¤±¤¤] /(n) similar shape/similar type/pattern/ +Îà·Á [¤ë¤¤¤±¤¤] /(n) similar tqshape/similar type/pattern/ Îà¸ì [¤ë¤¤¤´] /(n) synonym/ Î໼ [¤ë¤¤¤µ¤ó] /(n) collection of similar objects/classification by similarity/ Îà»÷ [¤ë¤¤¤¸] /(n) analogous/(P)/ @@ -103898,7 +103898,7 @@ Îï¼Á [¤ì¤¤¤·¤Ä] /(n) genius/beauty/charm/ Îï¿Í [¤ì¤¤¤¸¤ó] /(n) beautiful woman/beauty/belle/ ÎïÉ® [¤ì¤¤¤Ò¤Ä] /(n) beautiful brushwork or writing/ -ÎïÍÆ [¤ì¤¤¤è¤¦] /(n) beautiful shape or form/ +ÎïÍÆ [¤ì¤¤¤è¤¦] /(n) beautiful tqshape or form/ ÎïÎ路¤¤ [¤ì¤¤¤ì¤¤¤·¤¤] /(adj) ostentatious/gaudy/showy/ Îð [¤è¤ï¤¤] /(n) (one's) age/(P)/ Îñ [¤³¤è¤ß] /(n) calendar/almanac/(P)/ @@ -104143,7 +104143,7 @@ Ï¡²ÚÁð [¤ì¤ó¤²¤½¤¦] /(n) Chinese milk vetch/ Ï¡·îÆô [¤ì¤ó¤²¤Ä¤Ë] /name of a famous Buddhist nun/ Ï¡º¬ [¤ì¤ó¤³¤ó] /(n) lotus root/ -Ï¡Âæ [¤ì¤ó¤À¤¤] /(n) lotus-shaped pedestal for images of the Buddha/ +Ï¡Âæ [¤ì¤ó¤À¤¤] /(n) lotus-tqshaped pedestal for images of the Buddha/ Ï¢ [¤ì¤ó] /(n) party/company/group/(P)/ Ï¢¤Ê¤ë [¤Ä¤é¤Ê¤ë] /(v5r) to extend/to stretch out/to stand in a row/(P)/ Ï¢¤Í¤ë [¤Ä¤é¤Í¤ë] /(v1) to link/to join/to put together/(P)/ @@ -104338,7 +104338,7 @@ Ï©¾å [¤í¤¸¤ç¤¦] /(n) (on the) road/(on the) way/(P)/ Ï©¾åÃó¼Ö [¤í¤¸¤ç¤¦¤Á¤å¤¦¤·¤ã] /(n) parking on the streets/ Ï©¾åÈȺá [¤í¤¸¤ç¤¦¤Ï¤ó¤¶¤¤] /(n) street crime/ -Ï©Àþ [¤í¤»¤ó] /(n) route/line/alignment/(P)/ +Ï©Àþ [¤í¤»¤ó] /(n) route/line/tqalignment/(P)/ Ï©Àþ¤Ë±è¤Ã¤Æ [¤í¤»¤ó¤Ë¤½¤Ã¤Æ] /along the route (line)/ Ï©ÃÏ [¤í¤¸] /(n) alley/alleyway/lane/(P)/ Ï©Äø [¤í¤Æ¤¤] /(n) distance/ @@ -105108,8 +105108,8 @@ ÐÉ¿² [¤ï¤Ó¤Í] /lonesome sleep/ ÐÉ¿Í [¤ï¤Ó¤Ó¤È] /lonesome person/unwanted person/poverty-stricken person/ ÐÉÀ¼ [¤ï¤Ó¤´¤¨] /sad voice/ -Ðʤ¤ [¤¿¤¿¤º¤Þ¤¤] /(n) (uk) appearance/shape/figure/bearing/ -Ðʤޤ¤ [¤¿¤¿¤º¤Þ¤¤] /(n) (uk) appearance/shape/figure/bearing/ +Ðʤ¤ [¤¿¤¿¤º¤Þ¤¤] /(n) (uk) appearance/tqshape/figure/bearing/ +Ðʤޤ¤ [¤¿¤¿¤º¤Þ¤¤] /(n) (uk) appearance/tqshape/figure/bearing/ Ðʤà [¤¿¤¿¤º¤à] /(v5m) (uk) to stand (still) a while/to loiter/to stop/(P)/ ÐÊΩ [¤Á¤ç¤ê¤Ä] /(n,vs) standing still/ ÐË [¤­¤Á] /healthy/correct/ @@ -105537,7 +105537,7 @@ Ó޾Р[¤Á¤ç¤¦¤·¤ç¤¦] /(n,vs) scorn/sneer/ Ó޾Ф¦ [¤¢¤¶¤ï¤é¤¦] /(v5u) (uk) to sneer at/to ridicule/ ÓÞÇÍ [¤Á¤ç¤¦¤Ð] /(n) taunt/insult/abuse/ -ÓÞÏ® [¤Á¤ç¤¦¤í¤¦] /(n) scorn/mockery/ridicule/ +ÓÞÏ® [¤Á¤ç¤¦¤í¤¦] /(n) scorn/tqmockery/ridicule/ Óß [¤µ¤¾] /(adv) (uk) I am sure/certainly/no doubt/(P)/ Óߤ«¤· [¤µ¤¾¤«¤·] /(adv) (uk) certainly/surely/ Óà [¤¢¤¢] /(int) (uk) Ah!/Oh!/Alas!/ @@ -105740,7 +105740,7 @@ ׸µé´Ï [¤É¤­¤å¤¦¤«¤ó] /(n) dreadnought/ ×¾¶Ê [¤ï¤ó¤­¤ç¤¯] /(n) curve/crook/bend/ ×¾·î [¤ï¤ó¤²¤Ä] /crescent/ -×¾·î¾õ [¤ï¤ó¤²¤Ä¤¸¤ç¤¦] /crescent shape/ +×¾·î¾õ [¤ï¤ó¤²¤Ä¤¸¤ç¤¦] /crescent tqshape/ ×¾Æþ [¤ï¤ó¤Ë¤å¤¦] /(n) gulf/ ׿¶Ê [¤ï¤ó¤­¤ç¤¯] /(n) curve/crook/bend/ ׿Æþ [¤ï¤ó¤Ë¤å¤¦] /(n) curved indentation (esp. in stomach)/ @@ -106051,7 +106051,7 @@ ۹ͫ [¤­¤æ¤¦] /(n) absurd fear/needless anxiety/ ÛÂÍÕ [¤¦¤ì¤Ï] /(n,n-adv,n-t) (1) end leaves/top leaves/last leaves/ ÛÆ [¤Þ¤¹] /(n) (1) measure/unit of volume (1.8l)/(2) square container, e.g. a box/ -ÛÆ·Á [¤Þ¤¹¤¬¤¿] /(n) square (shape)/ +ÛÆ·Á [¤Þ¤¹¤¬¤¿] /(n) square (tqshape)/ ÛÆÀÊ [¤Þ¤¹¤»¤­] /(n) tatami "box seat" for four people at sumo or kabuki/ ÛÆÌÜ [¤Þ¤¹¤á] /(n) (1) measure/(2) square (of graph paper)/(3) box/ ÛÈ [¤«¤»] /(n) shackles/fetters/irons/handcuffs/bonds/ @@ -106105,7 +106105,7 @@ ܪÇé [¤µ¤ª¤Ð¤«¤ê] /(n) beam balance/steelyard/ Ü´½ñ [¤«¤¤¤·¤ç] /(n) printed style writing/(P)/ ܸ [¤¯¤µ¤Ó] /(n) wedge/link pin/ -ܸ·Á [¤¯¤µ¤Ó¤¬¤¿] /(adj-na,n) (uk) wedge-shape/ +ܸ·Á [¤¯¤µ¤Ó¤¬¤¿] /(adj-na,n) (uk) wedge-tqshape/ ܸ·Áʸ»ú [¤¯¤µ¤Ó¤¬¤¿¤â¤¸] /(n) cuneiform (writing)/ Ü» [¤µ¤ï¤é] /(n) sawara cypress/Chamaecyparis pisifera/ Ü¿»Ò [¤ä¤·] /(n) palm tree/ @@ -106313,7 +106313,7 @@ ßêßê¤È [¤³¤¦¤³¤¦¤È] /brilliantly/brightly/ ß뵤 [¤À¤ó¤­] /(n) warmth/warm weather/ ßë˼ [¤À¤ó¤Ü¤¦] /(n) heating/ -ßëϧ [¤À¤ó¤í] /(n) fireplace/hearth/stove/ +ßëϧ [¤À¤ó¤í] /(n) fitqreplace/hearth/stove/ ßí¤·¶ä [¤¤¤Ö¤·¤®¤ó] /(n) (1) oxidized silver/(2) refined (aesthetic) taste/ ßí¾ø [¤¯¤ó¤¸¤ç¤¦] /fumigation/ ßí¾øºÞ [¤¯¤ó¤¸¤ç¤¦¤¶¤¤] /fumigant/ @@ -106536,7 +106536,7 @@ âˤ߹ç¤ï¤»¤ë [¤Ë¤é¤ß¤¢¤ï¤»¤ë] /(v1) to compare and take into consideration/ âˤßÉÕ¤±¤ë [¤Ë¤é¤ß¤Ä¤±¤ë] /(v1) to glare at/ âˤà [¤Ë¤é¤à] /(v5m) to glare at/to scowl at/to keep an eye on/(P)/ -âˤá¤Ã¤³ [¤Ë¤é¤á¤Ã¤³] /(n) staring-out (down) game/game in which two children looking at each other try to make the opponents laugh first/ +âˤá¤Ã¤³ [¤Ë¤é¤á¤Ã¤³] /(n) staring-out (down) game/game in which two tqchildren looking at each other try to make the opponents laugh first/ âˤá¤Ä¤±¤ë [¤Í¤á¤Ä¤±¤ë] /(v1) to glare or scowl at/ âˤáÉÕ¤±¤ë [¤Í¤á¤Ä¤±¤ë] /(v1) to glare or scowl at/ âÌ [¤Þ¤Ä¤²] /(n) (uk) eyelashes/ @@ -106709,7 +106709,7 @@ åÅ»Ò [¤ê¤ó¤º] /(n) figured satin/ åȸý [¤«¤ó¤³¤¦] /(n) keeping silent/ åÈÌÛ [¤«¤ó¤â¤¯] /(n) keeping silent/ -åË»Ò [¤É¤ó¤¹] /(n) silk damask/satin damask/ +åË»Ò [¤É¤ó¤¹] /(n) silk datqmask/satin datqmask/ åËÄ¢ [¤É¤ó¤Á¤ç¤¦] /(n) thick curtain/drop curtain/ åÌÌ© [¤Á¤ß¤Ä] /(adj-na,n) minute/fine/delicate/accurate/elaborate/ åФ껦¤¹ [¤¯¤Ó¤ê¤³¤í¤¹] /(v5s) to strangle to death/ @@ -106804,7 +106804,7 @@ æú¶Ò [¤Ï¤Ð¤­] /(n) leggings/ æú¹ü [¤±¤¤¤³¤Ä] /(n) tibia/shinbone/ æúÅö¤Æ [¤¹¤Í¤¢¤Æ] /(n) greaves/shin guards/ -æúóö¤ê [¤¹¤Í¤«¤¸¤ê] /(n) sponging off one's parents/ +æúóö¤ê [¤¹¤Í¤«¤¸¤ê] /(n) sponging off one's tqparents/ æû [¤·¤å¤¦] /dried meat/dry up/ æûÃÝ [¤·¤å¤¦¤Á¤¯] /(n) tall bamboo/ æþ²¼ [¤¨¤­¤«] /(n) armpit/ @@ -106865,7 +106865,7 @@ çͤ­¾å¤²¤ë [¤«¤­¤¢¤²¤ë] /(v1) to shoulder (palanquin)/ çͤ­Æþ¤ì¤ë [¤«¤­¤¤¤ì¤ë] /(v1) to carry in/ çÏ [¤·¤å¤¦¤È] /(n) father-in-law/(P)/ -çÏ¸È [¤­¤å¤¦¤³] /(n) parents-in-law/ +çÏ¸È [¤­¤å¤¦¤³] /(n) tqparents-in-law/ çÐÂÀ¼Ô [¤è¤¿¤â¤Î] /(n) (uk) hooligan/layabout/good-for-nothing/gangster/ çÐÏÀ [¤è¤í¤ó] /(oK) (n) public opinion/ çÓ¤Ö¤ë [¤Í¤Ö¤ë] /(io) (v5r) to lick/ @@ -107037,13 +107037,13 @@ ê°ê§·ý [¤È¤¦¤í¤¦¤±¤ó] /(n) (MA) praying mantis style/ ê± [¤Ò¤­] /(n) toad/ ê±³¿ [¤Ò¤­¤¬¤¨¤ë] /(n) toad/ -ê±¸Ô [¤«¤¨¤ë¤Þ¤¿] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (shape evocates an open-legged frog)/ +ê±¸Ô [¤«¤¨¤ë¤Þ¤¿] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (tqshape evocates an open-legged frog)/ ê² [¤Ò¤­] /(n) toad/ ê³éÖ [¤ª¤±¤é] /(n) mole cricket/ ê³éÖ [¤±¤é] /(n) mole cricket/ ê´Ãî [¤®¤ç¤¦¤Á¤å¤¦] /(n) threadworm/pinworm/ 궤ê¤Ê¤¯ [¤ï¤À¤«¤Þ¤ê¤Ê¤¯] /with no ill feeling/ -ê¶ì÷ [¤Ð¤ó¤­¤ç] /(n) settling in a coiled shape/holding sway/exercising authority/ +ê¶ì÷ [¤Ð¤ó¤­¤ç] /(n) settling in a coiled shape.holding sway/exercising authority/ ê·´Ì [¤«¤Ë¤«¤ó] /canned crab/ ê·¶Ì [¤«¤Ë¤¿¤Þ] /(n) Chinese dish with fried egg and crab/ ê·¸Ô [¤¬¤Ë¤Þ¤¿] /bandy-legged/ @@ -107388,7 +107388,7 @@ ï± [¤«¤¹¤¬¤¤] /(n) clamp/cramp (metal)/ ï²»¦ [¤ª¤¦¤µ¤Ä] /(n) massacre/extermination/ ﻤá¤ë [¤Á¤ê¤Ð¤á¤ë] /(v1) to inlay/to set/to stud/to enchase (a thing) with/to mount (gem)/ -ﻹï [¤ë¤³¤¯] /(n) carve/engrave/shape (sentences)/ +ﻹï [¤ë¤³¤¯] /(n) carve/engrave/tqshape (sentences)/ ﻹü [¤ë¤³¤Ä] /(n) painstaking efforts/ ï¼°ìʸ [¤Ó¤¿¤¤¤Á¤â¤ó] /(exp) be penniless/not have a cent/ ï½ [¤Ä¤Ð] /(n) (1) guard on sword, polearms, etc./(2) brim/ @@ -107514,7 +107514,7 @@ ñ¨¡¹ [¤Ò¤ç¤¦¤Ò¤ç¤¦] /(adj-na,n) aloof from the world/ ñ¨Á³ [¤Ò¤ç¤¦¤¼¤ó] /(adj-na,n) casually/aimlessly/abruptly/unexpectedly/ ñ¨ñ¨ [¤Ò¤ç¤¦¤Ò¤ç¤¦] /(adj-na,n) aloof from the world/ -ñ­»Ò [¤®¤ç¤¦¤¶] /(n) gyoza (Japanese crescent-shaped pan-fried dumplings stuffed with minced pork and vegetables)/(P)/ +ñ­»Ò [¤®¤ç¤¦¤¶] /(n) gyoza (Japanese crescent-tqshaped pan-fried dumplings stuffed with minced pork and vegetables)/(P)/ ñ² [¤¢¤ó] /(n) (uk) red bean jam/anko/(P)/ ñ²¤«¤± [¤¢¤ó¤«¤±] /(n) thick starchy sauce made of kuzu or katakuriko flour/ ñ²¤³ [¤¢¤ó¤³] /(n) (uk) red bean jam/anko/(P)/ diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html index fc52d1e4..cbd2189b 100644 --- a/kiten/edict_doc.html +++ b/kiten/edict_doc.html @@ -1,7 +1,7 @@ - + EDICT Documentation @@ -181,7 +181,7 @@ each dictionary unique (and copyrightable) is the particular selection of words, the phrasing of the meanings, the presentation of the contents (a very important point in the case of EDICT), and the means of publication. Of course, the fact that for the most part the kanji and kana of each entry are -coming from public sources, and the structure and layout of the entries +coming from public sources, and the structure and tqlayout of the entries themselves are quite unlike those in any published dictionary, adds a degree of protection to EDICT.

@@ -257,7 +257,7 @@ KANJI [kantan] /simple (an)/ In early 2001, as part of the JMdict project (see below), I completely revised this system, instead introducing a comprehensive system of Part of Speech (POS) tags. In the EDICT version of the file these tags usually appear in -parentheses +tqparentheses at the start of the entry, separated into general tags and POS tags. Where a tag applies to a single gloss or meaning, it will be included there instead.

@@ -392,7 +392,7 @@ ktb Kantou-ben tsb Tosa-ben

-In the case of gairaigo which have a meaning which is not apparent from the +In the case of gairaigo which have a meaning which is not aptqparent from the original (English) words, the literal transcription is included, with the tag (lit).

diff --git a/kiten/edict_kanjidic_licence.html b/kiten/edict_kanjidic_licence.html index 999357fe..a17128ed 100644 --- a/kiten/edict_kanjidic_licence.html +++ b/kiten/edict_kanjidic_licence.html @@ -1,7 +1,7 @@ - + ELECTRONIC DICTIONARY RESEARCH AND DEVELOPMENT GROUP - MONASH UNIVERSITY diff --git a/kiten/kanjidic b/kiten/kanjidic index 55136de7..602f2f17 100644 --- a/kiten/kanjidic +++ b/kiten/kanjidic @@ -325,7 +325,7 @@ ³Ê 334A U683c B75 G5 S10 F281 N2259 V2668 H926 DK627 L292 K334 O1099 DO716 MN14749 MP6.0309 E633 IN643 DS569 DT710 DC403 DJ852 DG1088 P1-4-6 I4a6.17 Q4796.4 DR1877 Yge2 Yge1 Wgyeog Wnag ¥«¥¯ ¥³¥¦ ¥­¥ã¥¯ ¥´¥¦ T1 ¤¤¤¿¤ë ¤Î¤ê {status} {rank} {capacity} {character} {case (law, grammar)} ³Ë 334B U6838 B75 G8 S10 F475 N2254 V2660 H927 DK628 L1520 K577 DO1608 MN14743 MP6.0305 E1074 IN1212 DJ986 DG1089 P1-4-6 I4a6.22 Q4098.2 DR1862 Yhe2 Yhu2 Whaeg ¥«¥¯ {nucleus} {core} {kernel} ³Ì 334C U6bbb B79 G8 S11 XJ05D57 XJ1385E F1892 N2456 V2996 H1490 DK1000 L710 K1869 DO1832 E1075 IN1728 DJ1626 DG1141 P1-7-4 I3p8.1 Q4724.7 DR1468 Yke2 Yqiao4 Wgag ¥«¥¯ ¥³¥¯ ¥Ð¥¤ ¤«¤é ¤¬¤é {husk} {nut shell} -³Í 334D U7372 B94 G8 S16 XH1622 F964 N2912 V3609 H779 DK537 L701 K1234 DO1364 MN20758X MP7.0752 E1079 IN1313 DJ1408 DG1310 P1-3-13 I3g13.1 Q4424.7 DR2967 Yhuo4 Whoeg ¥«¥¯ ¤¨.¤ë {seize} {get} {find} {earn} {acquire} {can} {may} {able to} +³Í 334D U7372 B94 G8 S16 XH1622 F964 N2912 V3609 H779 DK537 L701 K1234 DO1364 MN20758X MP7.0752 E1079 IN1313 DJ1408 DG1310 P1-3-13 I3g13.1 Q4424.7 DR2967 Yhuo4 Whoeg ¥«¥¯ ¤¨.¤ë {seize} {get} {tqfind} {earn} {acquire} {can} {may} {able to} ³Î 334E U78ba B112 G5 S15 XJ15021 F252 N3217 V4039 H1228 DK830 L567 K395 O2305 DO661 MN24366 MP8.0388 E634 IN603 DS570 DT805 DC343 DJ803 DG1409 P1-5-10 I5a10.3 Q1461.4 DR3375 Yque4 Whwag ¥«¥¯ ¥³¥¦ ¤¿¤·.¤« ¤¿¤·.¤«¤á¤ë {assurance} {firm} {tight} {hard} {solid} {confirm} {clear} {evident} ³Ï 334F U7a6b B115 G8 S18 F1642 N3309 V4180 H1251 DK844 L908 K1683 O2729 DO1807 MN25334P MP8.0635 E1081 IN1314 DJ1409 DG1449 P1-5-13 I5d13.4 Q2494.7 DR2267 Yhuo4 Whwag ¥«¥¯ {harvest} {reap} ³Ð 3350 U899a B147 G4 S12 XJ06B34 XJ15D26 XH1700 F710 N4288 V5529 H2604 DK1668 L325 K896 O1752 DO397 MN34846 MP10.0328 E439 IN605 DS363 DT581 DJ208 DB3.15 DG1646 P2-5-7 I3n9.3 Q3221.6 Q9021.6 DR957 Yjue2 Yjiao4 Wgag Wgyo ¥«¥¯ ¤ª¤Ü.¤¨¤ë ¤µ.¤Þ¤¹ ¤µ.¤á¤ë ¤µ¤È.¤ë {memorize} {learn} {remember} {awake} {sober up} @@ -689,7 +689,7 @@ ·¾ 373E U73ea B96 S10 N2937 V3638 L2564 MN20972 MP7.0914 P1-4-6 I4f6.4 Q1411.4 Ygui1 Wgyu ¥±¥¤ ¤¿¤Þ {jade scepter or tablet (authority symbol)} ·¿ 373F U578b B32 G4 S9 F482 N1077 V1010 H2638 DK1685 L680 K423 DO685 MN5030 MP3.0171 E468 IN888 DS595 DT523 DJ1318 DG353 P2-6-3 I3b6.11 Q1210.4 DR3272 Yxing2 Whyeong ¥±¥¤ ¤«¤¿ -¤¬¤¿ {mould} {type} {model} ·À 3740 U5951 B37 G8 S9 F898 N1177 V1155 H2639 DK1686 L1549 K1153 O980 DO1132 MN5917X MP3.0589 E1195 IN565 DJ751 DG417 P2-6-3 I2f7.6 Q5743.2 DR1463 Yqi4 Yxie4 Yqie4 Wgye Wgeul ¥±¥¤ ¤Á¤®.¤ë {pledge} {promise} {vow} -·Á 3741 U5f62 B59 G2 S7 F418 N1589 V1713 H846 DK565 L1711 K408 O414 DO223 MN9969 MP4.0784 E104 IN395 DS200 DT141 DC306 DJ509 DB3.6 DG615 P1-4-3 I3j4.1 Q1242.2 DR3260 Yxing2 Whyeong ¥±¥¤ ¥®¥ç¥¦ ¤«¤¿ -¤¬¤¿ ¤«¤¿¤Á ¤Ê¤ê T1 ¤Á {shape} {form} {style} +·Á 3741 U5f62 B59 G2 S7 F418 N1589 V1713 H846 DK565 L1711 K408 O414 DO223 MN9969 MP4.0784 E104 IN395 DS200 DT141 DC306 DJ509 DB3.6 DG615 P1-4-3 I3j4.1 Q1242.2 DR3260 Yxing2 Whyeong ¥±¥¤ ¥®¥ç¥¦ ¤«¤¿ -¤¬¤¿ ¤«¤¿¤Á ¤Ê¤ê T1 ¤Á {tqshape} {form} {style} ·Â 3742 U5f84 B60 G4 S8 XJ0574D XJ06D74 F1435 N1602 V1730 H291 DK216 L882 K1451 O576 DO1630 MN10080P MP4.0820 E845 IN1475 DT502 DJ1448 DG622 P1-3-5 I3i5.5 Q2721.4 DR2072 Yjing4 Wgyeong ¥±¥¤ ¤ß¤Á ¤³¤ß¤Á ¤µ¤·¤ï¤¿¤· ¤¿¤À¤Á¤Ë {diameter} {path} {method} ·Ã 3743 U6075 B61 G8 S10 XJ0582A F925 N1681 V1847 H2659 DK1704 L612 K875 O1226 DO1498 MN10618P MP4.1049 E1196 IN1219 DJ1077 DG781 P2-6-4 I4k6.16 Q5033.6 DR1558 Yhui4 Whye ¥±¥¤ ¥¨ ¤á¤°.¤à ¤á¤°.¤ß T1 ¤¢¤ä ¤± ¤µ¤È ¤µ¤È¤· ¤·¤² ¤Ø¤¤ ¤ß ¤ä¤¹ {favor} {blessing} {grace} {kindness} ·Ä 3744 U6176 B53 C61 G8 S15 F1300 N1539 V1967 H3173 DK2029 L2001 K962 O2425 DO1033 MN11145 MP4.1168 E1204 IN1632 DJ1732 DG799 P3-3-12 I3q12.8 Q0024.7 DR567 Yqing4 Wgyeong Wgang ¥±¥¤ ¤è¤í¤³.¤Ó T1 ¤­ ¤­¤è¤ó ¤± ¤ß¤Á ¤à ¤ä¤¹ ¤è¤· {jubilation} {congratulate} {rejoice} {be happy} @@ -1081,7 +1081,7 @@ »Î 3B4E U58eb B33 G4 S3 F526 N1160 V1117 H3405 DK2129 L319 K301 O41 DO59 MN5638 MP3.0279 E494 IN572 DS410 DT441 DC386 DJ755 DG393 P4-3-2 I3p0.1 Q4010.0 DR1472 Yshi4 Wsa ¥· T1 ¤ª ¤Þ T2 ¤µ¤à¤é¤¤ {gentleman} {samurai} »Ï 3B4F U59cb B38 G3 S8 XJ13037 XJ1326B F244 N1208 V1203 H281 DK211 L747 K465 O1092 DO545 MN6166 MP3.0661 E288 IN494 DS225 DT299 DC321 DJ129 DB2.16 DG439 P1-3-5 I3e5.9 Q4346.0 DR1777 Yshi3 Wsi ¥· ¤Ï¤¸.¤á¤ë -¤Ï¤¸.¤á¤ë ¤Ï¤¸.¤Þ¤ë T1 ¤â¤È {commence} {begin} »Ð 3B50 U59c9 B38 G2 S8 XJ1393D F1473 N1207 V1201 H280 DK210 L413 K1329 O847 DO120 MN6165 MP3.0661 E498 IN407 DS413 DT159 DJ77 DB3.15 DG438 P1-3-5 I3e5.8 Q4042.7 DR1744 ZSP1-3-4 Yzi3 Wja ¥· ¤¢¤Í ¤Ï¤Ï {elder sister} -»Ñ 3B51 U59ff B38 G6 S9 F441 N1215 V1216 H2636 DK1684 L474 K592 O1217 DO1133 MN6257X MP3.0699 E877 IN929 DT883 DJ661 DG429 P2-6-3 I3e6.10 Q3740.4 DR369 Yzi1 Wja ¥· ¤¹¤¬¤¿ T1 ¤·¤Ê {figure} {form} {shape} +»Ñ 3B51 U59ff B38 G6 S9 F441 N1215 V1216 H2636 DK1684 L474 K592 O1217 DO1133 MN6257X MP3.0699 E877 IN929 DT883 DJ661 DG429 P2-6-3 I3e6.10 Q3740.4 DR369 Yzi1 Wja ¥· ¤¹¤¬¤¿ T1 ¤·¤Ê {figure} {form} {tqshape} »Ò 3B52 U5b50 B39 G1 S3 F72 N1264 V1281 H3390 DK2125 L95 K56 O38 DO61 MN6930 MP3.0776 E25 IN103 DS31 DT18 DC42 DJ69 DB2.18 DG455 P4-3-1 I2c0.1 Q1740.7 DR3547 ZSP4-2-1 Yzi3 Yzi2 Yzi5 Wja ¥· ¥¹ ¥Ä ¤³ -¤³ ¤Í T1 ¤¤ ¤­ ¤® ¤¯ ¤± ¤Í¤Ã {child} {sign of the rat} {11PM-1AM} {first sign of Chinese zodiac} »Ó 3B53 U5c4d B44 S9 N1391 V1420 H3099 L2222 MN7688 MP4.0152 P3-3-6 I3r6.2 Q7721.1 Yshi1 Wsi ¥· ¤·¤«¤Ð¤Í {corpse} »Ô 3B54 U5e02 B8 C50 G2 S5 F42 N284 V1549 H1993 DK1258 L412 K78 O195 DO119 MN8775 MP4.0397 E130 IN181 DS222 DT109 DC305 DJ547 DB2.4 DG556 P2-2-3 I2j3.1 Q0022.7 DR444 ZBP4-4-3 Yshi4 Wsi ¥· ¤¤¤Á T1 ¤¤ ¤Á {market} {city} {town} @@ -1226,7 +1226,7 @@ ½£ 3D23 U5dde B2 G3 S6 XDR0354 F386 N99 V1529 H57 DK39 L128 K542 O224 DO445 MN8678 MP4.0331 E304 IN195 DS424 DT271 DJ553 DG549 P1-2-4 I2f4.1 Q3200.0 DR1254 ZPP1-1-5 Yzhou1 Wju ¥·¥å¥¦ ¥¹ ¤¹ T1 ¤¯¤Ë {state} {province} ½¤ 3D24 U4fee B9 G5 S10 XJ13143 F603 N491 V260 H123 DK92 L1722 K644 O1038 DO563 MN721 MP1.0805 E704 IN945 DS633 DT715 DJ1175 DG107 P1-2-8 I2a8.11 Q2822.2 Q2722.2 DR2160 ZPP1-3-7 Yxiu1 Wsu ¥·¥å¥¦ ¥·¥å ¤ª¤µ.¤á¤ë ¤ª¤µ.¤Þ¤ë T1 ¤ª¤­ ¤Ê¤¬ ¤Î¤Ö ¤ª¤µ¤à {discipline} {conduct oneself well} {study} {master} ½¥ 3D25 U6101 B61 G8 S13 F2171 N1729 V1923 H2829 DK1811 L901 K1737 DO1778 MN10885 MP4.1107 E1357 IN1601 DJ1700 DG795 P2-9-4 I4k9.16 Q2933.8 DR2258 Ychou2 Wsu ¥·¥å¥¦ ¤¦¤ì.¤¨¤ë ¤¦¤ì.¤¤ {distress} {grieve} {lament} {be anxious} -½¦ 3D26 U62fe B64 G3 S9 F1479 N1901 V2149 H379 DK279 L667 K1599 O802 DO625 MN12014 MP5.0209 E305 IN1445 DS425 DT329 DJ273 DG890 P1-3-6 I3c6.14 Q5806.1 DR1377 Yshi2 Yshe4 Wseub Wsib ¥·¥å¥¦ ¥¸¥å¥¦ ¤Ò¤í.¤¦ {pick up} {gather} {find} {go on foot} {ten} +½¦ 3D26 U62fe B64 G3 S9 F1479 N1901 V2149 H379 DK279 L667 K1599 O802 DO625 MN12014 MP5.0209 E305 IN1445 DS425 DT329 DJ273 DG890 P1-3-6 I3c6.14 Q5806.1 DR1377 Yshi2 Yshe4 Wseub Wsib ¥·¥å¥¦ ¥¸¥å¥¦ ¤Ò¤í.¤¦ {pick up} {gather} {tqfind} {go on foot} {ten} ½§ 3D27 U6d32 B85 G9 S9 F1979 N2539 V3120 H391 DK291 L2289 O820 MN17413 MP6.1116 IN2138 P1-3-6 I3a6.10 Q3210.0 Yzhou1 Wju ¥·¥å¥¦ ¥¹ ¤·¤Þ {continent} {sandbar} {island} {country} ½¨ 3D28 U79c0 B115 G8 S7 F848 N3263 V4123 H2545 DK1616 L914 K859 O726 DO973 MN24911 MP8.0523 E1355 IN1683 DJ1171 DG1429 P2-5-2 I5d2.4 Q2022.7 DR2245 ZPP2-1-6 ZSP2-5-3 ZBP2-1-7 Yxiu4 Wsu ¥·¥å¥¦ ¤Ò¤¤.¤Ç¤ë T1 ¤·¤å ¤·¤ç¤¦ ¤Ò¤Ç ¤Ò¤Ç¤· ¤Û {excel} {excellence} {beauty} {surpass} ½© 3D29 U79cb B115 G2 S9 XJ0302C XJ06354 F635 N3273 V4131 H1139 DK776 L900 K540 O878 DO164 MN24940 MP8.0537 E140 IN462 DS89 DT178 DJ98 DB2.20 DG1431 P1-5-4 I5d4.1 Q2998.0 DR2262 Yqiu1 Wchu ¥·¥å¥¦ ¤¢¤­ ¤È¤­ T1 ¤¢¤¤ {autumn} @@ -1375,7 +1375,7 @@ ¾Ú 3E5A U8a3c B149 G5 S12 XJ06B7A F306 N4341 V5589 H1506 DK1010 L380 K430 O1660 DO697 MN35341 MP10.0423 E715 IN484 DS816 DT754 DC448 DJ666 DG1672 P1-7-5 I7a5.5 Q0161.1 DR3073 Yzheng4 Wjeung ¥·¥ç¥¦ ¤¢¤«¤· {evidence} {proof} {certificate} ¾Û 3E5B U8a54 B149 G8 S12 F2239 N4333 V5581 H1505 DK1009 L342 K2023 O1658 DO1213 MN35379 MP10.0429 E1407 IN1885 DJ1935 DG1673 P1-7-5 I7a5.10 Q0766.2 DR3077 Yzhao4 Wjo ¥·¥ç¥¦ ¤ß¤³¤È¤Î¤ê T1 ¤µ¤È¤· ¤Î¤ê {imperial edict} ¾Ü 3E5C U8a73 B149 G8 S13 F1178 N4357 V5607 H1526 DK1026 L550 K1172 O1927 DO896 MN35446 MP10.0456 E1409 IN1577 DJ944 DG1682 P1-7-6 I7a6.12 Q0865.1 DR3055 Yxiang2 Wsang Wyang ¥·¥ç¥¦ ¤¯¤ï.¤·¤¤ ¤Ä¤Þ¤Ó.¤é¤« T1 ¤è¤· {detailed} {full} {minute} {accurate} {well-informed} -¾Ý 3E5D U8c61 B152 G4 S12 F394 N4472 V5744 H2134 DK1350 L1976 K575 O1761 DO809 MN36372 MP10.0657 E533 IN739 DS663 DT591 DJ939 DG1718 P2-2-10 I2n10.1 Q2723.2 DR2551 ZPP2-6-6 Yxiang4 Wsang ¥·¥ç¥¦ ¥¾¥¦ ¤«¤¿¤É.¤ë T1 ¤­¤µ {elephant} {pattern after} {imitate} {image} {shape} {sign (of the times)} +¾Ý 3E5D U8c61 B152 G4 S12 F394 N4472 V5744 H2134 DK1350 L1976 K575 O1761 DO809 MN36372 MP10.0657 E533 IN739 DS663 DT591 DJ939 DG1718 P2-2-10 I2n10.1 Q2723.2 DR2551 ZPP2-6-6 Yxiang4 Wsang ¥·¥ç¥¦ ¥¾¥¦ ¤«¤¿¤É.¤ë T1 ¤­¤µ {elephant} {pattern after} {imitate} {image} {tqshape} {sign (of the times)} ¾Þ 3E5E U8cde B42 C154 G4 S15 F426 N1372 V5815 H2618 DK1677 L796 K507 O2377 DO621 MN36813 MP10.0774 E511 IN500 DS641 DT625 DJ711 DG1738 P2-5-10 I3n12.1 Q9080.6 DR1061 ZPP2-3-12 Yshang3 Wsang ¥·¥ç¥¦ ¤Û.¤á¤ë {prize} {reward} {praise} ¾ß 3E5F U91a4 B164 S17 XJ16273 F2485 N4801 V6186 L2746 MN40011X MP11.0394 P2-10-7 Q2760.1 Yjiang4 Wjang ¥·¥ç¥¦ ¤Ò¤·¤ª {a kind of miso} ¾à 3E60 U9266 B167 S13 N4839 V6246 L2770 O1941 MN40322 MP11.0522 P1-8-5 I8a5.7 Q8111.1 Yzheng1 Wjeong ¥»¥¤ ¥·¥ç¥¦ ¤«¤Í {bell} {gong} {chimes} @@ -1446,7 +1446,7 @@ ¿Ã 3F43 U81e3 B131 G4 S7 F1249 N3837 V4894 H3068 DK1948 L848 K981 O527 DO435 MN30068 MP9.0386 E512 IN835 DS436 DT484 DJ1003 DG1805 P3-3-4 I2t4.3 Q7171.7 DR3475 Ychen2 Wsin ¥·¥ó ¥¸¥ó T1 ¤ª¤ß ¤¿¤« ¤È ¤È¤ß ¤ß {retainer} {subject} ¿Ä 3F44 U82af B140 S7 S8 F2202 N3905 V4976 H2423 L2368 MN30732X MP9.0536 P2-3-4 I3k4.2 Q4433.0 ZRP2-4-4 ZSP2-3-4 Yxin1 Yxin4 Wsim ¥·¥ó {wick} ¿Å 3F45 U85aa B140 G8 S16 F2182 N4069 V5222 H2374 DK1538 L1503 K2024 DO1560 MN32149P MP9.0963 E1445 IN1910 DJ1838 DG669 P2-3-13 I3k13.3 Q4492.1 DR1954 Yxin1 Wsin ¥·¥ó ¤¿¤­¤® ¤Þ¤­ {fuel} {firewood} {kindling} -¿Æ 3F46 U89aa B147 G2 S16 F406 N4293 V5534 H1799 DK1172 L1504 K381 O2544 DO211 MN34918 MP10.0332 E149 IN175 DS260 DT237 DC315 DJ249 DB3.6 DG1647 P1-9-7 I5b11.1 Q0691.0 DR457 Yqin1 Yqing4 Wchin ¥·¥ó ¤ª¤ä ¤ª¤ä- ¤·¤¿.¤·¤¤ ¤·¤¿.¤·¤à T1 ¤® ¤Á¤« ¤Î¤ê {parent} {intimacy} {relative} {familiarity} {dealer (cards)} +¿Æ 3F46 U89aa B147 G2 S16 F406 N4293 V5534 H1799 DK1172 L1504 K381 O2544 DO211 MN34918 MP10.0332 E149 IN175 DS260 DT237 DC315 DJ249 DB3.6 DG1647 P1-9-7 I5b11.1 Q0691.0 DR457 Yqin1 Yqing4 Wchin ¥·¥ó ¤ª¤ä ¤ª¤ä- ¤·¤¿.¤·¤¤ ¤·¤¿.¤·¤à T1 ¤® ¤Á¤« ¤Î¤ê {tqparent} {intimacy} {relative} {familiarity} {dealer (cards)} ¿Ç 3F47 U8a3a B149 G8 S12 F1019 N4338 V5586 H1504 DK1008 L1724 K1069 DO1081 MN35337 MP10.0422 E1440 IN1214 DJ1361 DG1674 P1-7-5 I7a5.9 Q0862.2 DR3060 Yzhen3 Yzhen1 Wjin ¥·¥ó ¤ß.¤ë {checkup} {seeing} {diagnose} {examine} ¿È 3F48 U8eab B158 G3 S7 F320 N4601 V5928 H3553 DK2213 L1248 K331 O546 DO791 MN38034 MP10.0968 E323 IN59 DS255 DT285 DC174 DJ394 DG1768 P4-7-3 I0a7.5 Q2740.0 DR847 ZPP4-7-4 Yshen1 Yjuan1 Wsin ¥·¥ó ¤ß {somebody} {person} {one's station in life} ¿É 3F49 U8f9b B160 G8 S7 F1607 N4646 V5996 H2038 DK1287 L1496 K1628 O493 DO1312 MN38630 MP10.1072 E1432 IN1487 DJ344 DG1784 P2-2-5 I5b2.2 Q0040.1 DR455 ZPP2-5-2 Yxin1 Wsin ¥·¥ó ¤«¤é.¤¤ ¤Ä¤é.¤¤ -¤Å¤é.¤¤ ¤«¤Î¤È {spicy} {bitter} {hot} {acrid} @@ -1759,7 +1759,7 @@ Ââ 4262 U968a B170 G4 S12 F605 N5010 V6468 H625 DK452 L1306 K470 DO366 MN41750X MP11.0945 E540 IN795 DS462 DT593 DC225 DJ779 DG746 P1-3-9 I2d9.7 Q7823.2 DR3651 Ydui4 Wdae ¥¿¥¤ {regiment} {party} {company} {squad} Âã 4263 U9edb B203 G9 S16 F2254 N5408 V7060 DK1678 L2864 MN48075X MP12.1022 IN2283 P2-5-11 I4d13.7 Q2333.1 Ydai4 Wdae ¥¿¥¤ ¤Þ¤æ¤º¤ß {blackened eyebrows} Âä 4264 U9bdb B195 G9 S19 XJ16A57 F2446 N5305 V6884 H1881 DK1213 L2812 O2832 DO1971 MN46226P MP12.0752 IN2272 P1-11-8 I11a8.11 Q2732.0 Ydiao1 Wjo ¥Á¥ç¥¦ ¤¿¤¤ {sea bream} {red snapper} -Âå 4265 U4ee3 B9 G3 S5 F66 N364 V125 H30 DK18 L1005 K68 O125 DO85 MN386 MP1.0611 E338 IN256 DS463 DT257 DC87 DJ413 DB2.10 DB3.3 DG61 P1-2-3 I2a3.3 Q2324.0 DR2156 Ydai4 Wdae ¥À¥¤ ¥¿¥¤ ¤«.¤ï¤ë ¤«¤ï.¤ë ¤«¤ï.¤ê -¤¬¤ï.¤ê ¤«.¤¨¤ë ¤è ¤·¤í T1 ¤¹ {substitute} {change} {convert} {replace} {period} {age} {generation} {charge} {rate} {fee} +Âå 4265 U4ee3 B9 G3 S5 F66 N364 V125 H30 DK18 L1005 K68 O125 DO85 MN386 MP1.0611 E338 IN256 DS463 DT257 DC87 DJ413 DB2.10 DB3.3 DG61 P1-2-3 I2a3.3 Q2324.0 DR2156 Ydai4 Wdae ¥À¥¤ ¥¿¥¤ ¤«.¤ï¤ë ¤«¤ï.¤ë ¤«¤ï.¤ê -¤¬¤ï.¤ê ¤«.¤¨¤ë ¤è ¤·¤í T1 ¤¹ {substitute} {change} {convert} {tqreplace} {period} {age} {generation} {charge} {rate} {fee} Âæ 4266 U53f0 B28 C30 G2 S5 XJ0674A XJ13747 F262 N848 V699 H2005 DK1265 L744 K216 O276 DO290 MN3246 MP2.0757 E166 IN492 DS272 DT111 DC436 DJ532 DB3.2 DG280 P2-2-3 I3d2.11 Q2360.0 DR2777 Ytai2 Ytai1 Wtae Wi ¥À¥¤ ¥¿¥¤ ¤¦¤Æ¤Ê ¤ï¤ì ¤Ä¤«¤µ {pedestal} {a stand} {counter for machines and vehicles} Âç 4267 U5927 B37 G1 S3 F7 N1171 V1133 H3416 DK2133 L107 K7 O48 DO32 MN5831 MP3.0367 E53 IN26 DS22 DT14 DC5 DJ87 DB2.2 DG408 P4-3-4 I0a3.18 Q4003.0 DR1463 Yda4 Ydai4 Wdae Wda Wtae ¥À¥¤ ¥¿¥¤ ¤ª¤ª- ¤ª¤ª.¤­¤¤ -¤ª¤ª.¤¤¤Ë T1 ¤¦¤Õ ¤ª ¤ª¤¦ ¤¿ ¤¿¤«¤· ¤È¤â ¤Ï¤¸¤á ¤Ò¤í ¤Ò¤í¤· ¤Þ¤µ ¤Þ¤µ¤ë ¤â¤È ¤ï {large} {big} Âè 4268 U7b2c B118 G3 S11 F160 N3385 V4272 H2660 DK1706 L1239 K76 O1768 DO360 MN25943 MP8.0760 E339 IN404 DS273 DT380 DC83 DJ354 DG1473 P2-6-5 I6f5.5 Q8822.7 DR2344 Ydi4 Wje ¥À¥¤ ¥Æ¥¤ {No.} {residence} @@ -2098,7 +2098,7 @@ ƽ 463D U5ce0 B46 G8 S9 F1941 N1416 V1464 H358 DK265 L773 K1751 O1081 DO1473 MN8068 MP4.0247 E1663 IN1351 DJ1849 DG542 P1-3-6 I3o6.3 Q2173.1 DR1254 Wsang ¤È¤¦¤² {mountain peak} {mountain pass} {climax} {crest} {(kokuji)} ƾ 463E U9d07 B196 S15 V6943 O2280 MN46730 MP12.0807 P1-4-11 I11b4.3 Q4742.7 Ybao3 Wbo ¥Û¥¦ ¤È¤­ ¤Î¤¬¤ó {wild goose} {madam of a brothel} {crested ibis} Æ¿ 463F U533f B22 C23 G8 S10 F2024 N764 V591 H3011 DK1911 L1692 K1693 DO1766 MN2690 MP2.0475 E1664 IN1771 DJ1716 DG238 P3-2-8 I2t8.2 Q7171.6 DR3475 Yni4 Wnig ¥È¥¯ ¤«¤¯¤Þ.¤¦ {hide} {shelter} {shield} -ÆÀ 4640 U5f97 B60 G4 S11 F175 N1622 V1755 H477 DK351 L876 K358 O1299 DO340 MN10137 MP4.0873 E761 IN374 DS850 DT574 DC167 DJ643 DG631 P1-3-8 I3i8.4 Q2624.1 DR2048 Yde2 Yde5 Ydei3 Wdeug ¥È¥¯ ¤¨.¤ë ¤¦.¤ë T1 ¤¢¤Ä ¤Æ¤í {gain} {get} {find} {earn} {acquire} {can} {may} {able to} {profit} {advantage} {benefit} +ÆÀ 4640 U5f97 B60 G4 S11 F175 N1622 V1755 H477 DK351 L876 K358 O1299 DO340 MN10137 MP4.0873 E761 IN374 DS850 DT574 DC167 DJ643 DG631 P1-3-8 I3i8.4 Q2624.1 DR2048 Yde2 Yde5 Ydei3 Wdeug ¥È¥¯ ¤¨.¤ë ¤¦.¤ë T1 ¤¢¤Ä ¤Æ¤í {gain} {get} {tqfind} {earn} {acquire} {can} {may} {able to} {profit} {advantage} {benefit} ÆÁ 4641 U5fb3 B60 G5 S14 F1091 N1633 V1767 H684 DK486 L885 K839 O2063 DO592 MN10237P MP4.0918 E762 IN1038 DS851 DT801 DJ644 DG637 P1-3-11 I3i11.3 Q2423.6 DR2058 Yde2 Wdeog ¥È¥¯ T1 ¤¢¤Ä ¤Ê¤ë ¤Î¤ê ¤æ¤­ ¤è¤· {benevolence} {virtue} {goodness} {commanding respect} Æ 4642 U6d9c B85 S10 XJ1492C V3134 L2297 MN18591X MP7.0331 P1-3-7 Q3418.6 Ydu2 Wdog ¥È¥¯ ¥È¥¦ ¤±¤¬.¤¹ ¤±¤¬.¤ì ¤ß¤¾ {defile} {blaspheme} {ditch} Æà 4643 U7279 B93 G4 S10 F234 N2860 V3541 H945 DK641 L246 K153 DO411 MN20013 MP7.0644 E760 IN282 DS685 DT554 DC186 DJ398 DB2.18 DG1293 P1-4-6 I4g6.1 Q2454.1 DR2448 Yte4 Wteug ¥È¥¯ {special} @@ -2357,7 +2357,7 @@ ɦ 4926 U9aed B190 S16 S17 XJ16829 N5262 V6812 L2047 O2697 MN45399X MP12.0641 P2-10-6 I3j13.2 Q7211.1 Yzi1 Wja ¥· ¤Ò¤² ¤¯¤Á¤Ò¤² {beard} {mustache} ɧ 4927 U5f66 B117 C59 G9 S9 F1117 N3347 V1714 H3295 DK2072 L1716 K1076 O1007 DO1931 MN9981 MP4.0793 IN2067 P3-6-3 I5b4.4 Q0022.2 DR460 ZPP2-2-7 ZPP2-4-5 Yyan4 Weon ¥²¥ó ¤Ò¤³ T1 ¤è¤· ¤³ ¤Ò¤í ¤ä¤¹ {lad} {boy (ancient)} ɨ 4928 U819d B130 S15 F2320 N3814 V4868 L2461 O2281 MN29837 MP9.0361 P1-4-11 I4b11.4 Q7423.2 DR3942 Yxi1 Wseul ¥·¥Ä ¤Ò¤¶ {knee} {lap} -É© 4929 U83f1 B140 S11 F1229 N3977 V5092 L1517 K980 O1449 MN31219X MP9.0723 P2-3-8 I3k8.20 Q4440.7 DR1967 ZRP2-4-8 Yling2 Wreung ¥ê¥ç¥¦ ¤Ò¤· {diamond (shape)} {water chestnut} {rhombus} +É© 4929 U83f1 B140 S11 F1229 N3977 V5092 L1517 K980 O1449 MN31219X MP9.0723 P2-3-8 I3k8.20 Q4440.7 DR1967 ZRP2-4-8 Yling2 Wreung ¥ê¥ç¥¦ ¤Ò¤· {diamond (tqshape)} {water chestnut} {rhombus} ɪ 492A U8098 B130 S7 S9 N3730 V4761 L2464 MN29268 MP9.0253 P1-4-3 I4b3.3 Q7420.0 Yzhou3 Wju ¥Á¥å¥¦ ¤Ò¤¸ {elbow} {arm} É« 492B U5f3c B57 S12 XJ13C6F N1573 V1697 O2092 MN9826 MP4.0765 P1-3-9 I3h9.2 Q1722.7 Ybi4 Wpil ¥Ò¥Ä ¤¿¤¹.¤±¤ë ¤æ¤À¤á T1 ¤¹¤± ¤¿¤¹¤¯ {help} ɬ 492C U5fc5 B3 G4 S5 F265 N129 V1781 H15 DK6 L635 K292 O120 DO281 MN10299 MP4.0951 E568 IN520 DS497 DT453 DC188 DJ423 DB3.16 DG767 P1-1-4 I0a5.16 Q3300.0 DR359 ZPP4-5-4 Ybi4 Wpil ¥Ò¥Ä ¤«¤Ê¤é.¤º {invariably} {certain} {inevitable} @@ -2500,7 +2500,7 @@ Ê× 4A57 U904d B162 G8 S12 S11 F1845 N4718 V6086 H3136 DK2002 L1824 K1861 O1805 DO1279 MN39001P MP11.0112 E1783 IN1160 DJ1177 DG711 P3-3-9 I2q9.16 Q3330.2 DR3053 Ybian4 Ypian4 Wpyeon ¥Ø¥ó ¤¢¤Þ¤Í.¤¯ {everywhere} {times} {widely} {generally} ÊØ 4A58 U4fbf B9 G4 S9 F729 N450 V219 H95 DK71 L991 K578 DO265 MN659 MP1.0772 E582 IN330 DS510 DT533 DJ227 DB3.8 DG101 P1-2-7 I2a7.5 Q2124.6 DR2166 Ybian4 Ypian2 Wpyeon Wbyeon ¥Ù¥ó ¥Ó¥ó ¤¿¤è.¤ê {convenience} ÊÙ 4A59 U52c9 B4 C19 G3 S10 F1066 N228 V543 H3318 DK2088 L1975 K946 O1263 DO852 MN2384P MP2.0390 E390 IN735 DS317 DT366 DJ140 DB2.11 DG219 P3-8-2 I2n8.1 Q2421.2 DR2557 Ymian3 Wmyeon ¥Ù¥ó ¤Ä¤È.¤á¤ë T1 ¤Ò¤³ ¤ä¤Ä {exertion} -ÊÚ 4A5A U5a29 B38 S11 N1219 V1233 MN6337 MP3.0714 P1-3-8 Q4741.6 ZRP1-3-7 Ymian3 Ywan3 Wman ¥Ù¥ó {bear (children)} +ÊÚ 4A5A U5a29 B38 S11 N1219 V1233 MN6337 MP3.0714 P1-3-8 Q4741.6 ZRP1-3-7 Ymian3 Ywan3 Wman ¥Ù¥ó {bear (tqchildren)} ÊÛ 4A5B U5f01 B28 C55 G5 S5 XJ0517E XJ05221 XJ06122 XJ06D67 F619 N846 V1663 H2004 DK1264 L742 K793 O275 DO513 MN9588 MP4.0664 E786 IN711 DS715 DT654 DJ1116 DG262 P2-2-3 I0a5.30 Q2344.0 Ybian4 Wbyeon Wban ¥Ù¥ó ¥Ø¥ó ¤ï¤­¤Þ.¤¨¤ë ¤ï.¤±¤ë ¤Ï¤Ê¤Ó¤é ¤¢¤é¤½.¤¦ T1 ¤Ù {valve} {petal} {braid} {speech} {dialect} {discrimination} {dispose of} {distinguish} ÊÜ 4A5C U97ad B177 S18 N5104 V6595 L2783 O2752 MN42937 MP12.0171 P1-9-9 I3k15.8 Q4154.6 Ybian1 Wpyeon ¥Ù¥ó ¥Ø¥ó ¤à¤Á ¤à¤Á¤¦¤Ä {whip} {rod} ÊÝ 4A5D U4fdd B9 G5 S9 F146 N455 V222 H96 DK72 L997 K166 O781 DO351 MN702 MP1.0788 E787 IN489 DS716 DT705 DC163 DJ665 DG102 P1-2-7 I2a7.11 Q2629.4 DR2164 Ybao3 Wbo ¥Û ¥Û¥¦ ¤¿¤â.¤Ä T1 ¤¦ ¤ª ¤Ö ¤â¤ê ¤ä¤¹ ¤ä¤¹¤· {protect} {guarantee} {keep} {preserve} {sustain} {support} @@ -2674,10 +2674,10 @@ ÌÉ 4C49 U68c9 B75 S12 N2295 V2741 H988 L2512 DO539 MN14919 MP6.0389 P1-4-8 I4a8.18 Q4692.7 Ymian2 Wmyeon ¥á¥ó ¤ï¤¿ {cotton} ÌÊ 4C4A U7dbf B120 G5 S14 F1495 N3566 V4531 H1373 DK929 L1367 K854 O2538 MN27592 MP8.1109 E798 IN1191 DS725 DT803 DJ881 DG1544 P1-6-8 I6a8.8 Q2692.7 DR2744 Ymian2 Wmyeon ¥á¥ó ¤ï¤¿ T1 ¤¦ {cotton} ÌË 4C4B U7dec B120 S15 N3574 V4542 H1390 MN27674 MP8.1130 P1-6-9 I6a9.12 Q2196.0 Ymian3 Wmyeon ¥á¥ó ¥Ù¥ó {fine thread} {Burma} -ÌÌ 4C4C U9762 B176 G3 S9 XJ16737 F186 N5087 V6566 H2087 DK1324 L1892 K165 O904 DO321 MN42618 MP12.0140 E395 IN274 DS322 DT347 DC117 DJ438 DB2.16 DG1876 P2-2-7 I3s6.1 Q1060.0 DR3176 ZPP3-5-4 Ymian4 Wmyeon ¥á¥ó ¥Ù¥ó ¤ª¤â ¤ª¤â¤Æ ¤Ä¤é T1 ¤ª ¤º¤é ¤Û¤ª¤Ä¤­ ¤â {mask} {face} {features} {surface} +ÌÌ 4C4C U9762 B176 G3 S9 XJ16737 F186 N5087 V6566 H2087 DK1324 L1892 K165 O904 DO321 MN42618 MP12.0140 E395 IN274 DS322 DT347 DC117 DJ438 DB2.16 DG1876 P2-2-7 I3s6.1 Q1060.0 DR3176 ZPP3-5-4 Ymian4 Wmyeon ¥á¥ó ¥Ù¥ó ¤ª¤â ¤ª¤â¤Æ ¤Ä¤é T1 ¤ª ¤º¤é ¤Û¤ª¤Ä¤­ ¤â {tqmask} {face} {features} {surface} ÌÍ 4C4D U9eba B199 S16 XJ07351 XJ16C70 F2331 N5389 V7038 L2752 O2910 MN47827X MP12.0936 P3-7-9 Q4124.6 Q4140.6 ZRP3-11-9 Ymian4 Wmyeon ¥á¥ó ¥Ù¥ó ¤à¤®¤³ {noodles} {wheat flour} ÌÎ 4C4E U6478 B64 S13 N1974 V2250 H691 O1836 MN12644X MP5.0371 P1-3-10 I3c10.13 Q5403.4 ZRP1-3-11 Ymo1 Ymo2 Wmo Wmag ¥â ¥â¥¦ ¥Ð¥¯ ¥Ü ¥Þ¥¯ {search} {imitate} {copy} -ÌÏ 4C4F U6a21 B75 G6 S14 F668 N2345 V2825 H1050 DK720 L229 K691 O2104 DO1218 MN15453X MP6.0533 E980 IN1425 DT980 DJ1160 DG1109 P1-4-10 I4a10.16 Q4493.4 DR1863 Ymo2 Ymu2 Wmo ¥â ¥Ü T1 ¤¬¤ß {imitation} {copy} {mock} +ÌÏ 4C4F U6a21 B75 G6 S14 F668 N2345 V2825 H1050 DK720 L229 K691 O2104 DO1218 MN15453X MP6.0533 E980 IN1425 DT980 DJ1160 DG1109 P1-4-10 I4a10.16 Q4493.4 DR1863 Ymo2 Ymu2 Wmo ¥â ¥Ü T1 ¤¬¤ß {imitation} {copy} {tqmock} ÌÐ 4C50 U8302 B140 G8 S8 F1188 N3915 V4998 H2245 DK1435 L360 K1166 O691 DO1799 MN30833P MP9.0596 E1850 IN1467 DJ1840 DG650 P2-3-5 I3k5.7 Q4425.3 DR1959 Ymao4 Wmu ¥â ¤·¤².¤ë T1 ¤¦¤à¤µ ¤­ ¤· ¤Ä¤È¤à ¤à ¤â¤Æ {overgrown} {grow thick} {be luxuriant} ÌÑ 4C51 U5984 B8 C38 G8 S6 F2264 N288 V1177 H2016 DK1273 L487 K1937 MN6063 MP3.0659 E1851 IN1376 DJ1696 DG424 P2-2-4 I2j4.6 Q0040.4 DR469 Ywang4 Wmang ¥â¥¦ ¥Ü¥¦ ¤ß¤À.¤ê¤Ë {delusion} {unnecessarily} {without authority} {reckless} ÌÒ 4C52 U5b5f B39 G9 S8 F2127 N1269 V1291 H2220 DK1412 L2872 O667 MN6960 MP3.0833 IN2049 P2-3-5 I2c5.1 Q1710.7 ZSP2-2-5 Ymeng4 Wmaeng Wmang ¥â¥¦ ¥Ü¥¦ ¥ß¥ç¥¦ ¤«¤·¤é T1 ¤¿¤±¤· ¤¿¤± ¤Ï¤ë ¤Ï¤¸¤á ¤Ä¤È¤à ¤ª¤µ ¤Ï¤¤ {chief} {beginning} @@ -2693,7 +2693,7 @@ ÌÜ 4C5C U76ee B109 G1 S5 F76 N3127 V3906 H3043 DK1927 L15 K65 O191 DO22 MN23105 MP8.0153 E72 IN55 DS25 DT48 DC91 DJ168 DB3.11 DG1376 P3-3-2 I5c0.1 Q6010.1 DR3979 ZPP4-5-1 Ymu4 Wmog ¥â¥¯ ¥Ü¥¯ ¤á -¤á ¤Þ- T1 ¤µ¤«¤ó ¤µ¤¬¤ó ¤µ¤Ã¤« ¤µ¤Ä¤« {eye} {class} {look} {insight} {experience} {care} {favor} ÌÝ 4C5D U6762 B75 S7 N2177 V2548 O486 MN14487 MP6.0168 P2-4-3 I4a3.13 Q4010.1 Wmog ¥â¥¯ {woodworker} {(kokuji)} ÌÞ 4C5E U52ff B20 S4 N743 V569 H2943 L1049 O110 MN2501 MP2.0425 P3-2-2 I0a4.11 Q2722.0 ZPP4-4-4 Ywu4 Wmul Wmol ¥â¥Á ¥Ö¥Ä ¥Ü¥Ä ¤Ê¤«.¤ì ¤Ê¤· {not} {must not} {do not} {be not} -Ìß 4C5F U9905 B184 S14 XJ07136 F2152 N5166 V6689 L2802 O2346 MN44133X MP12.0393 P1-8-6 Q8874.1 DR2855 Ybing3 Wbyeong ¥Ø¥¤ ¥Ò¥ç¥¦ ¤â¤Á ¤â¤Á¤¤ {mochi rice cake} +Ìß 4C5F U9905 B184 S14 XJ07136 F2152 N5166 V6689 L2802 O2346 MN44133X MP12.0393 P1-8-6 Q8874.1 DR2855 Ybing3 Wbyeong ¥Ø¥¤ ¥Ò¥ç¥¦ ¤â¤Á ¤â¤Á¤¤ {tqmochi rice cake} Ìà 4C60 U5c24 B3 C43 S4 N128 V1399 H3023 L2087 O106 MN7543 MP4.0112 P3-3-1 I0a4.20 Q4301.0 ZPP4-4-4 Yyou2 Wu ¥æ¥¦ ¤â¤Ã¤È.¤â ¤È¤¬.¤á¤ë {reasonable} {just} {natural} {superb} {outstanding} {plausible} Ìá 4C61 U623b B63 G8 S7 F890 N1818 V2051 H1942 DK1234 L1081 K923 DO1850 MN11707X MP5.0060 E1920 IN1238 DJ1201 DG842 P2-1-6 I4m3.1 Q3023.4 DR3063 ZPP3-4-3 Yli4 Wryeo Wryeol ¥ì¥¤ ¤â¤É.¤¹ ¤â¤É.¤ë {re-} {return} {revert} {resume} {restore} {go backwards} Ìâ 4C62 U7c7e B119 S9 N3464 V4384 L2651 O887 MN26853X MP8.0887 P1-6-3 Q9795.0 Yni2 Win ¤â¤ß {unhulled rice} {(kokuji)} @@ -2822,7 +2822,7 @@ Ρ 4E21 U75e2 B104 G8 S12 F2037 N3049 V3810 H3283 DK2063 L1687 K1455 DO1716 MN22213 MP7.1177 E1895 IN1811 DJ1737 DG1355 P3-5-7 I5i7.2 Q0012.0 DR543 Yli4 Wri ¥ê {diarrhea} ΢ 4E22 U88cf B8 C145 G6 S13 F812 N327 V5462 H2138 DK1354 L399 K755 O2176 DO1076 MN34294 MP10.0216 E992 IN273 DT969 DJ436 DG1627 P2-2-11 I2j11.2 Q0073.2 DR465 Yli3 Wri ¥ê ¤¦¤é {back} {amidst} {in} {reverse} {inside} {palm} {sole} {rear} {lining} {wrong side} Σ 4E23 U88e1 B145 S12 XH327 N4235 V5463 H1196 L2973 MN34295 MP10.0217 P1-5-7 Q3621.4 Yli3 Wri ¥ê ¤¦¤Á ¤¦¤é {reverse} {inside} {palm} {sole} {rear} {lining} {wrong side} -Τ 4E24 U91cc B166 G2 S7 F1096 N4813 V6206 H3542 DK2206 L173 K1077 O517 DO101 MN40131 MP11.0412 E219 IN142 DS332 DT154 DJ1025 DG1801 P4-7-1 I0a7.9 Q6010.4 DR3672 Yli3 Wri ¥ê ¤µ¤È T1 ¤µ {ri} {village} {parent's home} {league} +Τ 4E24 U91cc B166 G2 S7 F1096 N4813 V6206 H3542 DK2206 L173 K1077 O517 DO101 MN40131 MP11.0412 E219 IN142 DS332 DT154 DJ1025 DG1801 P4-7-1 I0a7.9 Q6010.4 DR3672 Yli3 Wri ¥ê ¤µ¤È T1 ¤µ {ri} {village} {tqparent's home} {league} Î¥ 4E25 U96e2 B172 G8 S18 F555 N5040 V6517 H1836 DK1195 L1492 K641 O2889 DO909 MN42140X MP11.1042 E1897 IN1281 DJ1008 DG1857 P1-10-8 I8c10.3 Q0041.4 DR475 ZSP1-11-8 Yli2 Wri ¥ê ¤Ï¤Ê.¤ì¤ë ¤Ï¤Ê.¤¹ {detach} {separation} {disjoin} {digress} Φ 4E26 U9678 B170 G4 S11 F736 N5005 V6461 H543 DK399 L1513 K651 O1312 DO193 MN41708 MP11.0912 E597 IN647 DS529 DT579 DC445 DJ833 DG740 P1-3-8 I2d8.4 Q7421.4 DR3672 ZSP1-2-8 Ylu4 Yliu4 Wryug ¥ê¥¯ ¥í¥¯ ¤ª¤« T1 ¤¯¤¬ ¤¿¤Á ¤ß¤Á ¤à ¤à¤Ä {land} {six} Χ 4E27 U5f8b B60 G6 S9 F992 N1608 V1740 H363 DK268 L874 K1048 O787 DO526 MN10097 MP4.0825 E993 IN667 DS877 DT895 DJ519 DG627 P1-3-6 I3i6.1 Q2520.7 DR2055 Ylu:4 Wryul ¥ê¥Ä ¥ê¥Á ¥ì¥Ä T1 ¤¿¤«¤· ¤Î¤ê {rhythm} {law} {regulation} {gauge} {control} @@ -2968,7 +2968,7 @@ Т 5022 U4e10 B1 S4 XH262 N11 V11 MN22 MP1.0264 P4-4-1 I2m2.3 Q1020.7 Ygai4 Wgal Wgae ¥«¥¤ ¤³.¤¦ {beggar} {beg} {give} У 5023 U4e15 B1 S5 V18 O163 MN30 MP1.0267 P2-4-1 I0a5.2 Q1010.9 Ypi1 Wbi ¥Ò ¤ª¤ª.¤­¤¤ {large} {great} {grand} {glorious} {distinguished} Ф 5024 U4e2a B9 C2 S3 XH1960 N340 V25 H1959 MN70 MP1.0286 P2-2-1 Q8020.0 Yge4 Wga Wgae ¥« ¥³ {counter for articles} {individual} -Ð¥ 5025 U4e31 B2 S5 V29 MN77 MP1.0318 P1-2-3 I0a5.4 Q2277.0 Yguan4 Wgwan ¥«¥ó ¥±¥ó {saguaro-like kanji} {horn-shaped locks of hair} {young} {tender} +Ð¥ 5025 U4e31 B2 S5 V29 MN77 MP1.0318 P1-2-3 I0a5.4 Q2277.0 Yguan4 Wgwan ¥«¥ó ¥±¥ó {saguaro-like kanji} {horn-tqshaped locks of hair} {young} {tender} Ц 5026 U4e36 B3 S1 V32 H3344 MN91 MP1.0320 P4-1-4 I0a1.3 Q3000.0 Yzhu3 Wju ¥Á¥å T2 ¤Æ¤ó {dot} {tick or dot radical (no. 3)} Ч 5027 U4e3c B4 C3 S5 F2088 N171 V37 L2884 O206 MN101 MP1.0337 P4-5-4 I0a5.40 Q5500.0 Yjing3 Ydan3 Wjeong ¥È¥ó ¥¿¥ó ¥·¥ç¥¦ ¥»¥¤ ¤É¤ó¤Ö¤ê {bowl} {bowl of food} Ш 5028 U4e3f B4 S1 V39 H3345 MN106 MP1.0338 P4-1-4 I0a1.2 Q2000.0 Ypie3 Wbyeol ¥Ø¥Ä ¤¨¤¤ ¤è¤¦ T1 ¤Î T2 ¥Î ¤Î¤«¤ó¤à¤ê {kana-no radical (no. 4)} @@ -3101,7 +3101,7 @@ ÑÉ 5149 U5191 B130 C13 S9 XH3747 V395 MN1537 MP2.0117 P2-5-4 I2r7.2 Q5022.7 Yzhou4 Wju ¥Á¥å¥¦ ¤«¤Ö¤È ¤è¤í¤¤ {helmet} ÑÊ 514A U5193 B13 S10 V396 MN1540 MP2.0120 P2-5-5 I0a10.14 Q5555.7 Q5544.7 Ygou4 Wgu ¥³¥¦ ¤«¤Þ.¤¨¤ë {put together} {inner palace} ÑË 514B U5195 B13 S11 N624 V397 MN1545 MP2.0120 P2-2-9 Q6041.6 Ymian3 Wmyeon ¥Ù¥ó ¥á¥ó ¤«¤ó¤à¤ê {crown} -ÑÌ 514C U5196 B14 S2 V398 H3353 MN1565 MP2.0122 P4-2-1 I2i0.1 Q3702.0 Ymi4 Wmyeog ¥Ù¥­ T2 ¤ï¤«¤ó¤à¤ê ¤Ù¤­¤«¤ó¤à¤ê {wa-shaped crown radical (no. 14)} +ÑÌ 514C U5196 B14 S2 V398 H3353 MN1565 MP2.0122 P4-2-1 I2i0.1 Q3702.0 Ymi4 Wmyeog ¥Ù¥­ T2 ¤ï¤«¤ó¤à¤ê ¤Ù¤­¤«¤ó¤à¤ê {wa-tqshaped crown radical (no. 14)} ÑÍ 514D U51a4 B14 S10 XJ05563 F2382 N631 V404 MN1587X MP2.0128 P2-2-8 Q3741.3 Yyuan1 Wweon ¥¨¥ó {false charge} {hatred} ÑÎ 514E U51a6 B14 S10 XJ05564 XJ13A5A XH1313 V402 MN1590 MP2.0133 P2-2-8 Q3721.4 Ykou4 Wgu ¥³¥¦ ¤¢¤À.¤¹¤ë {foe} {enemy} {revenge} {grudge} {feud} ÑÏ 514F U51a2 B14 S10 XH1120 V403 MN1585 MP2.0127 P2-2-8 I2i8.1 Q3723.2 Yzhong3 Wchong ¥Á¥ç¥¦ ¤Ä¤« ¤ª¤ª.¤¦ {mound} {hillock} @@ -3488,15 +3488,15 @@ ÕÔ 5554 U5b55 B39 S5 N1266 V1283 L2208 O274 MN6938 MP3.0815 P2-2-3 I2c2.1 Q1740.7 Yyun4 Wing ¥è¥¦ ¤Ï¤é.¤à T1 ¤Ï¤é¤ß ¤â¤È {become pregnant} ÕÕ 5555 U5b5a B39 S7 V1286 O483 MN6948 MP3.0824 P2-4-3 I2c4.2 Q2040.7 Yfu2 Wbu ¥Õ ¤¿¤Þ¤´ ¤Ï¤°¤¯.¤à {sincere} {nourish} {encase} ÕÖ 5556 U5b5b B39 S7 V1288 MN6949 MP3.0824 P2-4-3 I2k4.1 Q4040.7 Ybei4 Wpae Wbal ¥Ï¥¤ ¥Ö¥Ä ¥Ü¥Ä {comet} {dark} {obscure} -Õ× 5557 U5b65 B39 S8 V1290 MN6967 MP3.0858 P2-5-3 I2c5.2 Q4740.7 Ynu2 Wno ¥É ¥Ì ¤Ä¤Þ¤³ {child} {wife and children} {servant} {slave} +Õ× 5557 U5b65 B39 S8 V1290 MN6967 MP3.0858 P2-5-3 I2c5.2 Q4740.7 Ynu2 Wno ¥É ¥Ì ¤Ä¤Þ¤³ {child} {wife and tqchildren} {servant} {slave} ÕØ 5558 U5b69 B39 S9 N1272 V1295 MN6977 MP3.0585 P1-3-6 I2c6.1 Q1048.2 Yhai2 Whae ¥¬¥¤ ¥«¥¤ ¤Á¤Î¤ß¤´ {baby} {infancy} ÕÙ 5559 U5b70 B8 C39 S11 N316 V1297 MN6995 MP3.0877 P1-8-3 I3d7.14 Q0541.7 Q0441.7 Yshu2 Wsug ¥¸¥å¥¯ ¤¤¤º¤ì ¤¿¤ì {which} {how} {who} -ÕÚ 555A U5b73 B12 C39 S12 N603 V1299 MN7011X MP3.0879 P2-3-9 I2o9.2 Q4440.7 Yzi1 Yzi4 Wja ¥¸ ¥· ¤¦.¤à ¤·¤².¤ë {increase} {bear children} {also N1274} +ÕÚ 555A U5b73 B12 C39 S12 N603 V1299 MN7011X MP3.0879 P2-3-9 I2o9.2 Q4440.7 Yzi1 Yzi4 Wja ¥¸ ¥· ¤¦.¤à ¤·¤².¤ë {increase} {bear tqchildren} {also N1274} ÕÛ 555B U5b75 B4 C39 S14 N244 V1301 MN7021 MP3.0880 P1-4-10 I3n10.5 Q7274.7 Yfu1 Wbu ¥Õ ¤«.¤¨¤¹ {hatch} {incubate} ÕÜ 555C U5b78 B39 S16 XJ03358 XJ0555D XJ14157 XH2889 XH1271 N1275 V1302 H2898 MN7033 MP3.0881 P2-13-3 Q7740.7 Yxue2 Yxiao2 Whag ¥¬¥¯ ¤Þ¤Ê.¤Ö T1 ¤µ¤È¤ë {learning} {knowledge} {school} ÕÝ 555D U6588 B67 S7 XJ03358 XJ0555C XJ14157 XH1271 N2065 V2365 H2039 MN13453 MP5.0602 P2-2-5 Q0040.7 Yxue2 Whag ¥¬¥¯ ¤Þ¤Ê.¤Ö {learning} {knowledge} {school} ÕÞ 555E U5b7a B39 S17 N1276 V1303 MN7042 MP3.0893 P1-3-14 I2c14.1 Q1142.7 Yru2 Yru4 Wyu ¥¸¥å ¤ª¤µ¤Ê¤¤ ¤Á¤Î¤ß¤´ {child} -Õß 555F U5b80 B40 S3 V1304 H3425 MN7054 MP3.0895 P4-3-4 I3m0.1 Q3032.7 Ymian2 Wmyeon ¥Ù¥ó ¥á¥ó T2 ¤¦¤«¤ó¤à¤ê {shaped crown} +Õß 555F U5b80 B40 S3 V1304 H3425 MN7054 MP3.0895 P4-3-4 I3m0.1 Q3032.7 Ymian2 Wmyeon ¥Ù¥ó ¥á¥ó T2 ¤¦¤«¤ó¤à¤ê {tqshaped crown} Õà 5560 U5b83 B40 S5 V1306 MN7057 MP3.0897 P2-3-2 I3m2.3 Q3071.1 Yta1 Wda Wsa ¥¿ ¤Ø¤Ó {other} Õá 5561 U5ba6 B40 S10 S9 N1298 V1325 MN7138 MP3.1004 P2-3-7 I3m7.14 Q3071.7 Yhuan4 Whwan ¥«¥ó ¤Ä¤«¤µ {official} Õâ 5562 U5bb8 B40 S10 N1305 V1331 MN7171 MP3.1032 P2-3-7 I3m7.13 Q3023.2 Ychen2 Wsin ¥·¥ó ¤Î¤­ {eaves} {palace} {imperial courtesy} @@ -3582,7 +3582,7 @@ ÖÔ 5654 U5dac B46 S16 V1514 MN8510 MP4.0309 P1-3-13 I3o13.3 Q2875.3 Yyi1 Weui ¥® {high} {steep} ÖÕ 5655 U5dae B46 S16 XH5000 N1437 V1513 H759 MN8520 MP4.0309 P1-3-13 I3o13.2 Q2878.6 Yxian3 Wheom ¥±¥ó ¤±¤ï.¤·¤¤ {inaccessible place} {impregnable position} {steep place} {sharp eyes} ÖÖ 5656 U5dbd B46 S17 XJ03359 XH208 F2135 N1439 V1516 H2377 L2987 O2775 MN8566 MP4.0314 P2-3-14 Q2223.4 Yyue4 Wag ¥¬¥¯ ¤¿¤± T1 ¤¿¤­ {peak} -Ö× 5657 U5d90 B46 S14 V1508 MN8447 MP4.0304 P2-3-11 I3o11.4 Q2221.4 Ylong2 Wryung ¥ê¥å ¤ä¤Þ¤Î¤«¤¿¤Á {shape of a mountain} +Ö× 5657 U5d90 B46 S14 V1508 MN8447 MP4.0304 P2-3-11 I3o11.4 Q2221.4 Ylong2 Wryung ¥ê¥å ¤ä¤Þ¤Î¤«¤¿¤Á {tqshape of a mountain} ÖØ 5658 U5db7 B46 S17 N1441 V1518 O2774 MN8545 MP4.0311 P2-3-14 I3o14.1 Q2248.1 Yyi2 Weui Weog ¥®¥ç¥¯ ¥® ¤µ¤È.¤¤ {wise} ÖÙ 5659 U5dbc B46 S16 N1438 V1515 MN8561 MP4.0313 P1-3-13 I3o13.1 Q2778.1 Yyu3 Wseo ¥·¥ç ¤·¤Þ {island} ÖÚ 565A U5dc9 B46 S20 V1520 MN8618 MP4.0313 P1-3-17 I3o18.1 Q2771.6 Ychan2 Wcham ¥¶¥ó ¥µ¥ó {rising precipitously} {rising steeply} @@ -4471,7 +4471,7 @@ à¡ 6021 U71f9 B86 S18 N2815 V3501 MN19508 MP7.0552 P2-14-4 I4d14.5 Q1180.9 Yxian3 Wheui Wseon ¥»¥ó ¤Î¤Ó {prairie fire} ࢠ6022 U71ff B86 G9 S18 XJ04D54 N2814 V3500 DK750 L2534 O2721 MN19520X MP7.0553 IN2152 P1-4-14 I4d14.3 Q9781.4 Yyao4 Wyo ¥è¥¦ ¤«¤¬¤ä.¤¯ ¤Ò¤«¤ê {shine} ࣠6023 U720d B86 S19 V3504 MN19549 MP7.0555 P1-4-15 I4d15.1 Q9289.4 Yshuo4 Wsag ¥·¥ã¥¯ ¤È¤«.¤¹ ¤Ò¤«.¤ë {shine} {melt} -ठ6024 U7210 B86 S20 XJ04F27 XH2750 N2819 V3506 H1104 MN19566 MP7.0556 P1-4-16 Q9181.7 Ylu2 Wro ¥í ¤¤¤í¤ê {fireplace} {stove} {oven} {furnace} +ठ6024 U7210 B86 S20 XJ04F27 XH2750 N2819 V3506 H1104 MN19566 MP7.0556 P1-4-16 Q9181.7 Ylu2 Wro ¥í ¤¤¤í¤ê {fitqreplace} {stove} {oven} {furnace} ॠ6025 U721b B86 S21 XJ14A47 N2820 V3507 H1110 O2913 MN19604 MP7.0559 P1-4-17 I4d17.1 Q9782.0 ZPP1-1-20 Ylan4 Wran ¥é¥ó ¤¿¤À.¤ì¤ë {be sore} {inflamed} {bleary} {fester} ঠ6026 U7228 B86 S29 N2821 V3508 MN19648 MP7.0562 P2-14-15 I4d26.1 Q7780.9 Ycuan4 Wchan ¥µ¥ó ¤«¤·.¤° ¤«¤Þ¤É {cook} {boil} ৠ6027 U722d B87 S8 XJ04168 XH186 V3510 H2422 O706 MN19663 MP7.0566 P2-4-4 Q2050.7 Yzheng1 Wjaeng ¥½¥¦ ¤¢¤é¤½.¤¦ ¤¤¤«.¤Ç¤« {to dispute} {fight} {contend} {strive} @@ -4610,7 +4610,7 @@ áÎ 614E U75a5 B104 S9 N3026 V3781 MN22057 MP7.1157 P3-5-4 I5i4.3 Q0012.8 Yjie4 Wgae ¥«¥¤ ¤Ï¤¿¤± {scabby eruption} áÏ 614F U75a3 B104 S9 XJ0666F N3027 V3782 MN22050 MP7.1157 P3-5-4 I5i4.1 Q0011.4 Yyou2 Wu ¥æ ¥æ¥¦ ¤¤¤Ü {wart} áÐ 6150 U75c2 B104 S10 N3038 V3793 MN22122 MP7.1167 P3-5-5 I5i5.7 Q0016.0 Yjia1 Wga ¥« ¥± ¤«¤µ ¤«¤µ.¤Ö¤¿ {scab} {dry up} {slough} -áÑ 6151 U75b3 B104 S10 N3032 V3789 MN22085 MP7.1161 P3-5-5 I5i5.1 Q0017.5 Ygan1 Wgam ¥«¥ó {children's diseases} +áÑ 6151 U75b3 B104 S10 N3032 V3789 MN22085 MP7.1161 P3-5-5 I5i5.1 Q0017.5 Ygan1 Wgam ¥«¥ó {tqchildren's diseases} áÒ 6152 U75c3 B104 S10 N3034 V3790 MN22124 MP7.1167 P3-5-5 I5i5.11 Q0013.2 Yxuan2 Whyeon ¥²¥ó ¥±¥ó {cramps} áÓ 6153 U75b5 B104 S11 N3047 V3805 H3282 MN22089X MP7.1161 P3-5-6 I5i6.3 Q0011.1 ZSP3-5-5 Yci1 Yci2 Wja ¥· ¤­¤º {crack} {flaw} {scratch} {speck} áÔ 6154 U75bd B104 S10 N3031 V3787 MN22106 MP7.1163 P3-5-5 I5i5.5 Q0011.7 Yju1 Wjeo ¥½ ¥·¥ç ¤«¤µ {carbuncle} @@ -4749,7 +4749,7 @@ âû 627B U78bc B112 S15 V4030 MN24368 MP8.0389 P1-5-10 I5a10.1 Q1162.7 Yma3 Wma ¥Ð ¥á ¤ä¤¢¤É ¤ä¤¢¤ë {number} {wharf} {agate} {yard (91.44 cm)} âü 627C U78c5 B112 S15 V4032 MN24386 MP8.0391 P1-5-10 I5a10.4 Q1062.7 Ybang4 Ypang1 Ypang2 Wbang Wpaeng ¥Ü¥¦ ¥Û¥¦ ¤Ý¤ó¤É {become obstructed} {pound (sterling, lb)} âý 627D U78ca B112 S15 N3213 V4036 MN24394 MP8.0392 P2-5-10 I5a10.8 Q1066.1 Ylei3 Wroe ¥é¥¤ {many stones} -âþ 627E U78ec B112 S16 V4042 MN24454 MP8.0401 P2-11-5 I5a11.4 Q4760.1 Yqing4 Wgyeong ¥±¥¤ {upside-V-shaped gong} +âþ 627E U78ec B112 S16 V4042 MN24454 MP8.0401 P2-11-5 I5a11.4 Q4760.1 Yqing4 Wgyeong ¥±¥¤ {upside-V-tqshaped gong} ã¡ 6321 U78e7 B112 S16 V4041 MN24448 MP8.0398 P1-5-11 I5a11.3 Q1568.6 Yqi4 Wjeog ¥»¥­ ¤«¤ï¤é {expanse of sand} {pebbly beach} 㢠6322 U78da B112 S16 N3219 V4043 MN24418 MP8.0396 P1-5-11 I5a11.1 Q1564.3 Yzhuan1 Wjeon ¥»¥ó ¤«¤ï¤é {tile} 㣠6323 U78fd B112 S17 V4047 MN24494 MP8.0405 P1-5-12 I5a12.3 Q1461.1 Yqiao1 Wgyo ¥³¥¦ ¥­¥ç¥¦ {rocky} {barren} @@ -4980,7 +4980,7 @@ åÈ 6548 U7dd8 B120 S15 N3577 V4545 MN27638 MP8.1115 P1-6-9 I6a9.16 Q2395.0 Yjian1 Wham ¥«¥ó ¤«¤ó.¤¹¤ë ¤È.¤¸¤ë {shut} {seal} åÉ 6549 U7ddd B120 S15 V4537 O2658 MN27645 MP8.1120 P1-6-9 I6a9.9 Q2694.1 Yji1 Yqi1 Yqi4 Wjib Wjeub ¥·¥å¥¦ ¤Ä¤à.¤° {spin thread} {bring together} {shine} åÊ 654A U7de4 B120 S15 V4538 MN27657 MP8.1125 P1-6-9 I6a9.6 Q2499.4 Yxie4 Wseol ¥»¥Ä ¥»¥Á ¤­¤º¤Ê ¤Ä¤Ê.¤° {leash} -åË 654B U7dde B120 S15 N3578 V4546 MN27646 MP8.1121 P1-6-9 I6a9.4 Q2794.7 Yduan4 Wdan Wha ¥É¥ó ¥¿¥ó {damask} +åË 654B U7dde B120 S15 N3578 V4546 MN27646 MP8.1121 P1-6-9 I6a9.4 Q2794.7 Yduan4 Wdan Wha ¥É¥ó ¥¿¥ó {datqmask} åÌ 654C U7dfb B120 S15 F2460 N3575 V4557 MN27700 MP8.1137 P1-6-9 I6a10.1 Q2894.0 Yzhi4 Wchi ¥Á ¤³¤Þ¤«.¤¤ {fine (i.e. not coarse)} åÍ 654D U7df2 B120 S15 V4539 MN27687 MP8.1133 P1-6-9 I6a9.3 Q2992.0 Ymiao3 Wmyo ¥Ó¥ç¥¦ ¥ß¥ç¥¦ {faint} {far off} åÎ 654E U7de1 B120 S15 XJ1542F N3573 V4541 MN27652 MP8.1122 P1-6-9 I6a9.5 Q2796.4 Ymin2 Wmin ¥Ó¥ó ¥³¥ó ¥ß¥ó ¤µ¤· ¤Ä¤ê¤¤¤È ¤Ê¤ï ¤¼¤Ë¤µ¤· {paper string} @@ -5923,8 +5923,8 @@ ïË 6F4B U9460 B167 S23 XH3124 N4928 V6366 MN41019 MP11.0654 P1-8-15 I8a15.1 Q8219.4 Yshuo4 Wsag ¥·¥ã¥¯ ¤È¤í.¤«¤¹ ¤È.¤«¤¹ {melt} {be charmed} {captivated} ïÌ 6F4C U9462 B167 S23 N4927 V6365 MN41021 MP11.0655 P1-8-15 I8a15.5 Q8113.6 Ylu:4 Wryeo ¥í ¥ê¥ç ¤ä¤¹¤ê {file} {rasp} ïÍ 6F4D U945e B167 S23 N4929 V6367 MN41014 MP11.0654 P1-8-15 I8a15.4 Q8211.6 Yla4 Wrab ¥í¥¦ {solder} -ïÎ 6F4E U946a B167 S24 XJ06F4F XH4822 N4931 V6369 MN41038 MP11.0656 P1-8-16 I8a16.1 Q8111.7 Ylu2 Wro ¥í ¤¤¤í¤ê T1 ¤¿¤¿¤é {hearth} {fireplace} {furnace} -ïÏ 6F4F U9229 B167 S12 XJ06F4E N4822 V6228 P1-8-4 Q8312.7 Ylu2 Wro ¥í ¤¤¤í¤ê {hearth} {fireplace} {furnace} +ïÎ 6F4E U946a B167 S24 XJ06F4F XH4822 N4931 V6369 MN41038 MP11.0656 P1-8-16 I8a16.1 Q8111.7 Ylu2 Wro ¥í ¤¤¤í¤ê T1 ¤¿¤¿¤é {hearth} {fitqreplace} {furnace} +ïÏ 6F4F U9229 B167 S12 XJ06F4E N4822 V6228 P1-8-4 Q8312.7 Ylu2 Wro ¥í ¤¤¤í¤ê {hearth} {fitqreplace} {furnace} ïÐ 6F50 U9470 B167 S25 N4933 V6371 O2998 MN41051 MP11.0657 P1-8-17 I8a17.1 Q8812.7 Q8317.7 Yyao4 Yyue4 Wyag ¥ä¥¯ ¤«¤® {lock} ïÑ 6F51 U9475 B167 S25 XH3634 XI2k4.6 N4932 V6370 MN41064X MP11.0658 P1-8-17 Q8411.4 Yguan4 Wgwan ¥«¥ó ¤«¤Þ {steam boiler} ïÒ 6F52 U9477 B167 S26 V6373 MN41069 MP11.0658 P1-8-18 I8a18.1 Q8114.1 Ynie4 Wseob ¥»¥Ä ¥¸¥ç¥¦ ¥Ë¥ç¥¦ ¤±¤Ì¤­ T1 ¤±¤Ì {pluck hair} {tweezers} diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index 5e54a9af..beb56a31 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -46,7 +46,7 @@ #include -TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, name) +TopLevel::TopLevel(TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name) { #if KDE_VERSION > 305 setStandardToolBarMenuEnabled(true); @@ -54,43 +54,43 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, nam config = Config::self(); config->readConfig(); - Accel = new KGlobalAccel(this); - (void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, this, TQT_SLOT(kanjiSearchAccel())); - (void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, this, TQT_SLOT(searchAccel())); + Accel = new KGlobalAccel(TQT_TQOBJECT(this)); + (void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiSearchAccel())); + (void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, TQT_TQOBJECT(this), TQT_SLOT(searchAccel())); Accel->readSettings(KGlobal::config()); Accel->updateConnections(); _ResultView = new ResultView(true, this, "_ResultView"); setCentralWidget(_ResultView); - (void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); - (void) KStdAction::print(this, TQT_SLOT(print()), actionCollection()); - (void) KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection()); + (void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + (void) KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); + (void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - (void) new KAction(i18n("&Learn"), "pencil", CTRL+Key_L, this, TQT_SLOT(createLearn()), actionCollection(), "file_learn"); - (void) new KAction(i18n("&Dictionary Editor..."), "edit", 0, this, TQT_SLOT(createEEdit()), actionCollection(), "dict_editor"); - (void) new KAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, this, TQT_SLOT(radicalSearch()), actionCollection(), "search_radical"); - Edit = new EditAction(i18n("Search Edit"), 0, this, TQT_SLOT(search()), actionCollection(), "search_edit"); + (void) new KAction(i18n("&Learn"), "pencil", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(createLearn()), actionCollection(), "file_learn"); + (void) new KAction(i18n("&Dictionary Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(createEEdit()), actionCollection(), "dict_editor"); + (void) new KAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(radicalSearch()), actionCollection(), "search_radical"); + Edit = new EditAction(i18n("Search Edit"), 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search_edit"); (void) new KAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search"); - (void) new KAction(i18n("S&earch"), "key_enter", 0, this, TQT_SLOT(search()), actionCollection(), "search"); - (void) new KAction(i18n("Search with &Beginning of Word"), 0, this, TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning"); - (void) new KAction(i18n("Search &Anywhere"), 0, this, TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere"); - (void) new KAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, this, TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke"); - (void) new KAction(i18n("&Grade"), "leftjust", CTRL+Key_G, this, TQT_SLOT(gradeSearch()), actionCollection(), "search_grade"); - kanjiCB = new KToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle"); - deinfCB = new KToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle"); - comCB = new KToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, this, TQT_SLOT(toggleCom()), actionCollection(), "common"); - autoSearchToggle = new KToggleAction(i18n("&Automatically Search Clipboard Selections"), "find", 0, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle"); - irAction = new KAction(i18n("Search &in Results"), "find", CTRL+Key_I, this, TQT_SLOT(resultSearch()), actionCollection(), "search_in_results"); - (void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); - addAction = new KAction(i18n("Add &Kanji to Learning List"), 0, this, TQT_SLOT(addToList()), actionCollection(), "add"); + (void) new KAction(i18n("S&earch"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search"); + (void) new KAction(i18n("Search with &Beginning of Word"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning"); + (void) new KAction(i18n("Search &Anywhere"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere"); + (void) new KAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke"); + (void) new KAction(i18n("&Grade"), "leftjust", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(gradeSearch()), actionCollection(), "search_grade"); + kanjiCB = new KToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle"); + deinfCB = new KToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle"); + comCB = new KToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(toggleCom()), actionCollection(), "common"); + autoSearchToggle = new KToggleAction(i18n("&Automatically Search Clipboard Selections"), "tqfind", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle"); + irAction = new KAction(i18n("Search &in Results"), "tqfind", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results"); + (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); + addAction = new KAction(i18n("Add &Kanji to Learning List"), 0, TQT_TQOBJECT(this), TQT_SLOT(addToList()), actionCollection(), "add"); addAction->setEnabled(false); - (void) new KAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, this, TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding"); + (void) new KAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding"); historyAction = new KListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history"); - connect(historyAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(goInHistory(int))); - backAction = KStdAction::back(this, TQT_SLOT(back()), actionCollection()); - forwardAction = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection()); + connect(historyAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(goInHistory(int))); + backAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection()); + forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection()); backAction->setEnabled(false); forwardAction->setEnabled(false); currentResult = resultHistory.end(); @@ -115,9 +115,9 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, nam applyMainWindowSettings(KGlobal::config(), "TopLevelWindow"); connect(_ResultView, TQT_SIGNAL(linkClicked(const TQString &)), TQT_SLOT(ressearch(const TQString &))); - connect(kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(autoSearch())); + connect(kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(autoSearch())); - TQTimer::singleShot(10, this, TQT_SLOT(finishInit())); + TQTimer::singleShot(10, TQT_TQOBJECT(this), TQT_SLOT(finishInit())); } TopLevel::~TopLevel() @@ -142,7 +142,7 @@ void TopLevel::finishInit() Edit->clear(); // make sure the edit is focused initially StatusBar->message(i18n("Welcome to Kiten")); - setCaption(TQString::null); + setCaption(TQString()); } bool TopLevel::queryClose() @@ -172,7 +172,7 @@ void TopLevel::addToList() if (learnList.isEmpty()) createLearn(); else - StatusBar->message(i18n("%1 added to learn list of all open learn windows").arg(toAddKanji.kanji())); + StatusBar->message(i18n("%1 added to learn list of all open learn windows").tqarg(toAddKanji.kanji())); emit add(toAddKanji); } @@ -257,12 +257,12 @@ void TopLevel::handleSearchResult(Dict::SearchResult results) addAction->setEnabled(true); - _ResultView->append(TQString("

%1

").arg(i18n("HTML Entity: %1").arg(TQString("&#x%1;").arg(TQString::number(toAddKanji.kanji().at(0).unicode(), 16))))); // show html entity + _ResultView->append(TQString("

%1

").tqarg(i18n("HTML Entity: %1").tqarg(TQString("&#x%1;").tqarg(TQString::number(toAddKanji.kanji().tqat(0).tqunicode(), 16))))); // show html entity // now show some compounds in which this kanji appears TQString kanji = toAddKanji.kanji(); - _ResultView->addHeader(i18n("%1 in compounds").arg(kanji)); + _ResultView->addHeader(i18n("%1 in compounds").tqarg(kanji)); Dict::SearchResult compounds = _Asyndeta.retrieveIndex()->search(TQRegExp(kanji), kanji, true); bool common = true; @@ -396,7 +396,7 @@ void TopLevel::search(bool inResults) TQStringList::Iterator nit = names.begin(); for (TQStringList::Iterator it = res.begin(); it != res.end(); ++it, ++nit) { - if (done.contains(*it) > 0) + if (done.tqcontains(*it) > 0) continue; //kdDebug() << "currently on deinflection " << *it << endl; @@ -442,7 +442,7 @@ void TopLevel::strokeSearch() if (!ok) { /* - if (text.find("-") < 0) + if (text.tqfind("-") < 0) { StatusBar->message(i18n("For a range between 4 and 8 strokes, use '4-8'")); return; @@ -498,7 +498,7 @@ void TopLevel::strokeSearch() // must be in kanjidic mode kanjiCB->setChecked(true); - doSearch(TQString("S%1 ").arg(strokesString), regexp); + doSearch(TQString("S%1 ").tqarg(strokesString), regexp); } void TopLevel::gradeSearch() @@ -519,7 +519,7 @@ void TopLevel::gradeSearch() return; } - TQString text = TQString("G%1 ").arg(grade); + TQString text = TQString("G%1 ").tqarg(grade); TQRegExp regexp = TQRegExp(text); kanjiCB->setChecked(true); @@ -529,9 +529,9 @@ void TopLevel::gradeSearch() TQString TopLevel::clipBoardText() // gets text from clipboard for globalaccels { - kapp->clipboard()->setSelectionMode(true); - TQString text = kapp->clipboard()->text().stripWhiteSpace(); - kapp->clipboard()->setSelectionMode(false); + kapp->tqclipboard()->setSelectionMode(true); + TQString text = kapp->tqclipboard()->text().stripWhiteSpace(); + kapp->tqclipboard()->setSelectionMode(false); return text; } @@ -540,10 +540,10 @@ TQString TopLevel::filteredClipboardText() { TQString newText = clipBoardText(); TQString currentText = Edit->text(); - if (newText.length() < 80 && newText.find(':') < 0 && newText.find('#') < 0 && newText.find("-") != 0 && newText.find("+") < 0 && currentText.find(newText) < 0) + if (newText.length() < 80 && newText.tqfind(':') < 0 && newText.tqfind('#') < 0 && newText.tqfind("-") != 0 && newText.tqfind("+") < 0 && currentText.tqfind(newText) < 0) return newText; else - return TQString::null; + return TQString(); } void TopLevel::autoSearch() @@ -585,7 +585,7 @@ void TopLevel::setResults(unsigned int results, unsigned int fullNum) TQString str = i18n("%n result","%n results",results); if (results < fullNum) - str += i18n(" out of %1").arg(fullNum); + str += i18n(" out of %1").tqarg(fullNum); StatusBar->message(str); setCaption(str); @@ -610,8 +610,8 @@ void TopLevel::slotConfigure() //ConfigureDialog didn't find an instance of this dialog, so lets create it : optionDialog = new ConfigureDialog(this, "settings"); connect(optionDialog, TQT_SIGNAL(hidden()),this,TQT_SLOT(slotConfigureHide())); - connect(optionDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotConfigurationChanged())); - connect(optionDialog, TQT_SIGNAL(valueChanged()), this, TQT_SIGNAL(quizConfChanged())); + connect(optionDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigurationChanged())); + connect(optionDialog, TQT_SIGNAL(valueChanged()), TQT_TQOBJECT(this), TQT_SIGNAL(quizConfChanged())); optionDialog->show(); return; @@ -625,7 +625,7 @@ void TopLevel::slotLearnConfigure() void TopLevel::slotConfigureHide() { - TQTimer::singleShot(0, this, TQT_SLOT(slotConfigureDestroy())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureDestroy())); } void TopLevel::slotConfigureDestroy() @@ -641,9 +641,9 @@ void TopLevel::createLearn() { Learn *_Learn = new Learn(_Asyndeta.retrieveIndex(), 0); - connect(_Learn, TQT_SIGNAL(destroyed(Learn *)), this, TQT_SLOT(learnDestroyed(Learn *))); - connect(_Learn, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(ressearch(const TQString &))); - connect(_Learn, TQT_SIGNAL(configureLearn()), this, TQT_SLOT(slotLearnConfigure())); + connect(_Learn, TQT_SIGNAL(destroyed(Learn *)), TQT_TQOBJECT(this), TQT_SLOT(learnDestroyed(Learn *))); + connect(_Learn, TQT_SIGNAL(linkClicked(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(ressearch(const TQString &))); + connect(_Learn, TQT_SIGNAL(configureLearn()), TQT_TQOBJECT(this), TQT_SLOT(slotLearnConfigure())); connect(this, TQT_SIGNAL(quizConfChanged()), _Learn, TQT_SLOT(updateQuizConfiguration())); connect(this, TQT_SIGNAL(add(Dict::Entry)), _Learn, TQT_SLOT(add(Dict::Entry))); @@ -681,7 +681,7 @@ TQRegExp TopLevel::readingSearchItems(bool kanji) else regexp = "\\[%1\\]"; - regexp = regexp.arg(text); + regexp = regexp.tqarg(text); return TQRegExp(regexp, Config::caseSensitive()); } @@ -699,7 +699,7 @@ TQRegExp TopLevel::kanjiSearchItems(bool beginning) else regexp = "^%1\\W"; - regexp = regexp.arg(text); + regexp = regexp.tqarg(text); return TQRegExp(regexp, Config::caseSensitive()); } @@ -711,13 +711,13 @@ TQRegExp TopLevel::searchItems() if (text.isEmpty()) return TQRegExp(); //empty - unsigned int contains = text.contains(TQRegExp("[A-Za-z0-9_:]")); - if (Config::wholeWord() && contains == text.length()) + unsigned int tqcontains = text.tqcontains(TQRegExp("[A-Za-z0-9_:]")); + if (Config::wholeWord() && tqcontains == text.length()) regexp = "\\W%1\\W"; else regexp = "%1"; - regexp = regexp.arg(text); + regexp = regexp.tqarg(text); return TQRegExp(regexp, Config::caseSensitive()); } @@ -743,7 +743,7 @@ void TopLevel::newToolBarConfig() RadWidget *TopLevel::radicalSearch() { RadWidget *rw = new RadWidget(&_Rad, 0, "rw"); - connect(rw, TQT_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), this, TQT_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int))); + connect(rw, TQT_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), TQT_TQOBJECT(this), TQT_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int))); rw->show(); return rw; } @@ -772,12 +772,12 @@ void TopLevel::radSearch(const TQStringList &_list, unsigned int strokes, unsign already = true; } - hist.text = i18n("Radical(s): %1").arg(prettyRadicalString); + hist.text = i18n("Radical(s): %1").tqarg(prettyRadicalString); if (strokes) - hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").arg(prettyRadicalString).arg(strokes), true)); + hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").tqarg(prettyRadicalString).tqarg(strokes), true)); else - hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").arg(prettyRadicalString), true)); + hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").tqarg(prettyRadicalString), true)); TQString strokesString; if (strokes) @@ -800,7 +800,7 @@ void TopLevel::radSearch(const TQStringList &_list, unsigned int strokes, unsign for (it = list.begin(); it != list.end(); ++it) { - Dict::SearchResult results = _Asyndeta.retrieveIndex()->searchKanji(TQRegExp(strokes? (TQString("S%1 ").arg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked()); + Dict::SearchResult results = _Asyndeta.retrieveIndex()->searchKanji(TQRegExp(strokes? (TQString("S%1 ").tqarg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked()); hist.outOf += results.outOf; if (results.count < 1) diff --git a/kiten/kiten.h b/kiten/kiten.h index 13500898..cc700339 100644 --- a/kiten/kiten.h +++ b/kiten/kiten.h @@ -41,9 +41,10 @@ class ResultView; class KDE_EXPORT TopLevel : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - TopLevel(TQWidget *parent = 0, const char *name = 0); + TopLevel(TQWidget *tqparent = 0, const char *name = 0); ~TopLevel(); signals: diff --git a/kiten/kloader.cpp b/kiten/kloader.cpp index 6ae2da6c..e691f506 100644 --- a/kiten/kloader.cpp +++ b/kiten/kloader.cpp @@ -79,7 +79,7 @@ bool KLoader::open(void) { if(!d->file->open(IO_ReadOnly)) { - d->error = i18n("Could not read from %1.").arg(d->url.prettyURL()); + d->error = i18n("Could not read from %1.").tqarg(d->url.prettyURL()); return false; } } @@ -87,14 +87,14 @@ bool KLoader::open(void) { if(!KIO::NetAccess::download(d->url, d->tempFile)) { - d->error = i18n("Could not read from %1.").arg(d->url.prettyURL()); + d->error = i18n("Could not read from %1.").tqarg(d->url.prettyURL()); return false; } d->file = new TQFile(d->tempFile); if(!d->file->open(IO_ReadOnly)) { - d->error = i18n("Could not read from %1.").arg(d->tempFile); + d->error = i18n("Could not read from %1.").tqarg(d->tempFile); return false; } } diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp index d58ff2e0..f75f2238 100644 --- a/kiten/kromajiedit.cpp +++ b/kiten/kromajiedit.cpp @@ -28,8 +28,8 @@ #include "kromajiedit.h" -KRomajiEdit::KRomajiEdit(TQWidget *parent, const char *name) - : KLineEdit(parent, name) +KRomajiEdit::KRomajiEdit(TQWidget *tqparent, const char *name) + : KLineEdit(tqparent, name) { kana = "unset"; @@ -163,21 +163,21 @@ void KRomajiEdit::keyPressEvent(TQKeyEvent *e) ji = ji.lower(); //kdDebug() << "ji = " << ji << endl; - TQString replace; + TQString tqreplace; //kdDebug () << "kana is " << kana << endl; if (kana == "hiragana") - replace = hiragana[ji]; + tqreplace = hiragana[ji]; else if (kana == "katakana") - replace = katakana[ji]; + tqreplace = katakana[ji]; - //kdDebug() << "replace = " << replace << endl; + //kdDebug() << "tqreplace = " << tqreplace << endl; - if (!!replace) // if (replace has something in it) + if (!!tqreplace) // if (replace has something in it) { //kdDebug() << "replace isn't empty\n"; - setText(curKana + replace); + setText(curKana + tqreplace); if (kana == "katakana") kana = "hiragana"; diff --git a/kiten/kromajiedit.h b/kiten/kromajiedit.h index d3766adb..c81efd04 100644 --- a/kiten/kromajiedit.h +++ b/kiten/kromajiedit.h @@ -33,9 +33,10 @@ class TQPopupMenu; class KRomajiEdit : public KLineEdit { Q_OBJECT + TQ_OBJECT public: - KRomajiEdit(TQWidget *parent, const char *name); + KRomajiEdit(TQWidget *tqparent, const char *name); ~KRomajiEdit(); public slots: diff --git a/kiten/ksaver.cpp b/kiten/ksaver.cpp index 8e36f6d1..2ce2edb4 100644 --- a/kiten/ksaver.cpp +++ b/kiten/ksaver.cpp @@ -85,7 +85,7 @@ bool KSaver::open(void) } else { - d->error = i18n("Could not write to %1.").arg(d->url.prettyURL()); + d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL()); return false; } } diff --git a/kiten/learn.cpp b/kiten/learn.cpp index 02b21618..79493131 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -46,8 +46,8 @@ #include "ksaver.h" #include "learn.h" -LearnItem::LearnItem(TQListView *parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8) - : TQListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) +LearnItem::LearnItem(TQListView *tqparent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8) + : TQListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8) { } @@ -60,10 +60,10 @@ int LearnItem::compare(TQListViewItem *item, int col, bool ascending) const const int Learn::numberOfAnswers = 5; -Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) - : KMainWindow(parent, name), initialized(false), isMod(false), prevItem(0), curItem(0) +Learn::Learn(Dict::Index *tqparentDict, TQWidget *tqparent, const char *name) + : KMainWindow(tqparent, name), initialized(false), isMod(false), prevItem(0), curItem(0) { - index = parentDict; + index = tqparentDict; TQWidget *dummy = new TQWidget(this); setCentralWidget(dummy); @@ -113,40 +113,40 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) grades.append(i18n("Others in Jouyou")); grades.append(i18n("Jinmeiyou")); - /*KAction *closeAction = */(void) KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - printAct = KStdAction::print(this, TQT_SLOT(print()), actionCollection()); - forwardAct = KStdAction::forward(this, TQT_SLOT(next()), actionCollection()); + /*KAction *closeAction = */(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + printAct = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); + forwardAct = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(next()), actionCollection()); forwardAct->plug(toolBar()); - backAct = KStdAction::back(this, TQT_SLOT(prev()), actionCollection()); + backAct = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(prev()), actionCollection()); backAct->plug(toolBar()); - cheatAct = new KAction(i18n("&Cheat"), CTRL + Key_C, this, TQT_SLOT(cheat()), actionCollection(), "cheat"); - randomAct = new KAction(i18n("&Random"), "goto", CTRL + Key_R, this, TQT_SLOT(random()), actionCollection(), "random"); + cheatAct = new KAction(i18n("&Cheat"), CTRL + Key_C, TQT_TQOBJECT(this), TQT_SLOT(cheat()), actionCollection(), "cheat"); + randomAct = new KAction(i18n("&Random"), "goto", CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(random()), actionCollection(), "random"); gradeAct = new KListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade"); gradeAct->setItems(grades); connect(gradeAct, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(updateGrade())); - removeAct = new KAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQT_SLOT(del()), actionCollection(), "del"); - addAct = new KAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQT_SLOT(add()), actionCollection(), "add"); - addAllAct = new KAction(i18n("Add A&ll"), 0, this, TQT_SLOT(addAll()), actionCollection(), "addall"); - newAct = KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection()); - openAct = KStdAction::open(this, TQT_SLOT(open()), actionCollection()); - saveAct = KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - saveAsAct = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); - (void) KStdAction::preferences(this, TQT_SIGNAL(configureLearn()), actionCollection()); + removeAct = new KAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del"); + addAct = new KAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add"); + addAllAct = new KAction(i18n("Add A&ll"), 0, TQT_TQOBJECT(this), TQT_SLOT(addAll()), actionCollection(), "addall"); + newAct = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); + openAct = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); + saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); + saveAsAct = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); + (void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SIGNAL(configureLearn()), actionCollection()); removeAct->setEnabled(false); TQVBoxLayout *quizLayout = new TQVBoxLayout(quizTop, KDialog::marginHint(), KDialog::spacingHint()); quizLayout->addStretch(); - TQHBoxLayout *hlayout = new TQHBoxLayout(quizLayout); + TQHBoxLayout *htqlayout = new TQHBoxLayout(quizLayout); qKanji = new TQPushButton(quizTop); connect(qKanji, TQT_SIGNAL(clicked()), this, TQT_SLOT(qKanjiClicked())); - hlayout->addStretch(); - hlayout->addWidget(qKanji); - hlayout->addStretch(); + htqlayout->addStretch(); + htqlayout->addWidget(qKanji); + htqlayout->addStretch(); quizLayout->addStretch(); - answers = new TQButtonGroup(1, Horizontal, quizTop); + answers = new TQButtonGroup(1,Qt::Horizontal, quizTop); for (int i = 0; i < numberOfAnswers; ++i) answers->insert(new KPushButton(answers), i); quizLayout->addWidget(answers); @@ -299,7 +299,7 @@ void Learn::update() TQString kanji = curKanji.kanji(); Dict::SearchResult compounds = index->search(TQRegExp(kanji), kanji, true); - View->addHeader(i18n("%1 in compounds").arg(kanji)); + View->addHeader(i18n("%1 in compounds").tqarg(kanji)); for (TQValueListIterator it = compounds.list.begin(); it != compounds.list.end(); ++it) { @@ -315,12 +315,12 @@ void Learn::updateGrade() int grade = getCurrentGrade(); TQString regexp("G%1 "); - regexp = regexp.arg(grade); + regexp = regexp.tqarg(grade); Dict::SearchResult result = index->searchKanji(TQRegExp(regexp), regexp, false); list = result.list; - statusBar()->message(i18n("%1 entries in grade %2").arg(list.count()).arg(grade)); + statusBar()->message(i18n("%1 entries in grade %2").tqarg(list.count()).tqarg(grade)); list.remove(list.begin()); current = list.begin(); @@ -351,7 +351,7 @@ void Learn::read(const KURL &url) // ignore whitespace if (!kanji.isSpace()) { - TQRegExp regexp ( TQString("^%1\\W").arg(kanji) ); + TQRegExp regexp ( TQString("^%1\\W").tqarg(kanji) ); Dict::SearchResult res = index->searchKanji(regexp, kanji, false); Dict::Entry first = Dict::firstEntry(res); if (first.extendedKanjiInfo()) @@ -368,7 +368,7 @@ void Learn::open() return; KURL prevname = filename; - filename = KFileDialog::getOpenURL(TQString::null, "*.kiten"); + filename = KFileDialog::getOpenURL(TQString(), "*.kiten"); if (filename.isEmpty()) { filename = prevname; @@ -407,7 +407,7 @@ void Learn::openNew() void Learn::saveAs() { KURL prevname = filename; - filename = KFileDialog::getSaveURL(TQString::null, "*.kiten"); + filename = KFileDialog::getSaveURL(TQString(), "*.kiten"); if (filename.isEmpty()) { filename = prevname; @@ -444,7 +444,7 @@ void Learn::write(const KURL &url) stream.setCodec(&codec); for (TQListViewItemIterator it(List); it.current(); ++it) - stream << it.current()->text(0).at(0); + stream << it.current()->text(0).tqat(0); if (!saver.close()) { @@ -456,7 +456,7 @@ void Learn::write(const KURL &url) setClean(); - statusBar()->message(i18n("%1 written").arg(url.prettyURL())); + statusBar()->message(i18n("%1 written").tqarg(url.prettyURL())); } void Learn::saveScores() @@ -473,8 +473,8 @@ void Learn::add(Dict::Entry toAdd, bool noEmit) { // Remove peripheral readings: This is a study mode, not a reference mode TQRegExp inNames (",\\s*[A-Za-z ]+:.*"); - TQString readings = Dict::prettyKanjiReading(toAdd.readings()).replace(inNames, ""); - TQString meanings = shortenString(Dict::prettyMeaning(toAdd.meanings()).replace(inNames, "")); + TQString readings = Dict::prettyKanjiReading(toAdd.readings()).tqreplace(inNames, ""); + TQString meanings = shortenString(Dict::prettyMeaning(toAdd.meanings()).tqreplace(inNames, "")); TQString kanji = toAdd.kanji(); // here's a dirty rotten cheat (well, not really) @@ -485,13 +485,13 @@ void Learn::add(Dict::Entry toAdd, bool noEmit) { if (it.current()->text(0) == kanji) { - statusBar()->message(i18n("%1 already on your list").arg(kanji)); + statusBar()->message(i18n("%1 already on your list").tqarg(kanji)); return; } } } - statusBar()->message(i18n("%1 added to your list").arg(kanji)); + statusBar()->message(i18n("%1 added to your list").tqarg(kanji)); KConfig &config = *Config::self()->config(); int score = 0; @@ -515,7 +515,7 @@ void Learn::addAll() int grade = getCurrentGrade(); TQString regexp("G%1 "); - regexp = regexp.arg(grade); + regexp = regexp.tqarg(grade); Dict::SearchResult result = index->searchKanji(TQRegExp(regexp), regexp, false); for (TQValueListIterator i = result.list.begin(); i != result.list.end(); ++i) @@ -607,7 +607,7 @@ void Learn::del() void Learn::print() { View->clear(); - View->addHeader(TQString("

%1

").arg(i18n("Learning List")), 1); + View->addHeader(TQString("

%1

").tqarg(i18n("Learning List")), 1); TQListViewItemIterator it(List); for (; it.current(); ++it) @@ -730,7 +730,7 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings) } //kdDebug() << "curMeaning: " << curItem->text(guessOn) << endl; } - while (oldMeanings.contains(meaning) || meaning == curItem->text(guessOn)); + while (oldMeanings.tqcontains(meaning) || meaning == curItem->text(guessOn)); oldMeanings.append(meaning); meaning = shortenString(meaning); @@ -755,9 +755,9 @@ void Learn::qupdate() TQStringList oldMeanings; for (int i = 0; i < numberOfAnswers; ++i) - answers->find(i)->setText(randomMeaning(oldMeanings)); + answers->tqfind(i)->setText(randomMeaning(oldMeanings)); - answers->find(seikai)->setText(curItem->text(guessOn)); + answers->tqfind(seikai)->setText(curItem->text(guessOn)); } struct Learn::scoreCompare @@ -774,7 +774,7 @@ void Learn::qnew() // new quiz kanji nogood = false; statusBar()->clear(); - statusBar()->message(TQString("%1 %2 %3").arg(curItem->text(0)).arg(curItem->text(1)).arg(curItem->text(2))); + statusBar()->message(TQString("%1 %2 %3").tqarg(curItem->text(0)).tqarg(curItem->text(1)).tqarg(curItem->text(2))); backAct->setEnabled(true); @@ -834,7 +834,7 @@ void Learn::qnew() // new quiz kanji void Learn::cheat() { - answers->find(seikai)->setFocus(); + answers->tqfind(seikai)->setFocus(); statusBar()->message(i18n("Better luck next time")); nogood = true; } diff --git a/kiten/learn.h b/kiten/learn.h index c3d732db..7a8608ff 100644 --- a/kiten/learn.h +++ b/kiten/learn.h @@ -36,19 +36,20 @@ class TQSplitter; class TQTabWidget; // Item that sorts all columns numerically -class LearnItem : public QListViewItem +class LearnItem : public TQListViewItem { public: - LearnItem(TQListView *parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null); + LearnItem(TQListView *tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()); int compare(TQListViewItem *item, int col, bool ascending) const; }; class Learn : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - Learn(Dict::Index *, TQWidget *parent = 0, const char *name = 0); + Learn(Dict::Index *, TQWidget *tqparent = 0, const char *name = 0); ~Learn(); bool closeWindow(); diff --git a/kiten/main.cpp b/kiten/main.cpp index 8d013d15..1c920e16 100644 --- a/kiten/main.cpp +++ b/kiten/main.cpp @@ -27,7 +27,7 @@ #include "kiten.h" -void noMessageOutput(QtMsgType, const char *) +void noMessageOutput(TQtMsgType, const char *) { } @@ -39,7 +39,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - qInstallMsgHandler(noMessageOutput); + tqInstallMsgHandler(noMessageOutput); KAboutData aboutData( "kiten", I18N_NOOP("Kiten"), "1.2", I18N_NOOP("Japanese Reference Tool"), KAboutData::License_GPL, "(c) 2001-2004, Jason Katz-Brown", 0, "http://www.katzbrown.com/kiten"); diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp index 35c48b6e..94d0428e 100644 --- a/kiten/optiondialog.cpp +++ b/kiten/optiondialog.cpp @@ -40,12 +40,12 @@ #include "configlearn.h" #include "configsearching.h" -ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : KConfigDialog(parent, name, Config::self()) +ConfigureDialog::ConfigureDialog(TQWidget *tqparent, const char *name) : KConfigDialog(tqparent, name, Config::self()) { configDic = new ConfigDictionaries(0, "dictionaries_page"); connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons())); addPage(configDic, i18n("Dictionaries"), "contents"); - addPage(new ConfigSearching(0, "searching_page"), i18n("Searching"), "find"); + addPage(new ConfigSearching(0, "searching_page"), i18n("Searching"), "tqfind"); addPage(new ConfigLearn(0, "learn_page"), i18n("Learn"), "pencil"); ConfigFont* configFont = new ConfigFont(0, "font_page"); configFont->kcfg_font->setSampleText(i18n("Result View Font")+TQString::fromUtf8(" - ã„ã‚ã¯ã«ã»ã¸ã¨ 漢字")); diff --git a/kiten/optiondialog.h b/kiten/optiondialog.h index 03486d38..108cb759 100644 --- a/kiten/optiondialog.h +++ b/kiten/optiondialog.h @@ -41,8 +41,9 @@ class DictList; class ConfigureDialog : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: - ConfigureDialog(TQWidget *parent=0, const char *name=0); + ConfigureDialog(TQWidget *tqparent=0, const char *name=0); ~ConfigureDialog(); signals: void settingsUpdated(); diff --git a/kiten/rad.cpp b/kiten/rad.cpp index f3c31132..1f7da303 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -174,11 +174,11 @@ TQStringList Rad::kanjiByRad(const TQStringList &list) for (TQValueList::Iterator it = lists.begin(); it != lists.end(); ++it) { //kdDebug() << "looping through lists\n"; - outcomes.append((*it).contains(*kit) > 0); + outcomes.append((*it).tqcontains(*kit) > 0); } const bool containsBool = false; - if ((outcomes.contains(containsBool) < 1)) + if ((outcomes.tqcontains(containsBool) < 1)) { //kdDebug() << "appending " << *kit << endl; ret.append(*kit); @@ -198,7 +198,7 @@ Radical Rad::radByKanji(const TQString &text) TQString ret; TQValueListIterator it; - for (it = list.end(); it != list.begin() && (*it).kanji().find(text) == -1; --it); + for (it = list.end(); it != list.begin() && (*it).kanji().tqfind(text) == -1; --it); return (*it); } @@ -218,17 +218,17 @@ Rad::~Rad() /////////////////////////////////////////////// -RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(parent, name) +RadWidget::RadWidget(Rad *_rad, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) { hotlistNum = 3; rad = _rad; - TQHBoxLayout *hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); - hotlistGroup = new TQButtonGroup(1, Horizontal, i18n("Hotlist"), this); + hotlistGroup = new TQButtonGroup(1,Qt::Horizontal, i18n("Hotlist"), this); //hotlistGroup->setRadioButtonExclusive(true); - vlayout->addWidget(hotlistGroup); + vtqlayout->addWidget(hotlistGroup); Config* config = Config::self(); @@ -246,13 +246,13 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p } connect(hotlistGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(hotlistClicked(int))); - TQVBoxLayout *layout = new TQVBoxLayout(vlayout, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(vtqlayout, KDialog::spacingHint()); totalStrokes = new TQCheckBox(i18n("Search by total strokes"), this); connect(totalStrokes, TQT_SIGNAL(clicked()), this, TQT_SLOT(totalClicked())); - layout->addWidget(totalStrokes); + tqlayout->addWidget(totalStrokes); - TQHBoxLayout *strokesLayout = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQHBoxLayout *strokesLayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); totalSpin = new TQSpinBox(1, 30, 1, this); strokesLayout->addWidget(totalSpin); strokesLayout->addStretch(); @@ -264,13 +264,13 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p ok = new KPushButton(i18n("&Look Up"), this); ok->setEnabled(false); connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(apply())); - layout->addWidget(ok); + tqlayout->addWidget(ok); cancel = new KPushButton( KStdGuiItem::cancel(), this ); connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(close())); - layout->addWidget(cancel); + tqlayout->addWidget(cancel); - TQVBoxLayout *middlevLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); + TQVBoxLayout *middlevLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); strokesSpin = new TQSpinBox(1, 17, 1, this); TQToolTip::add(strokesSpin, i18n("Show radicals having this number of strokes")); @@ -281,18 +281,18 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p connect(List, TQT_SIGNAL(executed(TQListBoxItem *)), this, TQT_SLOT(executed(TQListBoxItem *))); connect(strokesSpin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateList(int))); - TQVBoxLayout *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); + TQVBoxLayout *rightvtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); selectedList = new KListBox(this); - rightvlayout->addWidget(selectedList); + rightvtqlayout->addWidget(selectedList); connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); remove = new KPushButton(i18n("&Remove"), this); - rightvlayout->addWidget(remove); + rightvtqlayout->addWidget(remove); connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelected())); remove->setEnabled(false); clear = new KPushButton(KStdGuiItem::clear(), this); - rightvlayout->addWidget(clear); + rightvtqlayout->addWidget(clear); connect(clear, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearSelected())); clear->setEnabled(false); @@ -360,7 +360,7 @@ void RadWidget::addRadical(const TQString &radical) void RadWidget::addToSelected(const TQString &text) { - if (!text.isNull() && !selected.contains(text)) + if (!text.isNull() && !selected.tqcontains(text)) { selectedList->insertItem(text); selected.append(text); @@ -398,10 +398,10 @@ void RadWidget::apply() for (TQStringList::Iterator it = selected.begin(); it != selected.end(); ++it) { - if (hotlist.find(*it) == hotlist.end()) + if (hotlist.tqfind(*it) == hotlist.end()) { if (hotlist.size() >= hotlistNum) - hotlist.pop_front(); // stupid stl functions in Qt .. ;) + hotlist.pop_front(); // stupid stl functions in TQt .. ;) hotlist.append(*it); config->setHotlist(hotlist); diff --git a/kiten/rad.h b/kiten/rad.h index fd2cca5a..f43cf4ef 100644 --- a/kiten/rad.h +++ b/kiten/rad.h @@ -36,7 +36,7 @@ class TQButtonGroup; class KDE_EXPORT Radical { public: - Radical(TQString = TQString::null, unsigned int = 0); + Radical(TQString = TQString(), unsigned int = 0); TQString radical() { return _Radical; } unsigned int strokes() { return Strokes; } @@ -50,9 +50,10 @@ class KDE_EXPORT Radical TQString Kanji; }; -class KDE_EXPORT Rad : public QObject +class KDE_EXPORT Rad : public TQObject { Q_OBJECT + TQ_OBJECT public: Rad(); @@ -71,12 +72,13 @@ class KDE_EXPORT Rad : public QObject bool loaded; }; -class KDE_EXPORT RadWidget : public QWidget +class KDE_EXPORT RadWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - RadWidget(Rad *, TQWidget *parent = 0, const char *name = 0); + RadWidget(Rad *, TQWidget *tqparent = 0, const char *name = 0); ~RadWidget(); signals: diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index cfe4c18a..94d61b83 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -43,8 +43,8 @@ #include "kromajiedit.h" #include "widgets.h" -ResultView::ResultView(bool showLinks, TQWidget *parent, const char *name) - : KTextBrowser(parent, name) +ResultView::ResultView(bool showLinks, TQWidget *tqparent, const char *name) + : KTextBrowser(tqparent, name) { setReadOnly(true); setLinkUnderline(false); @@ -59,7 +59,7 @@ void ResultView::addResult(Dict::Entry result, bool common) { if (result.dictName() != "__NOTSET") { - addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).arg(result.dictName()), 5); + addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).tqarg(result.dictName()), 5); return; } if (result.header() != "__NOTSET") @@ -70,15 +70,15 @@ void ResultView::addResult(Dict::Entry result, bool common) TQString html; if (result.kanaOnly()) - html = TQString("

%1 ").arg(result.firstReading()); + html = TQString("

%1 ").tqarg(result.firstReading()); else - html = TQString("

%1: %2 ").arg(putchars(result.kanji())).arg(result.firstReading()); + html = TQString("

%1: %2 ").tqarg(putchars(result.kanji())).tqarg(result.firstReading()); TQStringList::Iterator it; TQStringList Meanings = result.meanings(); for (it = Meanings.begin(); it != Meanings.end(); ++it) { - if ((*it).find("(P)") >= 0) + if ((*it).tqfind("(P)") >= 0) { if (common) continue; @@ -103,7 +103,7 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad) { if (result.dictName() != "__NOTSET") { - addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).arg(result.dictName()), 5); + addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).tqarg(result.dictName()), 5); return; } if (result.header() != "__NOTSET") @@ -113,15 +113,15 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad) } TQString html; - html = TQString("

%1: %2 ").arg(putchars(result.kanji())); + html = TQString("

%1: %2 ").tqarg(putchars(result.kanji())); unsigned int freq = result.freq(); if (freq == 0) // does it have a frequency? - html = html.arg(i18n("Rare")); + html = html.tqarg(i18n("Rare")); else // this isn't a number of times, it's simply an index of // probability - html = html.arg(i18n("Probability rank #%1").arg(freq)); + html = html.tqarg(i18n("Probability rank #%1").tqarg(freq)); html += "
"; @@ -171,25 +171,25 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad) switch (result.grade()) { case 0: - html = html.arg(i18n("None")); + html = html.tqarg(i18n("None")); break; case 8: - html = html.arg(i18n("In Jouyou")); + html = html.tqarg(i18n("In Jouyou")); break; case 9: - html = html.arg(i18n("In Jinmeiyou")); + html = html.tqarg(i18n("In Jinmeiyou")); break; default: - html = html.arg(result.grade()); + html = html.tqarg(result.grade()); } - html = html.arg(result.strokes()); + html = html.tqarg(result.strokes()); if (result.miscount() != 0) - html.append(i18n(" Common Miscount: %1.").arg(result.miscount())); + html.append(i18n(" Common Miscount: %1.").tqarg(result.miscount())); if (!!rad.radical()) - html.append(i18n(" Largest radical: %1, with %2 strokes.").arg(TQString("%2").arg(rad.radical()).arg(rad.radical())).arg(rad.strokes())); + html.append(i18n(" Largest radical: %1, with %2 strokes.").tqarg(TQString("%2").tqarg(rad.radical()).tqarg(rad.radical())).tqarg(rad.strokes())); html += "

"; @@ -198,7 +198,7 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad) void ResultView::addHeader(const TQString &header, unsigned int degree) { - append(TQString("%2").arg(degree).arg(header).arg(degree)); + append(TQString("%2").tqarg(degree).tqarg(header).tqarg(degree)); } TQString ResultView::putchars(const TQString &text) @@ -212,7 +212,7 @@ TQString ResultView::putchars(const TQString &text) for (unsigned i = 0; i < len; i++) { if (Dict::textType(TQString(text.at(i))) == Dict::Text_Kanji) - ret.append(TQString("%1").arg(text.at(i)).arg(text.at(i))); + ret.append(TQString("%1").tqarg(text.tqat(i)).tqarg(text.tqat(i))); else ret.append(text.at(i)); } @@ -251,13 +251,13 @@ void ResultView::print(TQString title) TQRect body(dpix, dpiy, metrics.width() - margin * dpix / margin * 2, metrics.height() - margin * dpiy / margin * 2); - TQSimpleRichText richText(title.isNull()? printText : i18n("

Search for \"%1\"

").arg(title) + printText, font(), context(), styleSheet(), mimeSourceFactory(), body.height(), Qt::black, false); + TQSimpleRichText richText(title.isNull()? printText : i18n("

Search for \"%1\"

").tqarg(title) + printText, font(), context(), styleSheet(), mimeSourceFactory(), body.height(), TQt::black, false); richText.setWidth(&p, body.width()); TQRect view(body); int page = 1; - TQColorGroup goodColorGroup = TQColorGroup(colorGroup()); - goodColorGroup.setColor(TQColorGroup::Link, Qt::black); + TQColorGroup goodColorGroup = TQColorGroup(tqcolorGroup()); + goodColorGroup.setColor(TQColorGroup::Link, TQt::black); do { @@ -268,7 +268,7 @@ void ResultView::print(TQString title) TQFont myFont(font()); myFont.setPointSize(9); p.setFont(myFont); - TQString footer(TQString("%1 - Kiten").arg(TQString::number(page))); + TQString footer(TQString("%1 - Kiten").tqarg(TQString::number(page))); p.drawText(view.right() - p.fontMetrics().width(footer), view.bottom() + p.fontMetrics().ascent() + 5, footer); @@ -292,8 +292,8 @@ void ResultView::updateFont() ///////////////////////////////////////////////////// // nice EDICT dictionary editor -eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name) - : KMainWindow(parent, name) +eEdit::eEdit(const TQString &_filename, TQWidget *tqparent, const char *name) + : KMainWindow(tqparent, name) , filename(_filename) { List = new KListView(this); @@ -317,11 +317,11 @@ eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name) List->setMultiSelection(true); List->setDragEnabled(true); - saveAct = KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - removeAct = new KAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQT_SLOT(del()), actionCollection(), "del"); - (void) new KAction(i18n("&Disable Dictionary"), 0, this, TQT_SLOT(disable()), actionCollection(), "disable"); - addAct = new KAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQT_SLOT(add()), actionCollection(), "add"); - (void) KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); + removeAct = new KAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del"); + (void) new KAction(i18n("&Disable Dictionary"), 0, TQT_TQOBJECT(this), TQT_SLOT(disable()), actionCollection(), "disable"); + addAct = new KAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add"); + (void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); createGUI("eeditui.rc"); //closeAction->plug(toolBar()); @@ -357,9 +357,9 @@ void eEdit::openFile(const TQString &file) continue; Dict::Entry entry = Dict::parse(s); TQString meanings = Dict::prettyMeaning(entry.meanings()); - bool common = meanings.find(TQString("(P)")) >= 0; - meanings.replace(TQRegExp("; "), "/"); - meanings.replace(TQRegExp("/\\(P\\)"), ""); + bool common = meanings.tqfind(TQString("(P)")) >= 0; + meanings.tqreplace(TQRegExp("; "), "/"); + meanings.tqreplace(TQRegExp("/\\(P\\)"), ""); new TQListViewItem(List, entry.kanji(), Dict::prettyKanjiReading(entry.readings()), meanings, common? i18n("yes") : i18n("no")); } } @@ -391,7 +391,7 @@ void eEdit::save() text.append(" "); if (!kanji.isEmpty()) - text.append(TQString("[%1] ").arg(reading)); + text.append(TQString("[%1] ").tqarg(reading)); text.append(meanings); if (common) @@ -414,7 +414,7 @@ void eEdit::save() void eEdit::disable() { - int result = KMessageBox::warningYesNo(this, i18n("Disabling your personal dictionary will delete its contents.\n\n(You can however always create your dictionary again.)"), TQString::null, i18n("Disable"), KStdGuiItem::cancel(), "DisableAsk", true); + int result = KMessageBox::warningYesNo(this, i18n("Disabling your personal dictionary will delete its contents.\n\n(You can however always create your dictionary again.)"), TQString(), i18n("Disable"), KStdGuiItem::cancel(), "DisableAsk", true); if (result == KMessageBox::No) return; @@ -436,8 +436,8 @@ void eEdit::del() ///////////////////////////////////////////////////// // sorta taken from konqy -EditAction::EditAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name) - : KAction(text, accel, parent, name) +EditAction::EditAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* tqparent, const char* name) + : KAction(text, accel, tqparent, name) { m_receiver = receiver; m_member = member; @@ -462,7 +462,7 @@ int EditAction::plug( TQWidget *w, int index ) addContainer(toolBar, id); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQT_SIGNAL( destroyed() ), TQT_TQOBJECT(this), TQT_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); diff --git a/kiten/widgets.h b/kiten/widgets.h index 82592bae..b1fdb9a9 100644 --- a/kiten/widgets.h +++ b/kiten/widgets.h @@ -37,9 +37,10 @@ class KStatusBar; class KDE_EXPORT ResultView : public KTextBrowser { Q_OBJECT + TQ_OBJECT public: - ResultView(bool showLinks, TQWidget *parent = 0, const char *name = 0); + ResultView(bool showLinks, TQWidget *tqparent = 0, const char *name = 0); void addResult(Dict::Entry result, bool common = false); void addKanjiResult(Dict::Entry, bool common = false, Radical = Radical()); @@ -47,7 +48,7 @@ class KDE_EXPORT ResultView : public KTextBrowser void addHeader(const TQString &, unsigned int degree = 3); public slots: - void print(TQString = TQString::null); + void print(TQString = TQString()); void append(const TQString &); void flush(); void clear(); @@ -66,9 +67,10 @@ class KDE_EXPORT ResultView : public KTextBrowser class KDE_EXPORT eEdit : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - eEdit(const TQString &, TQWidget *parent = 0, const char *name = 0); + eEdit(const TQString &, TQWidget *tqparent = 0, const char *name = 0); ~eEdit(); private slots: @@ -91,8 +93,9 @@ class KDE_EXPORT eEdit : public KMainWindow class KDE_EXPORT EditAction : public KAction { Q_OBJECT + TQ_OBJECT public: - EditAction( const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name ); + EditAction( const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* tqparent, const char* name ); virtual ~EditAction(); virtual int plug( TQWidget *w, int index = -1 ); diff --git a/kiten/xjdic.h b/kiten/xjdic.h index 1e9ae68a..a6d34822 100644 --- a/kiten/xjdic.h +++ b/kiten/xjdic.h @@ -58,8 +58,8 @@ #define XJ_FIND 1 /* find entry */ #define XJ_ENTRY 2 /* get this entry according to index */ -#define XJ_OK 3 /* find/entry_get succeeded */ -#define XJ_NBG 4 /* find/entry_get failed */ +#define XJ_OK 3 /* tqfind/entry_get succeeded */ +#define XJ_NBG 4 /* tqfind/entry_get failed */ #define XJ_PROTERR 5 /* protocol error - server only */ #define XJ_HULLO 6 /* just send back an XJ_OK and # dics */ #define XJ_GET 7 /* get this entry, wo checking any match*/ @@ -76,7 +76,7 @@ typedef struct { int32_t xjdreq_indexpos; short xjdreq_schlen; unsigned char xjdreq_schstr[21]; - } REQ_PDU; + } RETQ_PDU; typedef struct { int32_t xjdrsp_checksum; diff --git a/klatin/klatin/data/vocab/en/I2L.kvtml b/klatin/klatin/data/vocab/en/I2L.kvtml index 367475ba..50057535 100644 --- a/klatin/klatin/data/vocab/en/I2L.kvtml +++ b/klatin/klatin/data/vocab/en/I2L.kvtml @@ -35,7 +35,7 @@ invenio (3) - find + tqfind invito (1) @@ -151,7 +151,7 @@ liberi (2) - children + tqchildren libero (1) diff --git a/klatin/klatin/data/vocab/pl/A.kvtml b/klatin/klatin/data/vocab/pl/A.kvtml index 3ccf4856..61e8c134 100644 --- a/klatin/klatin/data/vocab/pl/A.kvtml +++ b/klatin/klatin/data/vocab/pl/A.kvtml @@ -187,6 +187,6 @@ auxilium (2) - pomoc + potqmoc diff --git a/klatin/klatin/data/vocab/pl/V.kvtml b/klatin/klatin/data/vocab/pl/V.kvtml index 6ace2e9a..d793ed8a 100644 --- a/klatin/klatin/data/vocab/pl/V.kvtml +++ b/klatin/klatin/data/vocab/pl/V.kvtml @@ -3,7 +3,7 @@ valde - bardzo, mocno, gwaÅ‚townie + bardzo, tqmocno, gwaÅ‚townie vale diff --git a/klatin/klatin/data/vocab/sk/A.kvtml b/klatin/klatin/data/vocab/sk/A.kvtml index f8cbd879..56c5f2f2 100644 --- a/klatin/klatin/data/vocab/sk/A.kvtml +++ b/klatin/klatin/data/vocab/sk/A.kvtml @@ -187,6 +187,6 @@ auxilium (2) - podpora, pomoc + podpora, potqmoc diff --git a/klatin/klatin/data/vocab/sk/BC.kvtml b/klatin/klatin/data/vocab/sk/BC.kvtml index fc4da165..0d31ad31 100644 --- a/klatin/klatin/data/vocab/sk/BC.kvtml +++ b/klatin/klatin/data/vocab/sk/BC.kvtml @@ -39,7 +39,7 @@ capio (3) - braÅ¥, uchopiÅ¥, chápaÅ¥, zmocniÅ¥ sa + braÅ¥, uchopiÅ¥, chápaÅ¥, ztqmocniÅ¥ sa captivus (2) diff --git a/klatin/klatin/data/vocab/sk/GHI1.kvtml b/klatin/klatin/data/vocab/sk/GHI1.kvtml index 3a37603c..17d88b20 100644 --- a/klatin/klatin/data/vocab/sk/GHI1.kvtml +++ b/klatin/klatin/data/vocab/sk/GHI1.kvtml @@ -127,7 +127,7 @@ imperium (2) - vláda, zvrchovaná moc, rozkaz + vláda, zvrchovaná tqmoc, rozkaz impero (1) diff --git a/klatin/klatin/data/vocab/sk/M.kvtml b/klatin/klatin/data/vocab/sk/M.kvtml index ea61fd1d..e18e12c0 100644 --- a/klatin/klatin/data/vocab/sk/M.kvtml +++ b/klatin/klatin/data/vocab/sk/M.kvtml @@ -3,7 +3,7 @@ magnopere - veľmi, moc + veľmi, tqmoc magnus diff --git a/klatin/klatin/data/vocab/sk/P2.kvtml b/klatin/klatin/data/vocab/sk/P2.kvtml index 9b2cf3aa..15c91231 100644 --- a/klatin/klatin/data/vocab/sk/P2.kvtml +++ b/klatin/klatin/data/vocab/sk/P2.kvtml @@ -47,7 +47,7 @@ possum (irreg) - môcÅ¥, byÅ¥ schopný, maÅ¥ moc, dokázaÅ¥ + môcÅ¥, byÅ¥ schopný, maÅ¥ tqmoc, dokázaÅ¥ post + acc diff --git a/klatin/klatin/data/vocab/sk/QR.kvtml b/klatin/klatin/data/vocab/sk/QR.kvtml index 7db08854..0517ac99 100644 --- a/klatin/klatin/data/vocab/sk/QR.kvtml +++ b/klatin/klatin/data/vocab/sk/QR.kvtml @@ -67,7 +67,7 @@ rapio (3) - uchvátiÅ¥, zmocniÅ¥ sa + uchvátiÅ¥, ztqmocniÅ¥ sa re- @@ -95,7 +95,7 @@ regnum (2) - najvyÅ¡Å¡ia moc, kráľovstvo, majetok + najvyÅ¡Å¡ia tqmoc, kráľovstvo, majetok regredior (3) diff --git a/klatin/klatin/data/vocab/sk/TU.kvtml b/klatin/klatin/data/vocab/sk/TU.kvtml index a9d9c264..3f5bf6ce 100644 --- a/klatin/klatin/data/vocab/sk/TU.kvtml +++ b/klatin/klatin/data/vocab/sk/TU.kvtml @@ -27,7 +27,7 @@ tantus - tak veľký, len toľko, mocný, slávny + tak veľký, len toľko, tqmocný, slávny templum (2) @@ -43,7 +43,7 @@ teneo (2) - držaÅ¥, maÅ¥ v moci + držaÅ¥, maÅ¥ v tqmoci terra (1) diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp index 09a8a426..3caed219 100644 --- a/klatin/klatin/klatin.cpp +++ b/klatin/klatin/klatin.cpp @@ -32,8 +32,8 @@ #include "klatin.h" #include "settings.h" -KLatin::KLatin(TQWidget* parent, const char *name) - : KMainWindow(parent, name) +KLatin::KLatin(TQWidget* tqparent, const char *name) + : KMainWindow(tqparent, name) { m_section = 0; @@ -53,12 +53,12 @@ KLatin::~KLatin() void KLatin::setupActions() { // Setup various menu actions - KStdAction::preferences(this, TQT_SLOT(loadSettings()), actionCollection()); - m_loadVocab = new KAction(i18n("Load &Vocabulary"), 0, this, TQT_SLOT(loadVocab()), actionCollection(), "go_vocab"); - m_loadGrammar = new KAction(i18n("Load &Grammar"), 0, this, TQT_SLOT(loadGrammar()), actionCollection(), "go_grammar"); - m_loadVerbs = new KAction(i18n("Load V&erbs"), 0, this, TQT_SLOT(loadVerbs()), actionCollection(), "go_verbs"); - m_loadRevision = new KAction(i18n("Load &Revision"), 0, this, TQT_SLOT(loadRevision()), actionCollection(), "go_revision"); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(loadSettings()), actionCollection()); + m_loadVocab = new KAction(i18n("Load &Vocabulary"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVocab()), actionCollection(), "go_vocab"); + m_loadGrammar = new KAction(i18n("Load &Grammar"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadGrammar()), actionCollection(), "go_grammar"); + m_loadVerbs = new KAction(i18n("Load V&erbs"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVerbs()), actionCollection(), "go_verbs"); + m_loadRevision = new KAction(i18n("Load &Revision"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadRevision()), actionCollection(), "go_revision"); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); } void KLatin::startClicked() @@ -91,7 +91,7 @@ void KLatin::loadVocab() // When the child emits the signal exitted(), // then reset the GUI to go back to the menu - connect(klatinvocabsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI())); + connect(klatinvocabsection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); // Set the section variable m_section = 1; @@ -114,8 +114,8 @@ void KLatin::loadGrammar() // When the child emits the signal exited(), // then reset the GUI to go back to the menu - connect(klatingrammarsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI())); - connect(klatingrammarsection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotWriteMsg(const TQString&))); + connect(klatingrammarsection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); + connect(klatingrammarsection, TQT_SIGNAL(statusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotWriteMsg(const TQString&))); // Set the section variable m_section = 2; } @@ -142,8 +142,8 @@ void KLatin::loadVerbs() // When the child emits the signal exited(), // then reset the GUI to go back to the menu - connect(klatinverbssection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI())); - connect(klatinverbssection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotWriteMsg(const TQString&))); + connect(klatinverbssection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); + connect(klatinverbssection, TQT_SIGNAL(statusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotWriteMsg(const TQString&))); // Set the section variable m_section = 3; @@ -166,7 +166,7 @@ void KLatin::loadSettings() vocabPage->kcfg_DefaultFile->setFilter("*.kvtml"); vocabPage->kcfg_DefaultFile->setCaption(i18n("Load Vocabulary File")); dialog->addPage(vocabPage, i18n("Vocabulary"), "kdict"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(settingsChanged())); dialog->show(); } @@ -189,7 +189,7 @@ void KLatin::resetGUI() setCentralWidget(klatinchoose); // Connect the "Start" button to slot StartPressed() - connect(klatinchoose->StartButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(startClicked())); + connect(klatinchoose->StartButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(startClicked())); // Make the quit button quit the application :) connect(klatinchoose->QuitButton, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit())); diff --git a/klatin/klatin/klatin.h b/klatin/klatin/klatin.h index 91db4488..5b505bf7 100644 --- a/klatin/klatin/klatin.h +++ b/klatin/klatin/klatin.h @@ -36,8 +36,9 @@ class KLatin : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KLatin(TQWidget* parent=0, const char *name=0); + KLatin(TQWidget* tqparent=0, const char *name=0); ~KLatin(); void setupActions(); diff --git a/klatin/klatin/klatin.kcfg b/klatin/klatin/klatin.kcfg index 407f47a2..ec8fa52f 100644 --- a/klatin/klatin/klatin.kcfg +++ b/klatin/klatin/klatin.kcfg @@ -10,12 +10,12 @@ KConfigBase *globalConf = KGlobal::config(); globalConf->setGroup("Locale"); - QString m_language = globalConf->readEntry("Language", "en"); + TQString m_language = globalConf->readEntry("Language", "en"); //keep only the first 2 characters m_language = m_language.left(2); - QString filename = locate("data", "klatin/data/vocabs/"); + TQString filename = locate("data", "klatin/data/vocabs/"); filename += m_language; - QDir check(filename); + TQDir check(filename); if (check.exists() == FALSE) { m_language = "en"; @@ -37,12 +37,12 @@ - QString fileDir = locate("data", "klatin/data/vocabs/"); + TQString fileDir = locate("data", "klatin/data/vocabs/"); fileDir += m_language; - QDir vocabDirectory(fileDir, "*.kvtml"); + TQDir vocabDirectory(fileDir, "*.kvtml"); kdDebug()<< m_language <<endl; - QString defaultFile = (fileDir + "/" + vocabDirectory[0]); + TQString defaultFile = (fileDir + "/" + vocabDirectory[0]); kdDebug()<< defaultFile <<endl; defaultFile diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui index 98115187..ceb618a6 100644 --- a/klatin/klatin/klatinchoose.ui +++ b/klatin/klatin/klatinchoose.ui @@ -1,10 +1,10 @@ KLatinChoose - + KLatinChoose - + 0 0 @@ -24,15 +24,15 @@ unnamed - + - layout81 + tqlayout81 unnamed - + WelcomeLabel @@ -46,19 +46,19 @@ Welcome to KLatin Please Choose Section of Revision - + AlignCenter - + - layout80 + tqlayout80 unnamed - + Options @@ -87,14 +87,14 @@ Please Choose Section of Revision Expanding - + 20 21 - + VocabOption @@ -111,7 +111,7 @@ Please Choose Section of Revision Multiple choice vocabulary test - + GrammarOption @@ -128,7 +128,7 @@ Please Choose Section of Revision Test on common nouns and endings - + VerbsOption @@ -142,7 +142,7 @@ Please Choose Section of Revision Test on common verbs and endings - + RevisionOption @@ -167,7 +167,7 @@ verb and noun tables Expanding - + 20 31 @@ -176,9 +176,9 @@ verb and noun tables - + - layout79 + tqlayout79 @@ -194,7 +194,7 @@ verb and noun tables Expanding - + 20 34 @@ -239,7 +239,7 @@ verb and noun tables Expanding - + 20 33 @@ -256,7 +256,7 @@ verb and noun tables - + kpushbutton.h kpushbutton.h diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index 0598547f..5c7e30e6 100644 --- a/klatin/klatin/klatingrammar.cpp +++ b/klatin/klatin/klatingrammar.cpp @@ -30,8 +30,8 @@ #include "klatingrammar.h" -KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name) - : KLatinGrammarWidget(parent, name) +KLatinGrammar::KLatinGrammar(TQWidget* tqparent, const char *name) + : KLatinGrammarWidget(tqparent, name) { // Set defaults m_total = 0; @@ -153,40 +153,40 @@ void KLatinGrammar::nextQuestion() // Question string... switch (m_grammarNumber) { case 1: - questionString = i18n("What is the nominative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the nominative singular of %1?").tqarg(m_noun[0]); break; case 2: - questionString = i18n("What is the vocative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the vocative singular of %1?").tqarg(m_noun[0]); break; case 3: - questionString = i18n("What is the accusative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the accusative singular of %1?").tqarg(m_noun[0]); break; case 4: - questionString = i18n("What is the genitive singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the genitive singular of %1?").tqarg(m_noun[0]); break; case 5: - questionString = i18n("What is the dative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the dative singular of %1?").tqarg(m_noun[0]); break; case 6: - questionString = i18n("What is the ablative singular of %1?").arg(m_noun[0]); + questionString = i18n("What is the ablative singular of %1?").tqarg(m_noun[0]); break; case 7: - questionString = i18n("What is the nominative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the nominative plural of %1?").tqarg(m_noun[0]); break; case 8: - questionString = i18n("What is the vocative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the vocative plural of %1?").tqarg(m_noun[0]); break; case 9: - questionString = i18n("What is the accusative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the accusative plural of %1?").tqarg(m_noun[0]); break; case 10: - questionString = i18n("What is the genitive plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the genitive plural of %1?").tqarg(m_noun[0]); break; case 11: - questionString = i18n("What is the dative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the dative plural of %1?").tqarg(m_noun[0]); break; case 12: - questionString = i18n("What is the ablative plural of %1?").arg(m_noun[0]); + questionString = i18n("What is the ablative plural of %1?").tqarg(m_noun[0]); break; } @@ -202,7 +202,7 @@ void KLatinGrammar::checkAnswer() // Allow a tolerance of 1 retry if (m_numWrong == 2) { m_numWrong = 0; - KMessageBox::information(this, i18n("The correct answer was %1.").arg(m_noun[m_grammarNumber - 1]), i18n("Wrong")); + KMessageBox::information(this, i18n("The correct answer was %1.").tqarg(m_noun[m_grammarNumber - 1]), i18n("Wrong")); if (ChooseSection->currentItem()==0) loadDatabase(); else diff --git a/klatin/klatin/klatingrammar.h b/klatin/klatin/klatingrammar.h index c36a3612..11723c85 100644 --- a/klatin/klatin/klatingrammar.h +++ b/klatin/klatin/klatingrammar.h @@ -27,8 +27,9 @@ class KLatinGrammar : public KLatinGrammarWidget { Q_OBJECT + TQ_OBJECT public: - KLatinGrammar(TQWidget* parent=0, const char *name=0); + KLatinGrammar(TQWidget* tqparent=0, const char *name=0); ~KLatinGrammar(); /// Load next question diff --git a/klatin/klatin/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui index 2e8046fb..b1ff6908 100644 --- a/klatin/klatin/klatingrammarwidget.ui +++ b/klatin/klatin/klatingrammarwidget.ui @@ -1,10 +1,10 @@ KLatinGrammarWidget - + KLatinGrammarWidget - + 0 0 @@ -12,7 +12,7 @@ 320 - + 0 0 @@ -25,11 +25,11 @@ unnamed - + TitleGrammar - + 0 0 @@ -43,15 +43,15 @@ Grammar Section - + AlignCenter - + - layout39 + tqlayout39 @@ -67,15 +67,15 @@ - + - layout40 + tqlayout40 unnamed - + QuestionLabel @@ -87,7 +87,7 @@ 0 - + 0 0 @@ -110,7 +110,7 @@ Line 2 Line 3 Line 4 - + WordBreak|AlignCenter @@ -121,7 +121,7 @@ Line 4 - + Frame10 @@ -133,13 +133,13 @@ Line 4 0 - + 0 0 - + 32767 32767 @@ -161,7 +161,7 @@ Line 4 6 - + Layout41_2 @@ -175,7 +175,7 @@ Line 4 6 - + ScoreLabel @@ -187,13 +187,13 @@ Line 4 Score - + AlignCenter - + Layout40_2 @@ -207,7 +207,7 @@ Line 4 6 - + Layout39 @@ -221,33 +221,33 @@ Line 4 6 - + Score1Label 0 - + AlignVCenter|AlignRight - + SeparatorLabel / - + AlignCenter - + Score2Label @@ -257,11 +257,11 @@ Line 4 - + PercentageLabel - + AlignCenter @@ -278,15 +278,15 @@ Line 4 - + - layout37 + tqlayout37 unnamed - + AnswerLabel @@ -324,9 +324,9 @@ Line 4 - + - layout21 + tqlayout21 @@ -342,7 +342,7 @@ Line 4 Expanding - + 294 20 @@ -375,7 +375,7 @@ Line 4 BackButton ChooseSection - + klineedit.h diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui index f81f0bc2..6ea3a4f3 100644 --- a/klatin/klatin/klatinresultsdialog.ui +++ b/klatin/klatin/klatinresultsdialog.ui @@ -1,10 +1,10 @@ KLatinResultsDialog - + KLatinResultsDialog - + 0 0 @@ -19,7 +19,7 @@ unnamed - + ResultsLabel @@ -31,11 +31,11 @@ <b>Your Results</b> - + WordBreak|AlignCenter - + Question @@ -90,15 +90,15 @@ Table of results - + - layout83 + tqlayout83 unnamed - + PercentageLabel @@ -112,14 +112,14 @@ This shows the percentage of the questions you answered correctly out of those attempted. - + PercentageValue - + AlignCenter @@ -129,7 +129,7 @@ This shows the percentage of the questions you answered correctly out of those attempted. - + AttemptedLabel @@ -143,14 +143,14 @@ This shows the number of questions you answered. - + AttemptedValue - + AlignCenter @@ -162,9 +162,9 @@ - + - layout70 + tqlayout70 @@ -180,7 +180,7 @@ Expanding - + 291 20 @@ -216,7 +216,7 @@ close() - + kpushbutton.h diff --git a/klatin/klatin/klatinsettings_vocabpage.ui b/klatin/klatin/klatinsettings_vocabpage.ui index 7db9e38a..affa58e8 100644 --- a/klatin/klatin/klatinsettings_vocabpage.ui +++ b/klatin/klatin/klatinsettings_vocabpage.ui @@ -1,10 +1,10 @@ VocabPage - + VocabPage - + 0 0 @@ -19,7 +19,7 @@ unnamed - + ButtonGroup @@ -30,23 +30,23 @@ unnamed - + - layout24 + tqlayout24 unnamed - + - layout10 + tqlayout10 unnamed - + kcfg_LatinToLang @@ -63,7 +63,7 @@ Choose to be tested from your language to Latin, which means the word will be displayed in your language and you will have to choose from 4 Latin translations. - + kcfg_LangToLatin @@ -83,7 +83,7 @@ - + MiscGroup @@ -94,9 +94,9 @@ unnamed - + - layout6 + tqlayout6 @@ -113,22 +113,22 @@ You can change the file you are tested on for the vocabulary section - + - layout6 + tqlayout6 unnamed - + QuestionsLabel Number of questions: - + WordBreak|AlignVCenter @@ -171,7 +171,7 @@ - + kurlrequester.h klineedit.h diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index 70d42ed8..e5be5ff2 100644 --- a/klatin/klatin/klatinverbs.cpp +++ b/klatin/klatin/klatinverbs.cpp @@ -30,8 +30,8 @@ #include "klatinverbs.h" -KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name) - : KLatinVerbsWidget(parent, name) +KLatinVerbs::KLatinVerbs(TQWidget* tqparent, const char *name) + : KLatinVerbsWidget(tqparent, name) { OKButton->setIconSet(KGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small)); BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); @@ -202,12 +202,12 @@ void KLatinVerbs::nextQuestion() "ARGUMENT %5 is the voice of the verb (Active, Passive). " "ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and should not be translated. " "The output string in English is something like: What is the first person singular present indicative active of amo?", - "What is the %1 person %2 %3 %4 %5 of %6?").arg(i18n(question.person[person])) - .arg(i18n(question.number[number])) - .arg(i18n(question.tense[tense])) - .arg(i18n(verbparts.mood[ChooseMood->currentItem()])) - .arg(i18n(verbparts.voice[ChooseVoice->currentItem()])) - .arg(m_currentVerb); + "What is the %1 person %2 %3 %4 %5 of %6?").tqarg(i18n(question.person[person])) + .tqarg(i18n(question.number[number])) + .tqarg(i18n(question.tense[tense])) + .tqarg(i18n(verbparts.mood[ChooseMood->currentItem()])) + .tqarg(i18n(verbparts.voice[ChooseVoice->currentItem()])) + .tqarg(m_currentVerb); QuestionLabel->setText(QuestionString); } @@ -226,7 +226,7 @@ void KLatinVerbs::checkAnswer() // Retry tolerance... if (m_numWrong == 2) { m_numWrong = 0; - KMessageBox::information(this, i18n("The correct answer was %1.").arg(m_verb[m_verbNumber - 1]), i18n("Wrong")); + KMessageBox::information(this, i18n("The correct answer was %1.").tqarg(m_verb[m_verbNumber - 1]), i18n("Wrong")); nextQuestion(); } } else { diff --git a/klatin/klatin/klatinverbs.h b/klatin/klatin/klatinverbs.h index 03b5b649..af6f9ba0 100644 --- a/klatin/klatin/klatinverbs.h +++ b/klatin/klatin/klatinverbs.h @@ -41,8 +41,9 @@ struct questionparts { class KLatinVerbs : public KLatinVerbsWidget { Q_OBJECT + TQ_OBJECT public: - KLatinVerbs(TQWidget* parent=0, const char *name=0); + KLatinVerbs(TQWidget* tqparent=0, const char *name=0); ~KLatinVerbs(); /// Load next question diff --git a/klatin/klatin/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui index a00b72f0..a4eeafbe 100644 --- a/klatin/klatin/klatinverbswidget.ui +++ b/klatin/klatin/klatinverbswidget.ui @@ -1,10 +1,10 @@ KLatinVerbsWidget - + KLatinVerbsWidget - + 0 0 @@ -19,7 +19,7 @@ unnamed - + TitleVerbs @@ -39,15 +39,15 @@ Verbs Section - + AlignCenter - + - layout29 + tqlayout29 @@ -69,7 +69,7 @@ tested on ChooseVoice - + 120 0 @@ -99,7 +99,7 @@ tested on ChangeButton - + 25 32767 @@ -117,15 +117,15 @@ tested on - + - layout11 + tqlayout11 unnamed - + QuestionLabel @@ -154,7 +154,7 @@ Line 2 Line 3 Line 4 - + WordBreak|AlignCenter @@ -165,7 +165,7 @@ Line 4 - + Frame10 @@ -177,13 +177,13 @@ Line 4 0 - + 0 0 - + 32767 32767 @@ -205,7 +205,7 @@ Line 4 6 - + Layout41_2 @@ -219,7 +219,7 @@ Line 4 6 - + ScoreLabel @@ -231,13 +231,13 @@ Line 4 Score - + AlignCenter - + Layout40_2 @@ -251,7 +251,7 @@ Line 4 6 - + Layout39 @@ -265,33 +265,33 @@ Line 4 6 - + Score1Label 0 - + AlignVCenter|AlignRight - + SeparatorLabel / - + AlignCenter - + Score2Label @@ -301,11 +301,11 @@ Line 4 - + PercentageLabel - + AlignCenter @@ -322,15 +322,15 @@ Line 4 - + - layout9 + tqlayout9 unnamed - + AnswerLabel @@ -365,9 +365,9 @@ Line 4 - + - layout29 + tqlayout29 @@ -383,7 +383,7 @@ Line 4 Expanding - + 297 20 @@ -419,7 +419,7 @@ Line 4 ChooseMood ChangeButton - + klineedit.h diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp index b1b10ccf..08cc0249 100644 --- a/klatin/klatin/klatinvocab.cpp +++ b/klatin/klatin/klatinvocab.cpp @@ -32,12 +32,12 @@ #include "klatinvocab.h" #include "settings.h" -KLatinVocab::KLatinVocab(TQWidget* parent, const char *name) - : KLatinVocabWidget(parent, name) +KLatinVocab::KLatinVocab(TQWidget* tqparent, const char *name) + : KLatinVocabWidget(tqparent, name) { BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); - m_vocabFile = TQString::null; + m_vocabFile = TQString(); // Goes back to the last dialog connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack())); @@ -120,12 +120,12 @@ void KLatinVocab::parseVocab(TQString customFile) int it = 0; - // Start parsing file and allocating words to the TQValueList + // Start parsing file and allocating words to the TQValueList for(KEduVocDataItemList::Iterator dataIt = vocabulary.begin(); dataIt != vocabulary.end(); ++dataIt) { if (Settings::langToLatin()) { - m_texts.append(qMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText())); + m_texts.append(tqMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText())); } else { - m_texts.append(qMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText())); + m_texts.append(tqMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText())); } it++; } diff --git a/klatin/klatin/klatinvocab.h b/klatin/klatin/klatinvocab.h index 6980fe24..83ada419 100644 --- a/klatin/klatin/klatinvocab.h +++ b/klatin/klatin/klatinvocab.h @@ -31,12 +31,13 @@ class KLatinVocab : public KLatinVocabWidget { Q_OBJECT + TQ_OBJECT public: - KLatinVocab(TQWidget* parent=0, const char *name=0); + KLatinVocab(TQWidget* tqparent=0, const char *name=0); ~KLatinVocab(); /// Load vocabulary from file @p customFile - void parseVocab(TQString customFile = TQString::null); + void parseVocab(TQString customFile = TQString()); /// Generate a new question void newQuestion(); /// Update the scores of the test so far @@ -66,8 +67,8 @@ signals: void exited(); private: /// The list in which the native language and Latin words are assigned - typedef QPair QStringPair; - TQValueList m_texts; + typedef TQPair TQStringPair; + TQValueList m_texts; TQString m_fileDir; /// The filename of the vocabulary file being tested on diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui index db6ad834..91993658 100644 --- a/klatin/klatin/klatinvocabwidget.ui +++ b/klatin/klatin/klatinvocabwidget.ui @@ -1,10 +1,10 @@ KLatinVocabWidget - + KLatinVocabWidget - + 0 0 @@ -19,11 +19,11 @@ unnamed - + TitleLabel - + 500 0 @@ -37,21 +37,21 @@ Vocabulary Section - + AlignCenter - + - layout52 + tqlayout52 unnamed - + QuestionLabel @@ -77,7 +77,7 @@ Question Word - + AlignCenter @@ -86,7 +86,7 @@ The question word will appear here - + Frame10 @@ -98,7 +98,7 @@ 0 - + 32767 32767 @@ -126,7 +126,7 @@ 6 - + Layout41 @@ -140,7 +140,7 @@ 6 - + ScoreLabel @@ -152,13 +152,13 @@ Score - + AlignCenter - + Layout40 @@ -172,7 +172,7 @@ 6 - + Layout39 @@ -186,33 +186,33 @@ 6 - + Score1Label 0 - + AlignVCenter|AlignRight - + Separator / - + AlignCenter - + Score2Label @@ -222,11 +222,11 @@ - + PercentageLabel - + AlignCenter @@ -243,9 +243,9 @@ - + - layout53 + tqlayout53 @@ -255,7 +255,7 @@ Answer1 - + 150 40 @@ -272,7 +272,7 @@ Answer2 - + 150 40 @@ -287,9 +287,9 @@ - + - layout64 + tqlayout64 @@ -299,7 +299,7 @@ Answer3 - + 150 40 @@ -316,7 +316,7 @@ Answer4 - + 150 40 @@ -331,9 +331,9 @@ - + - layout18 + tqlayout18 @@ -349,7 +349,7 @@ Expanding - + 326 20 @@ -381,7 +381,7 @@ Answer4 BackButton - + kpushbutton.h kpushbutton.h diff --git a/klatin/klatin/settings.kcfgc b/klatin/klatin/settings.kcfgc index f9475d28..a58324de 100644 --- a/klatin/klatin/settings.kcfgc +++ b/klatin/klatin/settings.kcfgc @@ -1,5 +1,5 @@ File=klatin.kcfg ClassName=Settings -IncludeFiles=kstandarddirs.h,qdir.h,klocale.h,kdebug.h +IncludeFiles=kstandarddirs.h,tqdir.h,klocale.h,kdebug.h Singleton=true Mutators=true \ No newline at end of file diff --git a/klettres/klettres/fontsdlg.ui b/klettres/klettres/fontsdlg.ui index 34c72ad5..f5fb605f 100644 --- a/klettres/klettres/fontsdlg.ui +++ b/klettres/klettres/fontsdlg.ui @@ -1,10 +1,10 @@ fontsdlg - + fontsdlg - + 0 0 @@ -31,7 +31,7 @@ - + kfontdialog.h diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index 4d378ee6..cbd4c165 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -//Qt includes +//TQt includes #include #include #include @@ -93,12 +93,12 @@ void KLettres::findLanguages() for (TQStringList::Iterator it =mdirs.begin(); it !=mdirs.end(); ++it ) { TQDir dir(*it); m_languages += dir.entryList(TQDir::Dirs, TQDir::Name); - m_languages.remove(m_languages.find(".")); - m_languages.remove(m_languages.find("..")); + m_languages.remove(m_languages.tqfind(".")); + m_languages.remove(m_languages.tqfind("..")); } - m_languages.remove(m_languages.find("pics")); - m_languages.remove(m_languages.find("data")); - m_languages.remove(m_languages.find("icons")); + m_languages.remove(m_languages.tqfind("pics")); + m_languages.remove(m_languages.tqfind("data")); + m_languages.remove(m_languages.tqfind("icons")); m_languages.sort(); if (m_languages.isEmpty()) return; Prefs::setLanguages(m_languages); @@ -107,7 +107,7 @@ void KLettres::findLanguages() TQStringList temp_languages; for (uint i=0; i1) { + if (m_languages.tqcontains(m_languages[i])>1) { temp_languages.append(m_languages[i]); m_languages.remove(m_languages[i]); } @@ -122,12 +122,12 @@ void KLettres::findLanguages() m_languages.sort(); //write the present languages in config so they cannot be downloaded KConfig *config=kapp->config(); - config->setGroup("KNewStuffStatus"); + config->setGroup("KNewStufftqStatus"); for (uint i=0; ireadEntry(tmp)) - config->writeEntry(tmp, TQDate::currentDate().toString()); + config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString())); } //we look in $KDEDIR/share/locale/all_languages from /kdelibs/kdecore/all_languages //to find the name of the country @@ -155,23 +155,23 @@ TQString Prefs::defaultLanguage() TQStringList defaultLanguages = KGlobal::locale()->languagesTwoAlpha(); if (!defaultLanguages.isEmpty()) { //scan to see if defaultLanguages[0] belongs to m_languages. If not, en is default. - int i = Prefs::self()->m_languages.findIndex(defaultLanguages[0]); - if (Prefs::self()->m_languages.contains(Prefs::language())) + int i = Prefs::self()->m_languages.tqfindIndex(defaultLanguages[0]); + if (Prefs::self()->m_languages.tqcontains(Prefs::language())) return Prefs::language(); //the last language played else if (i<1) return "en"; //if no other else return Prefs::self()->m_languages[i]; //KDE default if exists } - return TQString::null; + return TQString(); } -bool KLettres::loadLayout(TQDomDocument &layoutDocument) +bool KLettres::loadLayout(TQDomDocument &tqlayoutDocument) { - TQFile layoutFile(locate("data", "klettres/"+Prefs::language()+"/sounds.xml")); + TQFile tqlayoutFile(locate("data", "klettres/"+Prefs::language()+"/sounds.xml")); //if xml file is not found, program exits - if (!layoutFile.exists()) + if (!tqlayoutFile.exists()) { kdWarning() << "sounds.xml file not found in $KDEDIR/share/apps/klettres/"+Prefs::language() << endl; TQString mString=i18n("The file sounds.xml was not found in\n" @@ -180,31 +180,31 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument) KMessageBox::information( this, mString,"KLettres - Error" ); kapp->quit();//exit(1); } - if (!layoutFile.open(IO_ReadOnly)) + if (!tqlayoutFile.open(IO_ReadOnly)) return false; //Check if document is well-formed - if (!layoutDocument.setContent(&layoutFile)) + if (!tqlayoutDocument.setContent(&tqlayoutFile)) { - layoutFile.close(); + tqlayoutFile.close(); return false; } - layoutFile.close(); + tqlayoutFile.close(); return true; } void KLettres::setupActions() { - KAction *m_newAction = new KAction(i18n("New Sound"), "file_new", CTRL+Key_N, m_view, TQT_SLOT(game()), actionCollection(), "play_new"); + KAction *m_newAction = new KAction(i18n("New Sound"), "file_new", CTRL+Key_N, TQT_TQOBJECT(m_view), TQT_SLOT(game()), actionCollection(), "play_new"); m_newAction->setToolTip(i18n("Play a new sound")); m_newAction->setWhatsThis(i18n("You can play a new sound by clicking this button or using the File menu, New Sound.")); - new KAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, this, TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); - KAction *m_playAgainAction = new KAction(i18n("Replay Sound"),"player_play", CTRL+Key_P, m_view, TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again"); + new KAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); + KAction *m_playAgainAction = new KAction(i18n("Replay Sound"),"player_play", CTRL+Key_P, TQT_TQOBJECT(m_view), TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again"); m_playAgainAction->setToolTip(i18n("Play the same sound again")); m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound.")); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); - m_menubarAction = new KToggleAction(i18n("Show &Menubar"),"editclear", CTRL+Key_M, this, TQT_SLOT(slotMenubar()), actionCollection(), "menubar"); + m_menubarAction = new KToggleAction(i18n("Show &Menubar"),"editclear", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMenubar()), actionCollection(), "menubar"); m_menubarAction->setCheckedState(i18n("Hide &Menubar")); m_menubarAction->setChecked(true); m_menubarAction->setWhatsThis(i18n("You can show or hide the menubar as you wish by clicking this button.")); @@ -230,16 +230,16 @@ void KLettres::setupActions() m_themeAction->setToolTip(i18n("Select the theme")); m_themeAction->setWhatsThis(i18n("Here you can change the theme for KLettres. A theme consists in the background picture and the font color for the letter displayed.")); - m_kidAction = new KToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, this, TQT_SLOT(slotModeKid()), actionCollection(), "mode_kid"); + m_kidAction = new KToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotModeKid()), actionCollection(), "mode_kid"); m_kidAction->setWhatsThis(i18n("If you are in the Grown-up mode, clicking on this button will set up the Kid mode. The Kid mode has no menubar and the font is bigger in the statusbar.")); - m_grownupAction = new KToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, this, TQT_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup"); + m_grownupAction = new KToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup"); m_grownupAction->setWhatsThis(i18n("The Grown-up mode is the normal mode where you can see the menubar.")); connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int))); connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int))); connect(m_themeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeTheme(int))); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); setupGUI(); } @@ -284,12 +284,12 @@ void KLettres::loadSettings() //m_view->selectedLanguage = selectedLanguage; m_languageAction->setCurrentItem(Prefs::languageNumber()); TQString langString = m_languageNames[Prefs::languageNumber()]; - langString.replace("&", TQString::null); - m_langLabel->setText(i18n("Current language is %1").arg(langString)); + langString.tqreplace("&", TQString()); + m_langLabel->setText(i18n("Current language is %1").tqarg(langString)); loadLangToolBar(); // load default level m_levelAction->setCurrentItem(Prefs::level()-1); - m_levLabel->setText(i18n("Current level is %1").arg(Prefs::level())); + m_levLabel->setText(i18n("Current level is %1").tqarg(Prefs::level())); if (Prefs::theme() == Prefs::EnumTheme::classroom) { m_themeAction->setCurrentItem(0); @@ -358,7 +358,7 @@ void KLettres::updateLevMenu(int id) { //m_levelCombo->setCurrentItem(id); m_levelAction->setCurrentItem(id); - m_levLabel->setText(i18n("Current level is %1").arg(Prefs::level())); + m_levLabel->setText(i18n("Current level is %1").tqarg(Prefs::level())); } void KLettres::slotChangeLanguage(int newLanguage) @@ -368,8 +368,8 @@ void KLettres::slotChangeLanguage(int newLanguage) Prefs::writeConfig(); // Update the StatusBar TQString langString = m_languageNames[newLanguage]; - langString.replace("&", TQString::null); - m_langLabel->setText(i18n("Current language is %1").arg(langString)); + langString.tqreplace("&", TQString()); + m_langLabel->setText(i18n("Current language is %1").tqarg(langString)); loadLangToolBar(); // Change language effectively bool ok = loadLayout(soundFactory->m_layoutsDocument); @@ -452,14 +452,14 @@ void KLettres::loadLangToolBar() if (m_languages[Prefs::languageNumber()]== "cs" || m_languages[Prefs::languageNumber()]== "da" || m_languages[Prefs::languageNumber()]== "sk" || m_languages[Prefs::languageNumber()]== "es" || m_languages[Prefs::languageNumber()]== "de" || m_languages[Prefs::languageNumber()]== "nds")//Dutch, English, French and Italian have no special characters { allData.clear(); - TQString myString=TQString("klettres/%1.txt").arg(m_languages[Prefs::languageNumber()]); + TQString myString=TQString("klettres/%1.txt").tqarg(m_languages[Prefs::languageNumber()]); TQFile myFile; myFile.setName(locate("data",myString)); if (!myFile.exists()) { TQString mString=i18n("File $KDEDIR/share/apps/klettres/%1.txt not found;\n" - "please check your installation.").arg(m_languages[Prefs::languageNumber()]); + "please check your installation.").tqarg(m_languages[Prefs::languageNumber()]); KMessageBox::sorry( this, mString, i18n("Error") ); kapp->quit(); @@ -475,7 +475,7 @@ void KLettres::loadLangToolBar() openFileStream.close(); for (int i=0; i<(int) allData.count(); i++) { if (!allData[i].isEmpty()) - m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(allData[i]), i+1 ); + m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").tqarg(allData[i]), i+1 ); } } } @@ -489,7 +489,7 @@ void KLettres::slotPasteChar() TQString KLettres::charIcon(const TQChar & c) { ///Create a name and path for the icon - TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png"); TQRect r(4, 4, 120, 120); @@ -501,19 +501,19 @@ TQString KLettres::charIcon(const TQChar & c) ///Create the pixmap TQPixmap pm(128, 128); - pm.fill(Qt::white); + pm.fill(TQt::white); TQPainter p(&pm); p.setFont(font); - p.setPen(Qt::black); - p.drawText(r, Qt::AlignCenter, (TQString) c); + p.setPen(TQt::black); + p.drawText(r, TQt::AlignCenter, (TQString) c); - ///Create transparency mask + ///Create transparency tqmask TQBitmap bm(128, 128); - bm.fill(Qt::color0); + bm.fill(TQt::color0); TQPainter b(&bm); b.setFont(font); - b.setPen(Qt::color1); - b.drawText(r, Qt::AlignCenter, (TQString) c); + b.setPen(TQt::color1); + b.drawText(r, TQt::AlignCenter, (TQString) c); ///Mask the pixmap pm.setMask(bm); diff --git a/klettres/klettres/klettres.h b/klettres/klettres/klettres.h index afed715c..cff0d88c 100644 --- a/klettres/klettres/klettres.h +++ b/klettres/klettres/klettres.h @@ -46,6 +46,7 @@ class KLNewStuff; class KLettres : public KMainWindow { Q_OBJECT + TQ_OBJECT public: ///Constructor @@ -61,10 +62,10 @@ public: TQStringList m_languageNames; /** *Load the xml file - *@param layoutDocument the xml file + *@param tqlayoutDocument the xml file *@return bool true if the xml document is found and well formed, false otherwise */ - bool loadLayout(TQDomDocument &layoutDocument); + bool loadLayout(TQDomDocument &tqlayoutDocument); ///Number corresponding to the selected language: 0 is Czech, 1 is Danish, 2 is English (default), 3 is French, 4 is Dutch, 5 is Slovak //uint selectedLanguage; ///Action that sets up the Language menu diff --git a/klettres/klettres/klettresview.cpp b/klettres/klettres/klettresview.cpp index c9891bf1..6417d978 100644 --- a/klettres/klettres/klettresview.cpp +++ b/klettres/klettres/klettresview.cpp @@ -33,10 +33,10 @@ #include "klettresview.h" #include "prefs.h" -KLettresView::KLettresView(KLettres *parent) - : TQWidget(parent) +KLettresView::KLettresView(KLettres *tqparent) + : TQWidget(tqparent) { - m_klettres = parent; + m_klettres = tqparent; setMinimumSize( TQSize( 640, 480 ) ); setMaximumSize( TQSize( 640, 480 ) ); @@ -107,12 +107,12 @@ void KLettresView::paintEvent( TQPaintEvent * ) //m_letterEdit->setPaletteForegroundColor(TQColor(115, 50, 95)); } else if (Prefs::theme() == Prefs::EnumTheme::arctic) { - paint.setPen( Qt::white ); + paint.setPen( TQt::white ); //m_letterEdit->setPaletteForegroundColor(TQColor(48, 75, 137)); } else { - paint.setPen( Qt::white ); - //m_letterEdit->setPaletteForegroundColor(Qt::black); + paint.setPen( TQt::white ); + //m_letterEdit->setPaletteForegroundColor(TQt::black); } paint.drawText(50, 230, m_currentLetter); } diff --git a/klettres/klettres/klettresview.h b/klettres/klettres/klettresview.h index c27b94e5..00bf2364 100644 --- a/klettres/klettres/klettresview.h +++ b/klettres/klettres/klettresview.h @@ -38,14 +38,15 @@ class KLettres; */ -class KLettresView : public QWidget +class KLettresView : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - KLettresView(KLettres *parent); + KLettresView(KLettres *tqparent); /** * Destructor diff --git a/klettres/klettres/klnewstuff.cpp b/klettres/klettres/klnewstuff.cpp index ed6061ba..3741bb5f 100644 --- a/klettres/klettres/klnewstuff.cpp +++ b/klettres/klettres/klnewstuff.cpp @@ -49,8 +49,8 @@ bool KLNewStuff::install( const TQString &fileName ) //refresh Languages menu //kdDebug() << "---- selected language : " << m_view->m_klettres->selectedLanguage << endl; m_view->m_klettres->m_languageAction->setItems(m_view->m_klettres->m_languageNames); - m_view->m_klettres->slotChangeLanguage(m_view->m_klettres->m_languages.findIndex(Prefs::defaultLanguage())); - m_view->m_klettres->m_languageAction->setCurrentItem(m_view->m_klettres->m_languages.findIndex(Prefs::defaultLanguage())); + m_view->m_klettres->slotChangeLanguage(m_view->m_klettres->m_languages.tqfindIndex(Prefs::defaultLanguage())); + m_view->m_klettres->m_languageAction->setCurrentItem(m_view->m_klettres->m_languages.tqfindIndex(Prefs::defaultLanguage())); return true; } diff --git a/klettres/klettres/prefs_addons.h b/klettres/klettres/prefs_addons.h index ec28026a..1e02b2e3 100644 --- a/klettres/klettres/prefs_addons.h +++ b/klettres/klettres/prefs_addons.h @@ -33,13 +33,13 @@ static void setLanguageNumber(int i) static int languageNumber() { - int i = Prefs::self()->m_languages.findIndex(language()); + int i = Prefs::self()->m_languages.tqfindIndex(language()); if (i != -1) return i; - i = Prefs::self()->m_languages.findIndex(defaultLanguage()); + i = Prefs::self()->m_languages.tqfindIndex(defaultLanguage()); if (i != -1) return i; - i = Prefs::self()->m_languages.findIndex("en"); + i = Prefs::self()->m_languages.tqfindIndex("en"); if (i != -1) return i; diff --git a/klettres/klettres/soundfactory.cpp b/klettres/klettres/soundfactory.cpp index e23bc501..6a2a0ebf 100644 --- a/klettres/klettres/soundfactory.cpp +++ b/klettres/klettres/soundfactory.cpp @@ -33,10 +33,10 @@ #include "prefs.h" -SoundFactory::SoundFactory(KLettres *parent, const char *name) - : TQObject(parent, name) +SoundFactory::SoundFactory(KLettres *tqparent, const char *name) + : TQObject(tqparent, name) { - klettres = parent; + klettres = tqparent; namesList = filesList = 0; sounds = 0; @@ -78,7 +78,7 @@ void SoundFactory::loadFailure() KMessageBox::error(klettres, i18n("Error while loading the sound names.")); } -bool SoundFactory::loadLanguage(TQDomDocument &layoutDocument, TQString currentLanguage) +bool SoundFactory::loadLanguage(TQDomDocument &tqlayoutDocument, TQString currentLanguage) { TQDomNodeList languagesList, alphabetList, @@ -90,7 +90,7 @@ bool SoundFactory::loadLanguage(TQDomDocument &layoutDocument, TQString currentL soundNameElement; TQDomAttr nameAttribute, fileAttribute; - languagesList = layoutDocument.elementsByTagName("language"); + languagesList = tqlayoutDocument.elementsByTagName("language"); TQDomAttr codeAttribute; //check if the sound files match current language languageElement = (const TQDomElement &) languagesList.item(0).toElement(); diff --git a/klettres/klettres/soundfactory.h b/klettres/klettres/soundfactory.h index 2cc8a5de..e6105db7 100644 --- a/klettres/klettres/soundfactory.h +++ b/klettres/klettres/soundfactory.h @@ -38,13 +38,14 @@ class KLettres; * @version 1.1 */ -class SoundFactory : public QObject +class SoundFactory : public TQObject { Q_OBJECT + TQ_OBJECT public: - SoundFactory(KLettres *parent, const char *name); + SoundFactory(KLettres *tqparent, const char *name); ~SoundFactory(); ///Call the main instance of the program @@ -64,7 +65,7 @@ public: * Call that when you read the language from Config and when the language changes * or when the level changes */ - bool loadLanguage(TQDomDocument &layoutDocument, TQString currentLanguage); + bool loadLanguage(TQDomDocument &tqlayoutDocument, TQString currentLanguage); ///The language document TQDomDocument m_layoutsDocument; diff --git a/klettres/klettres/timer.h b/klettres/klettres/timer.h index 28634cf3..418992d4 100644 --- a/klettres/klettres/timer.h +++ b/klettres/klettres/timer.h @@ -35,6 +35,7 @@ class Timer : public timerdlg { Q_OBJECT + TQ_OBJECT public: ///Constructor diff --git a/klettres/klettres/timerdlg.ui b/klettres/klettres/timerdlg.ui index 91ab486f..bf971181 100644 --- a/klettres/klettres/timerdlg.ui +++ b/klettres/klettres/timerdlg.ui @@ -1,10 +1,10 @@ timerdlg - + timerdlg - + 0 0 @@ -12,7 +12,7 @@ 260 - + 350 0 @@ -30,7 +30,7 @@ Set the time between 2 letters. - + kcfg_KidTimer @@ -62,7 +62,7 @@ Only used if Use a timer is checked - + textLabel1 @@ -80,7 +80,7 @@ Expanding - + 264 20 @@ -97,7 +97,7 @@ Expanding - + 25 16 @@ -114,14 +114,14 @@ Expanding - + 270 20 - + kcfg_GrownTimer @@ -163,14 +163,14 @@ Expanding - + 228 20 - + textLabel1_2 @@ -178,7 +178,7 @@ Grown-up Mode - + timeGrownLabel @@ -199,7 +199,7 @@ Expanding - + 226 20 @@ -216,14 +216,14 @@ Expanding - + 25 16 - + timeKidLabel @@ -238,7 +238,7 @@ - + kactivelabel.h diff --git a/kmplot/KmPlot.kdevelop b/kmplot/KmPlot.kdevelop index c430df75..2bb7059b 100644 --- a/kmplot/KmPlot.kdevelop +++ b/kmplot/KmPlot.kdevelop @@ -143,7 +143,7 @@ false - *.o,*.lo,CVS,*.moc,*~ + *.o,*.lo,CVS,*.tqmoc,*~ false diff --git a/kmplot/TODO b/kmplot/TODO index 1a9acc22..10854f5c 100644 --- a/kmplot/TODO +++ b/kmplot/TODO @@ -5,7 +5,7 @@ TODO * Find bugs * More functions? * In tool menu: - * find "nollställen" ( en: where the function's value is 0) + * tqfind "nollställen" ( en: where the function's value is 0) * get slope for a x-point * Value table * Fix the unpolished lines? diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp index ac3d84f1..025f1452 100644 --- a/kmplot/kmplot/FktDlg.cpp +++ b/kmplot/kmplot/FktDlg.cpp @@ -23,7 +23,7 @@ * */ -// Qt includes +// TQt includes // #include // #include @@ -49,7 +49,7 @@ #include -FktDlg::FktDlg( TQWidget* parent, View *view ) : FktDlgData( parent, "editPlots" ), m_view(view) +FktDlg::FktDlg( TQWidget* tqparent, View *view ) : FktDlgData( tqparent, "editPlots" ), m_view(view) { connect( cmdCopyFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopyFunction()) ); connect( cmdMoveFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunction()) ); @@ -137,7 +137,7 @@ void FktDlg::slotEdit() int const id = getId( currentItem->text().section( ";", 0, 0) ) ; // find out the function type - char const prefix = m_view->parser()->ufkt[ m_view->parser()->ixValue(id) ].fstr.at(0).latin1(); + char const prefix = m_view->parser()->ufkt[ m_view->parser()->ixValue(id) ].fstr.tqat(0).latin1(); if ( prefix == 'r') slotEditPolar( id ); diff --git a/kmplot/kmplot/FktDlg.h b/kmplot/kmplot/FktDlg.h index 8275b03f..c0b914e2 100644 --- a/kmplot/kmplot/FktDlg.h +++ b/kmplot/kmplot/FktDlg.h @@ -45,14 +45,15 @@ class XParser; class FktDlg : public FktDlgData { Q_OBJECT + TQ_OBJECT public: /** * The constructor gets the current parser instance - * @param parent Parent widget. + * @param tqparent Parent widget. * @param view points to the current view instance. */ - FktDlg( TQWidget* parent, View* view ); + FktDlg( TQWidget* tqparent, View* view ); /// Empty destructor. virtual ~FktDlg(); /// Fill the widgets with plots contained in the parser instance. diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui index 9678e889..3170c48c 100644 --- a/kmplot/kmplot/FktDlgData.ui +++ b/kmplot/kmplot/FktDlgData.ui @@ -1,10 +1,10 @@ FktDlgData - + FktDlgData - + 0 0 @@ -12,7 +12,7 @@ 355 - + 350 250 @@ -31,15 +31,15 @@ 6 - + - layout3 + tqlayout3 unnamed - + pushButtonHelp @@ -57,14 +57,14 @@ Expanding - + 20 20 - + PushButtonOk @@ -78,7 +78,7 @@ Click here to apply your changes and close this dialog. - + pushButtonCancel @@ -94,7 +94,7 @@ - + frame5 @@ -133,7 +133,7 @@ Here you see the list of all functions to be plotted. The checked functions are visible, the others are hidden. Click on a checkbox to show or hide the function. - + PushButtonDel @@ -158,7 +158,7 @@ Click here to delete the selected function from the list. - + PushButtonEdit @@ -183,7 +183,7 @@ Click here to edit the selected function. - + PushButtonNewFunction @@ -208,7 +208,7 @@ Click here to define a new function. There are 3 types of function, explicit given functions, parametric plots and polar plots. Choose the appropriate type from the drop down list. - + PushButtonNewParametric @@ -230,7 +230,7 @@ Click here to define a new function. There are 3 types of function, explicit given functions, parametric plots and polar plots. Choose the appropriate type from the drop down list. - + PushButtonNewPolar @@ -262,14 +262,14 @@ Expanding - + 20 20 - + cmdCopyFunction @@ -294,7 +294,7 @@ Click here to define a new function. There are 3 types of function, explicit given functions, parametric plots and polar plots. Choose the appropriate type from the drop down list. - + cmdMoveFunction @@ -329,7 +329,7 @@ Expanding - + 20 20 @@ -407,7 +407,7 @@ pushButtonCancel pushButtonHelp - + slotDelete() slotEdit() slotHasSelection() @@ -416,8 +416,8 @@ slotNewFunction() slotHelp() slotNewPrime() - - + + klistview.h diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index e8916f93..d4239cef 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -23,7 +23,7 @@ * */ -// Qt includes +// TQt includes #include #include @@ -63,13 +63,13 @@ class KmPlotIO; bool MainDlg::oldfileversion; -MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const char *name) : DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( parent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(parentWidget) +MainDlg::MainDlg(TQWidget *tqparentWidget, const char *, TQObject *tqparent, const char *name) : DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( tqparent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(tqparentWidget) { // we need an instance setInstance( KmPlotPartFactory::instance() ); - kdDebug() << "parentWidget->name():" << parentWidget->name() << endl; - if ( TQString(parentWidget->name()).startsWith("KmPlot") ) + kdDebug() << "tqparentWidget->name():" << tqparentWidget->name() << endl; + if ( TQString(tqparentWidget->name()).startsWith("KmPlot") ) { setXMLFile("kmplot_part.rc"); m_readonly = false; @@ -82,14 +82,14 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c } fdlg = 0; coordsDialog = 0; - m_popupmenu = new KPopupMenu(parentWidget); - view = new View( m_readonly, m_modified, m_popupmenu, parentWidget ); + m_popupmenu = new KPopupMenu(tqparentWidget); + view = new View( m_readonly, m_modified, m_popupmenu, tqparentWidget ); connect( view, TQT_SIGNAL( setStatusBarText(const TQString &)), this, TQT_SLOT( setReadOnlyStatusBarText(const TQString &) ) ); setWidget( view ); - view->setFocusPolicy(TQWidget::ClickFocus); + view->setFocusPolicy(TQ_ClickFocus); minmaxdlg = new KMinMax(view, m_parent); view->setMinMaxDlg(minmaxdlg); - m_quickEdit = new KLineEdit( parentWidget ); + m_quickEdit = new KLineEdit( tqparentWidget ); m_quickEdit->setFocus(); TQToolTip::add( m_quickEdit, i18n( "Enter a function equation, for example: f(x)=x^2" ) ); setupActions(); @@ -99,7 +99,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c m_recentFiles->loadEntries( m_config ); // Let's create a Configure Diloag - m_settingsDialog = new KConfigDialog( parentWidget, "settings", Settings::self() ); + m_settingsDialog = new KConfigDialog( tqparentWidget, "settings", Settings::self() ); m_settingsDialog->setHelp("general-config"); // create and add the page(s) @@ -140,12 +140,12 @@ void MainDlg::setupActions() ( void ) new KAction( i18n( "E&xport..." ), 0, this, TQT_SLOT( slotExport() ), actionCollection(), "export"); //zoom menu - m_mnuNoZoom = new KRadioAction(i18n("&No Zoom") ,"CTRL+0",view, TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" ); - KRadioAction * mnuRectangular = new KRadioAction(i18n("Zoom &Rectangular"), "viewmagfit", "CTRL+1",view, TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" ); - KRadioAction * mnuZoomIn = new KRadioAction(i18n("Zoom &In"), "viewmag+", "CTRL+2",view, TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" ); - KRadioAction * mnuZoomOut = new KRadioAction(i18n("Zoom &Out"), "viewmag-", "CTRL+3",view, TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" ); - KRadioAction * mnuZoomCenter = new KRadioAction(i18n("&Center Point") ,"CTRL+4",view, TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" ); - (void ) new KAction(i18n("&Fit Widget to Trigonometric Functions") ,0,view, TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" ); + m_mnuNoZoom = new KRadioAction(i18n("&No Zoom") ,"CTRL+0",TQT_TQOBJECT(view), TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" ); + KRadioAction * mnuRectangular = new KRadioAction(i18n("Zoom &Rectangular"), "viewmagfit", "CTRL+1",TQT_TQOBJECT(view), TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" ); + KRadioAction * mnuZoomIn = new KRadioAction(i18n("Zoom &In"), "viewmag+", "CTRL+2",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" ); + KRadioAction * mnuZoomOut = new KRadioAction(i18n("Zoom &Out"), "viewmag-", "CTRL+3",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" ); + KRadioAction * mnuZoomCenter = new KRadioAction(i18n("&Center Point") ,"CTRL+4",TQT_TQOBJECT(view), TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" ); + (void ) new KAction(i18n("&Fit Widget to Trigonometric Functions") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" ); m_mnuNoZoom->setExclusiveGroup("zoom_modes"); m_mnuNoZoom->setChecked(true); mnuRectangular->setExclusiveGroup("zoom_modes"); @@ -190,16 +190,16 @@ void MainDlg::setupActions() view->mnuSliders[3] = new KToggleAction( i18n( "Show Slider 4" ), 0, this, TQT_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() ); // Popup menu - KAction *mnuHide = new KAction(i18n("&Hide") ,0,view, TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); + KAction *mnuHide = new KAction(i18n("&Hide") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); mnuHide->plug(m_popupmenu); - KAction *mnuRemove = new KAction(i18n("&Remove"),"editdelete", 0,view, TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); + KAction *mnuRemove = new KAction(i18n("&Remove"),"editdelete", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); mnuRemove->plug(m_popupmenu); - KAction *mnuEdit = new KAction(i18n("&Edit"),"editplots", 0,view, TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); + KAction *mnuEdit = new KAction(i18n("&Edit"),"editplots", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); mnuEdit->plug(m_popupmenu); m_popupmenu->insertSeparator(); - KAction *mnuCopy = new KAction(i18n("&Copy"), 0,view, TQT_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" ); + KAction *mnuCopy = new KAction(i18n("&Copy"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" ); mnuCopy->plug(m_popupmenu); - KAction *mnuMove = new KAction(i18n("&Move"), 0,view, TQT_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" ); + KAction *mnuMove = new KAction(i18n("&Move"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" ); mnuMove->plug(m_popupmenu); m_popupmenu->insertSeparator(); mnuYValue->plug(m_popupmenu); @@ -212,7 +212,7 @@ bool MainDlg::checkModified() if( m_modified ) { int saveit = KMessageBox::warningYesNoCancel( m_parent, i18n( "The plot has been modified.\n" - "Do you want to save it?" ), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); + "Do you want to save it?" ), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); switch( saveit ) { case KMessageBox::Yes: @@ -249,7 +249,7 @@ void MainDlg::slotSave() if ( oldfileversion) { - if ( KMessageBox::warningContinueCancel( m_parent, i18n( "This file is saved with an old file format; if you save it, you cannot open the file with older versions of Kmplot. Are you sure you want to continue?" ), TQString::null, i18n("Save New Format") ) == KMessageBox::Cancel) + if ( KMessageBox::warningContinueCancel( m_parent, i18n( "This file is saved with an old file format; if you save it, you cannot open the file with older versions of Kmplot. Are you sure you want to continue?" ), TQString(), i18n("Save New Format") ) == KMessageBox::Cancel) return; } kmplotio->save( m_url.url() ); @@ -268,7 +268,7 @@ void MainDlg::slotSaveas() if ( !url.isEmpty() ) { // check if file exists and overwriting is ok. - if( !KIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue ) + if( !KIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).tqarg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue ) { if ( !kmplotio->save( url ) ) KMessageBox::error(m_parent, i18n("The file could not be saved") ); @@ -293,12 +293,12 @@ void MainDlg::slotExport() if(!url.isEmpty()) { // check if file exists and overwriting is ok. - if( KIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return; + if( KIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).tqarg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return; if( url.fileName().right(4).lower()==".svg") { TQPicture pic; - view->draw(&pic, 2); + view->draw(TQT_TQPAINTDEVICE(&pic), 2); if (url.isLocalFile() ) pic.save( url.prettyURL(0,KURL::StripFileProtocol), "SVG"); else @@ -314,7 +314,7 @@ void MainDlg::slotExport() else if( url.fileName().right(4).lower()==".bmp") { TQPixmap pic(100, 100); - view->draw(&pic, 3); + view->draw(TQT_TQPAINTDEVICE(&pic), 3); if (url.isLocalFile() ) pic.save( url.prettyURL(0,KURL::StripFileProtocol), "BMP"); else @@ -330,7 +330,7 @@ void MainDlg::slotExport() else if( url.fileName().right(4).lower()==".png") { TQPixmap pic(100, 100); - view->draw(&pic, 3); + view->draw(TQT_TQPAINTDEVICE(&pic), 3); if (url.isLocalFile() ) pic.save( url.prettyURL(0,KURL::StripFileProtocol), "PNG"); else @@ -526,7 +526,7 @@ void MainDlg::slotQuickEdit(const TQString& f_str_const ) { //creates a valid name for the function if the user has forgotten that TQString f_str( f_str_const ); - int const pos = f_str_const.find(';'); + int const pos = f_str_const.tqfind(';'); if (pos!=-1) f_str = f_str.left(pos); if (f_str.at(0)=='r') @@ -538,7 +538,7 @@ void MainDlg::slotQuickEdit(const TQString& f_str_const ) KMessageBox::error( m_parent, i18n("Parametric functions must be definied in the \"New Parametric Plot\"-dialog which you can find in the menubar")); return; } - if ( f_str.contains('y') != 0) + if ( f_str.tqcontains('y') != 0) { KMessageBox::error( m_parent, i18n( "Recursive function is not allowed")); m_quickEdit->setFocus(); @@ -630,7 +630,7 @@ void MainDlg::loadConstants() if ( tmp_constant == " " || tmp_constant == " ") return; - constant = tmp_constant.at(0).upper().latin1(); + constant = tmp_constant.tqat(0).upper().latin1(); if ( constant<'A' || constant>'Z') constant = 'A'; @@ -785,12 +785,12 @@ KmPlotPartFactory::~KmPlotPartFactory() s_instance = 0L; } -KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, +KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const char *, const TQStringList & ) { // Create an instance of our Part - MainDlg* obj = new MainDlg( parentWidget, widgetName, parent, name ); + MainDlg* obj = new MainDlg( tqparentWidget, widgetName, tqparent, name ); emit objectCreated( obj ); return obj; } @@ -815,8 +815,8 @@ extern "C" /// BrowserExtension class -BrowserExtension::BrowserExtension(MainDlg* parent) - : KParts::BrowserExtension( parent, "KmPlot::BrowserExtension" ) +BrowserExtension::BrowserExtension(MainDlg* tqparent) + : KParts::BrowserExtension( tqparent, "KmPlot::BrowserExtension" ) { emit enableAction("print", true); setURLDropHandlingEnabled(true); @@ -824,7 +824,7 @@ BrowserExtension::BrowserExtension(MainDlg* parent) void BrowserExtension::print() { - static_cast(parent())->slotPrint(); + static_cast(tqparent())->slotPrint(); } diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h index 7b4d83bf..8609de0e 100644 --- a/kmplot/kmplot/MainDlg.h +++ b/kmplot/kmplot/MainDlg.h @@ -28,7 +28,7 @@ #ifndef MainDlg_included #define MainDlg_included -// Qt includes +// TQt includes #include // KDE includes @@ -70,14 +70,15 @@ class BrowserExtension; class MainDlg : public KParts::ReadOnlyPart, virtual public MainDlgIface { Q_OBJECT + TQ_OBJECT public: /** Constuctor. - * @param parentWidget parent widget for this part - * @param parent parent object + * @param tqparentWidget tqparent widget for this part + * @param tqparent tqparent object * @param name name of this dialog */ - MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const char *name); + MainDlg(TQWidget *tqparentWidget, const char *, TQObject *tqparent, const char *name); /// Cleaning up a bit. virtual ~MainDlg(); /// This class needs access to private members, too. @@ -184,7 +185,7 @@ private: KmPlotIO *kmplotio; /// Set to true if the application is readonly bool m_readonly; - /// MainDlg's parent widget + /// MainDlg's tqparent widget TQWidget *m_parent; /// Current file KURL m_currentfile; @@ -216,11 +217,12 @@ protected slots: class KmPlotPartFactory : public KParts::Factory { Q_OBJECT + TQ_OBJECT public: KmPlotPartFactory(); virtual ~KmPlotPartFactory(); - virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, + virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); @@ -232,6 +234,7 @@ private: class BrowserExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT public: BrowserExtension(MainDlg*); diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am index f5158dc9..49d5931b 100644 --- a/kmplot/kmplot/Makefile.am +++ b/kmplot/kmplot/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kmplot # the application source, library search path, and link libraries kmplot_SOURCES = main.cpp kmplot.cpp kmplotprogress.cpp kmplotIface.skel -kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) +kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP kmplot_LDADD = $(LIB_KPARTS) # this is where the desktop file will go @@ -44,7 +44,7 @@ kde_module_LTLIBRARIES = libkmplotpart.la # the Part's source, library search path, and link libraries libkmplotpart_la_SOURCES = FktDlgData.ui parser.cpp xparser.cpp diagr.cpp View.cpp MainDlg.cpp FktDlg.cpp kprinterdlg.cpp settings.kcfgc settingspagecolor.ui kconstanteditor.cpp qparametereditor.ui kparametereditor.cpp settingspagecoords.ui settingspagefonts.ui settingspagescaling.ui settingspageprecision.ui qeditparametric.ui keditparametric.cpp qeditpolar.ui keditpolar.cpp editfunctionpage.ui editderivativespage.ui editintegralpage.ui editfunction.cpp qeditconstant.ui qminmax.ui kminmax.cpp qconstanteditor.ui keditconstant.cpp kmplotio.cpp sliderwindow.ui ksliderwindow.cpp MainDlgIface.skel parseriface.skel Viewiface.skel coordsconfigdialog.cpp -libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP libkmplotpart_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_KDEPRINT) # this is where the desktop file will go diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp index 0d45fd2c..288a9de6 100644 --- a/kmplot/kmplot/View.cpp +++ b/kmplot/kmplot/View.cpp @@ -23,7 +23,7 @@ * */ -// Qt includes +// TQt includes #include #include #include @@ -56,7 +56,7 @@ double View::xmin = 0; double View::xmax = 0; -View::View(bool const r, bool &mo, KPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(KApplication::kApplication()->dcopClient()) +View::View(bool const r, bool &mo, KPopupMenu *p, TQWidget* tqparent, const char* name ) : DCOPObject("View"), TQWidget( tqparent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(KApplication::kApplication()->dcopClient()) { csmode = csparam = -1; cstype = 0; @@ -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.worldMatrix(); + wm=DC.tqworldMatrix(); s=DC.xForm(TQPoint(1000, 0)).x()/1000.; dgr.Create( ref, lx, ly, xmin, xmax, ymin, ymax ); } @@ -211,7 +211,7 @@ void View::draw(TQPaintDevice *dev, int form) stepWidth=Settings::stepWidth(); isDrawing=true; - setCursor(Qt::WaitCursor ); + setCursor(TQt::WaitCursor ); stop_calculating = false; for(TQValueVector::iterator ufkt=m_parser->ufkt.begin(); ufkt!=m_parser->ufkt.end() && !stop_calculating; ++ufkt) if ( !ufkt->fname.isEmpty() ) @@ -531,7 +531,7 @@ void View::setpi(TQString *s) int i; TQChar c(960); - while((i=s->find('p')) != -1) s->replace(i, 2, &c, 1); + while((i=s->tqfind('p')) != -1) s->tqreplace(i, 2, &c, 1); } @@ -594,7 +594,7 @@ void View::drawPlot() if( m_minmax->isShown() ) m_minmax->updateFunctions(); buffer.fill(backgroundcolor); - draw(&buffer, 0); + draw(TQT_TQPAINTDEVICE(&buffer), 0); TQPainter p; p.begin(this); bitBlt( this, 0, 0, &buffer, 0, 0, width(), height() ); @@ -613,11 +613,11 @@ void View::mouseMoveEvent(TQMouseEvent *e) p.end(); TQPainter painter(this); - TQPen pen(Qt::white, 1, Qt::DotLine); - painter.setRasterOp (Qt::XorROP); + TQPen pen(TQt::white, 1, TQt::DotLine); + painter.setRasterOp (TQt::XorROP); painter.setPen(pen); - painter.setBackgroundMode (TQPainter::OpaqueMode); - painter.setBackgroundColor (Qt::blue); + painter.setBackgroundMode (Qt::OpaqueMode); + painter.setBackgroundColor (TQt::blue); painter.drawRect(rectangle_point.x(), rectangle_point.y(), e->pos().x()-rectangle_point.x(), e->pos().y()-rectangle_point.y()); return; @@ -639,7 +639,7 @@ void View::mouseMoveEvent(TQMouseEvent *e) csflg=0; } - if(area.contains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpospos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxposbutton()==RightButton) //clicking with the right mouse button + if( !m_readonly && e->button()==Qt::RightButton) //clicking with the right mouse button { char function_type; for( TQValueVector::iterator it = m_parser->ufkt.begin(); it != m_parser->ufkt.end(); ++it) @@ -887,10 +887,10 @@ void View::mousePressEvent(TQMouseEvent *e) it->setParameter( sw->slider->value() ); } - if ( function_type=='x' && fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.contains('t')==1) //parametric plot + if ( function_type=='x' && fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.tqcontains('t')==1) //parametric plot { TQValueVector::iterator ufkt_y = it+1; - if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)fstr.contains('t')==1) + if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)fstr.tqcontains('t')==1) { if ( csmode == -1) { @@ -942,7 +942,7 @@ void View::mousePressEvent(TQMouseEvent *e) else m_popupmenushown = 2; TQString function = it->fstr; - function = function.left(function.find('(')) + '\''; + function = function.left(function.tqfind('(')) + '\''; m_popupmenu->changeTitle(10, function); m_popupmenu->exec(TQCursor::pos()); return; @@ -959,7 +959,7 @@ void View::mousePressEvent(TQMouseEvent *e) else m_popupmenushown = 2; TQString function = it->fstr; - function = function.left(function.find('(')) + "\'\'"; + function = function.left(function.tqfind('(')) + "\'\'"; m_popupmenu->changeTitle(10, function); m_popupmenu->exec(TQCursor::pos()); return; @@ -969,7 +969,7 @@ void View::mousePressEvent(TQMouseEvent *e) } return; } - if(e->button()!=LeftButton) return ; + if(e->button()!=Qt::LeftButton) return ; if(csmode>=0) //disable trace mode if trace mode is enable { csmode=-1; @@ -1019,7 +1019,7 @@ void View::mousePressEvent(TQMouseEvent *e) csparam = k; m_minmax->selectItem(); TQString function = it->fstr; - function = function.left(function.find('(')) + '\''; + function = function.left(function.tqfind('(')) + '\''; setStatusBar(function,4); mouseMoveEvent(e); return; @@ -1031,7 +1031,7 @@ void View::mousePressEvent(TQMouseEvent *e) csparam = k; m_minmax->selectItem(); TQString function = it->fstr; - function = function.left(function.find('(')) + "\'\'"; + function = function.left(function.tqfind('(')) + "\'\'"; setStatusBar(function,4); mouseMoveEvent(e); return; @@ -1221,7 +1221,7 @@ void View::findMinMaxValue(Ufkt *ufkt, char p_mode, bool minimum, double &dmin, } isDrawing=true; - setCursor(Qt::WaitCursor ); + setCursor(TQt::WaitCursor ); double dx; if ( p_mode == 3) @@ -1404,7 +1404,7 @@ void View::getYValue(Ufkt *ufkt, char p_mode, double x, double &y, const TQStri stop_calculating = false; isDrawing=true; - setCursor(Qt::WaitCursor ); + setCursor(TQt::WaitCursor ); bool target_found=false; startProgressBar((int) double((dmax-dmin)/dx)/2); x = ufkt->oldx = ufkt->startx; //the initial x-point @@ -1449,7 +1449,7 @@ void View::getYValue(Ufkt *ufkt, char p_mode, double x, double &y, const TQStri void View::keyPressEvent( TQKeyEvent * e) { - if ( zoom_mode != Z_Normal && e->key() == Qt::Key_Escape ) + if ( zoom_mode != Z_Normal && e->key() == TQt::Key_Escape ) { resetZoom(); return; @@ -1470,11 +1470,11 @@ void View::keyPressEvent( TQKeyEvent * e) if (csmode==-1 ) return; TQMouseEvent *event; - if (e->key() == Qt::Key_Left ) + if (e->key() == TQt::Key_Left ) event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx-1,fcy-1),Qt::LeftButton,Qt::LeftButton); - else if (e->key() == Qt::Key_Right ) + else if (e->key() == TQt::Key_Right ) event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx+1,fcy+1),Qt::LeftButton,Qt::LeftButton); - else if (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down) //switch graph in trace mode + else if (e->key() == TQt::Key_Up || e->key() == TQt::Key_Down) //switch graph in trace mode { TQValueVector::iterator it = &m_parser->ufkt[m_parser->ixValue(csmode)]; int const ke=it->parameters.count(); @@ -1561,21 +1561,21 @@ void View::keyPressEvent( TQKeyEvent * e) case 1: { TQString function = it->fstr; - function = function.left(function.find('(')) + '\''; + function = function.left(function.tqfind('(')) + '\''; setStatusBar(function,4); break; } case 2: { TQString function = it->fstr; - function = function.left(function.find('(')) + "\'\'"; + function = function.left(function.tqfind('(')) + "\'\'"; setStatusBar(function,4); break; } } event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx,fcy),Qt::LeftButton,Qt::LeftButton); } - else if ( e->key() == Qt::Key_Space ) + else if ( e->key() == TQt::Key_Space ) { event = new TQMouseEvent(TQEvent::MouseButtonPress,TQCursor::pos(),Qt::RightButton,Qt::RightButton); mousePressEvent(event); @@ -1672,7 +1672,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double int const origoy = dgr.Transy(0.0); int const rectwidth = dgr.Transx(dx)- dgr.Transx(0.0)+1; - setCursor(Qt::WaitCursor ); + setCursor(TQt::WaitCursor ); isDrawing=true; bool forward_direction; @@ -1681,7 +1681,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double else forward_direction = true; - int intervals = qRound((dmax-dmin)/dx); + int intervals = tqRound((dmax-dmin)/dx); int at = 0; while ((at<=intervals) || (p_mode == 3 && x>=dmin && !forward_direction) || (p_mode == 3 && x<=dmax && forward_direction)) @@ -1801,7 +1801,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double DC->end(); setFocus(); update(); - draw(&buffer,0); + draw(TQT_TQPAINTDEVICE(&buffer),0); } if ( calculated_area>0) @@ -1883,7 +1883,7 @@ void View::mnuHide_clicked() } else { - TQKeyEvent *event = new TQKeyEvent(TQKeyEvent::KeyPress,Qt::Key_Up ,Qt::Key_Up ,0); + TQKeyEvent *event = new TQKeyEvent(TQKeyEvent::KeyPress,TQt::Key_Up ,TQt::Key_Up ,0); keyPressEvent(event); //change selected graph delete event; return; @@ -1894,7 +1894,7 @@ void View::mnuRemove_clicked() if ( csmode == -1 ) return; - if ( KMessageBox::warningContinueCancel(this,i18n("Are you sure you want to remove this function?"), TQString::null, KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this,i18n("Are you sure you want to remove this function?"), TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { Ufkt *ufkt = &m_parser->ufkt[m_parser->ixValue(csmode)]; char const function_type = ufkt->fstr[0].latin1(); @@ -1973,7 +1973,7 @@ void View::mnuMove_clicked() void View::mnuNoZoom_clicked() { - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); zoom_mode = Z_Normal; } @@ -1983,7 +1983,7 @@ void View::mnuRectangular_clicked() resetZoom(); else { - setCursor(Qt::CrossCursor); + setCursor(TQt::CrossCursor); zoom_mode = Z_Rectangular; } } @@ -2014,7 +2014,7 @@ void View::mnuCenter_clicked() resetZoom(); else { - setCursor(Qt::PointingHandCursor); + setCursor(TQt::PointingHandCursor); zoom_mode = Z_Center; } } @@ -2053,10 +2053,10 @@ void View::restoreCursor() switch (zoom_mode) { case Z_Normal: //no zoom - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); break; case Z_Rectangular: //rectangle zoom - setCursor(Qt::CrossCursor); + setCursor(TQt::CrossCursor); break; case Z_ZoomIn: //zoom in setCursor( TQCursor( SmallIcon( "magnify", 32), 10, 10 ) ); @@ -2065,7 +2065,7 @@ void View::restoreCursor() setCursor( TQCursor( SmallIcon( "lessen", 32), 10, 10 ) ); break; case Z_Center: //center a point - setCursor(Qt::PointingHandCursor); + setCursor(TQt::PointingHandCursor); break; } } diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h index a28aadbc..034f83da 100644 --- a/kmplot/kmplot/View.h +++ b/kmplot/kmplot/View.h @@ -27,7 +27,7 @@ #define View_included #undef GrayScale -// Qt includes +// TQt includes #include // KDE includes @@ -67,9 +67,10 @@ enum ZoomMode class View : public TQWidget, virtual public ViewIface { Q_OBJECT + TQ_OBJECT public: /// Contructor sets up the parser, too. - View(bool, bool &, KPopupMenu *, TQWidget* parent=NULL, const char* name=NULL ); + View(bool, bool &, KPopupMenu *, TQWidget* tqparent=NULL, const char* name=NULL ); void setMinMaxDlg(KMinMax *); virtual ~View(); diff --git a/kmplot/kmplot/coordsconfigdialog.cpp b/kmplot/kmplot/coordsconfigdialog.cpp index 37e92b16..ac4fac64 100644 --- a/kmplot/kmplot/coordsconfigdialog.cpp +++ b/kmplot/kmplot/coordsconfigdialog.cpp @@ -32,8 +32,8 @@ #include "settingspagecoords.h" #include "coordsconfigdialog.h" -CoordsConfigDialog::CoordsConfigDialog(XParser *p, TQWidget *parent) - : KConfigDialog(parent, "coords", Settings::self()), m_parser(p) +CoordsConfigDialog::CoordsConfigDialog(XParser *p, TQWidget *tqparent) + : KConfigDialog(tqparent, "coords", Settings::self()), m_parser(p) { configAxesDialog = new SettingsPageCoords( 0, "coordsSettings" ); addPage(configAxesDialog , i18n( "Coords" ), "coords", i18n( "Edit Coordinate System" ) ); diff --git a/kmplot/kmplot/coordsconfigdialog.h b/kmplot/kmplot/coordsconfigdialog.h index 9fe15490..1b5c7856 100644 --- a/kmplot/kmplot/coordsconfigdialog.h +++ b/kmplot/kmplot/coordsconfigdialog.h @@ -39,8 +39,9 @@ class SettingsPageCoords; class CoordsConfigDialog : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: - CoordsConfigDialog(XParser *p, TQWidget *parent = 0); + CoordsConfigDialog(XParser *p, TQWidget *tqparent = 0); ~CoordsConfigDialog(); protected slots: virtual void slotOk(); diff --git a/kmplot/kmplot/diagr.cpp b/kmplot/kmplot/diagr.cpp index ba65fce8..144e73b0 100644 --- a/kmplot/kmplot/diagr.cpp +++ b/kmplot/kmplot/diagr.cpp @@ -45,9 +45,9 @@ int isinf(double x) CDiagr::CDiagr() { - frameColor=qRgb(0, 0, 0); - axesColor=qRgb(0, 0, 0); - gridColor=qRgb(192, 192, 192); + frameColor=tqRgb(0, 0, 0); + axesColor=tqRgb(0, 0, 0); + gridColor=tqRgb(192, 192, 192); borderThickness=2; axesLineWidth = Settings::axesLineWidth(); gridLineWidth = Settings::gridLineWidth(); @@ -416,7 +416,7 @@ void CDiagr::drawLabels(TQPainter* pDC) int n; TQString s; - //pDC->drawText(x-dx, y+dy, 0, 0, Qt::AlignRight|Qt::AlignVCenter|Qt::DontClip, "0"); + //pDC->drawText(x-dx, y+dy, 0, 0, TQt::AlignRight|TQt::AlignVCenter|TQt::DontClip, "0"); char draw_next=0; TQFontMetrics const test(font); int swidth=0; @@ -463,7 +463,7 @@ void CDiagr::drawLabels(TQPainter* pDC) else draw_next=0; } - pDC->drawText(Transx(d), y+dy, 0, 0, Qt::AlignCenter|Qt::DontClip, s); + pDC->drawText(Transx(d), y+dy, 0, 0, TQt::AlignCenter|TQt::DontClip, s); } else if(fabs(ex-M_PI/3.)<1e-3) { @@ -497,7 +497,7 @@ void CDiagr::drawLabels(TQPainter* pDC) else draw_next=0; } - pDC->drawText(Transx(d), y+dy, 0, 0, Qt::AlignCenter|Qt::DontClip, s); + pDC->drawText(Transx(d), y+dy, 0, 0, TQt::AlignCenter|TQt::DontClip, s); } else if(fabs(ex-M_PI/4.)<1e-3) { @@ -531,7 +531,7 @@ void CDiagr::drawLabels(TQPainter* pDC) else draw_next=0; } - pDC->drawText(Transx(d), y+dy, 0, 0, Qt::AlignCenter|Qt::DontClip, s); + pDC->drawText(Transx(d), y+dy, 0, 0, TQt::AlignCenter|TQt::DontClip, s); } else if((n%5==0 || n==1 || n==-1 || draw_next)) { @@ -552,14 +552,14 @@ void CDiagr::drawLabels(TQPainter* pDC) else draw_next=0; } - pDC->drawText(Transx(d), y+dy, 0, 0, Qt::AlignCenter|Qt::DontClip, s); + pDC->drawText(Transx(d), y+dy, 0, 0, TQt::AlignCenter|TQt::DontClip, s); } } if(ymax<0 && xmax<0) - pDC->drawText(Transx(xmax)-(4*dx), y+(dy-20), 0, 0, Qt::AlignCenter|Qt::DontClip, "x"); + pDC->drawText(Transx(xmax)-(4*dx), y+(dy-20), 0, 0, TQt::AlignCenter|TQt::DontClip, "x"); else - pDC->drawText(Transx(xmax)-dx, y+dy, 0, 0, Qt::AlignCenter|Qt::DontClip, "x"); + pDC->drawText(Transx(xmax)-dx, y+dy, 0, 0, TQt::AlignCenter|TQt::DontClip, "x"); for(d=tsy, n=(int)ceil(ymin/ey); d=0) - pDC->drawText(x+dx, Transy(d), 0, 0, Qt::AlignVCenter|Qt::AlignLeft|Qt::DontClip, s); + pDC->drawText(x+dx, Transy(d), 0, 0, TQt::AlignVCenter|TQt::AlignLeft|TQt::DontClip, s); else - pDC->drawText(x-dx, Transy(d), 0, 0, Qt::AlignVCenter|Qt::AlignRight|Qt::DontClip, s); + pDC->drawText(x-dx, Transy(d), 0, 0, TQt::AlignVCenter|TQt::AlignRight|TQt::DontClip, s); } else if(fabs(ey-M_PI/3.)<1e-3) { @@ -609,9 +609,9 @@ void CDiagr::drawLabels(TQPainter* pDC) else continue; if (xmin>=0) - pDC->drawText(x+dx, Transy(d), 0, 0, Qt::AlignVCenter|Qt::AlignLeft|Qt::DontClip, s); + pDC->drawText(x+dx, Transy(d), 0, 0, TQt::AlignVCenter|TQt::AlignLeft|TQt::DontClip, s); else - pDC->drawText(x-dx, Transy(d), 0, 0, Qt::AlignVCenter|Qt::AlignRight|Qt::DontClip, s); + pDC->drawText(x-dx, Transy(d), 0, 0, TQt::AlignVCenter|TQt::AlignRight|TQt::DontClip, s); } else if(fabs(ey-M_PI/4.)<1e-3) { @@ -630,24 +630,24 @@ void CDiagr::drawLabels(TQPainter* pDC) else continue; if (xmin>=0) - pDC->drawText(x+dx, Transy(d), 0, 0, Qt::AlignVCenter|Qt::AlignLeft|Qt::DontClip, s); + pDC->drawText(x+dx, Transy(d), 0, 0, TQt::AlignVCenter|TQt::AlignLeft|TQt::DontClip, s); else - pDC->drawText(x-dx, Transy(d), 0, 0, Qt::AlignVCenter|Qt::AlignRight|Qt::DontClip, s); + pDC->drawText(x-dx, Transy(d), 0, 0, TQt::AlignVCenter|TQt::AlignRight|TQt::DontClip, s); } else if((n%5==0 || n==1 || n==-1)) { s=TQString().sprintf("%+0.3g", n*ey); if (xmin>=0) - pDC->drawText(x+dx, Transy(d), 0, 0, Qt::AlignVCenter|Qt::AlignLeft|Qt::DontClip, s); + pDC->drawText(x+dx, Transy(d), 0, 0, TQt::AlignVCenter|TQt::AlignLeft|TQt::DontClip, s); else - pDC->drawText(x-dx, Transy(d), 0, 0, Qt::AlignVCenter|Qt::AlignRight|Qt::DontClip, s); + pDC->drawText(x-dx, Transy(d), 0, 0, TQt::AlignVCenter|TQt::AlignRight|TQt::DontClip, s); } } if(ymax<0 && xmax<0) - pDC->drawText(x-dx, Transy(ymax)+(2*dy), 0, 0, Qt::AlignVCenter|Qt::AlignRight|Qt::DontClip, "y"); + pDC->drawText(x-dx, Transy(ymax)+(2*dy), 0, 0, TQt::AlignVCenter|TQt::AlignRight|TQt::DontClip, "y"); else if (xmin>0) - pDC->drawText(x-(2*dx), Transy(ymax)+dy, 0, 0, Qt::AlignVCenter|Qt::AlignRight|Qt::DontClip, "y"); + pDC->drawText(x-(2*dx), Transy(ymax)+dy, 0, 0, TQt::AlignVCenter|TQt::AlignRight|TQt::DontClip, "y"); else - pDC->drawText(x-dx, Transy(ymax)+dy, 0, 0, Qt::AlignVCenter|Qt::AlignRight|Qt::DontClip, "y"); + pDC->drawText(x-dx, Transy(ymax)+dy, 0, 0, TQt::AlignVCenter|TQt::AlignRight|TQt::DontClip, "y"); } diff --git a/kmplot/kmplot/diagr.h b/kmplot/kmplot/diagr.h index 23375821..b054f06e 100644 --- a/kmplot/kmplot/diagr.h +++ b/kmplot/kmplot/diagr.h @@ -32,7 +32,7 @@ #include #include -// Qt includes +// TQt includes #include //@{ @@ -87,9 +87,9 @@ public: * These members hold the current options for line widths and colors */ //@{ - QRgb frameColor; ///< color of the border frame - QRgb axesColor; ///< color of the axes - QRgb gridColor; ///< color of the grid + TQRgb frameColor; ///< color of the border frame + TQRgb axesColor; ///< color of the axes + TQRgb gridColor; ///< color of the grid uint borderThickness, ///< current line width for the border frame axesLineWidth, ///< current line width for the axes diff --git a/kmplot/kmplot/editderivativespage.ui b/kmplot/kmplot/editderivativespage.ui index a6a88b78..f0482cbb 100644 --- a/kmplot/kmplot/editderivativespage.ui +++ b/kmplot/kmplot/editderivativespage.ui @@ -1,10 +1,10 @@ EditDerivativesPage - + EditDerivativesPage - + 0 0 @@ -19,7 +19,7 @@ unnamed - + grp1der @@ -50,7 +50,7 @@ Click this button to choose a color for the plot line. - + TextLabel2_2_2 @@ -58,7 +58,7 @@ 0.1mm - + textLabel2_2_2 @@ -86,7 +86,7 @@ Change the width of the plot line in steps of 0.1mm. - + showDerivative1 @@ -100,7 +100,7 @@ If this box is checked, the first derivative will be plotted, too. - + textLabel1_3_2_2 @@ -113,7 +113,7 @@ - + grp2der @@ -127,7 +127,7 @@ unnamed - + textLabel2_2 @@ -155,7 +155,7 @@ Click this button to choose a color for the plot line. - + textLabel1_3_2 @@ -183,7 +183,7 @@ Change the width of the plot line in steps of 0.1mm. - + TextLabel2_2 @@ -191,7 +191,7 @@ 0.1mm - + showDerivative2 @@ -217,7 +217,7 @@ Expanding - + 20 110 @@ -268,7 +268,7 @@ lineWidthDerivative2 colorDerivative2 - + knuminput.h knuminput.h diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp index 2d75cc49..daf9fd86 100644 --- a/kmplot/kmplot/editfunction.cpp +++ b/kmplot/kmplot/editfunction.cpp @@ -23,7 +23,7 @@ * */ -// Qt includes +// TQt includes #include #include #include @@ -56,8 +56,8 @@ #include "editintegralpage.h" #include "kparametereditor.h" -EditFunction::EditFunction( XParser* parser, TQWidget* parent, const char* name ) : - KDialogBase( IconList, "Caption", Help|Ok|Cancel, Ok, parent, name ), m_parser(parser) +EditFunction::EditFunction( XParser* parser, TQWidget* tqparent, const char* name ) : + KDialogBase( IconList, "Caption", Help|Ok|Cancel, Ok, tqparent, name ), m_parser(parser) { TQVBox *page0 = addVBoxPage( i18n("Function"), i18n( "Function" ), SmallIcon( "func", 32 ) ); editfunctionpage = new EditFunctionPage( page0 ); @@ -67,7 +67,7 @@ EditFunction::EditFunction( XParser* parser, TQWidget* parent, const char* name editintegralpage = new EditIntegralPage( page2 ); for( int number = 0; number < SLIDER_COUNT; number++ ) { - editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).arg( number +1) ); + editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).tqarg( number +1) ); } connect( editfunctionpage->cmdParameter, TQT_SIGNAL ( clicked() ), this, TQT_SLOT( cmdParameter_clicked() ) ); connect( editfunctionpage->useNoParameter, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( noParameter_toggled(bool) ) ); @@ -226,7 +226,7 @@ void EditFunction::accept() if ( tmp_ufkt.dminView::xmax ) { - KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").arg(View::xmin).arg(View::xmax) ); + KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").tqarg(View::xmin).tqarg(View::xmax) ); showPage(0); editfunctionpage->min->setFocus(); editfunctionpage->min->selectAll(); @@ -296,7 +296,7 @@ void EditFunction::accept() tmp_ufkt.f2_linewidth = editderivativespage->lineWidthDerivative2->value(); tmp_ufkt.f2_color = editderivativespage->colorDerivative2->color().rgb(); - if ( f_str.contains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) ) + if ( f_str.tqcontains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) ) { KMessageBox::error( this, i18n( "Recursive function is only allowed when drawing integral graphs") ); return; @@ -391,9 +391,9 @@ void EditFunction::slotHelp() bool EditFunction::functionHas2Arguments() { - int const openBracket = editfunctionpage->equation->text().find( "(" ); - int const closeBracket = editfunctionpage->equation->text().find( ")" ); - return editfunctionpage->equation->text().mid( openBracket+1, closeBracket-openBracket-1 ).find( "," ) != -1; + int const openBracket = editfunctionpage->equation->text().tqfind( "(" ); + int const closeBracket = editfunctionpage->equation->text().tqfind( ")" ); + return editfunctionpage->equation->text().mid( openBracket+1, closeBracket-openBracket-1 ).tqfind( "," ) != -1; } void EditFunction::cmdParameter_clicked() { @@ -428,12 +428,12 @@ void EditFunction::customMaxRange_toggled(bool status) void EditFunction::fixFunctionArguments(TQString &f_str) { - int const openBracket = f_str.find( "(" ); - int const closeBracket = f_str.find( ")" ); + int const openBracket = f_str.tqfind( "(" ); + int const closeBracket = f_str.tqfind( ")" ); char parameter_name; if ( closeBracket-openBracket == 2) //the function atribute is only one character { - char const function_name = f_str.at(openBracket+1).latin1(); + char const function_name = f_str.tqat(openBracket+1).latin1(); parameter_name = 'a'; while ( parameter_name == function_name) parameter_name++; diff --git a/kmplot/kmplot/editfunction.h b/kmplot/kmplot/editfunction.h index 308beadf..ef2613a1 100644 --- a/kmplot/kmplot/editfunction.h +++ b/kmplot/kmplot/editfunction.h @@ -39,11 +39,12 @@ class EditIntegralPage; class EditFunction : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /// @param parser points to the parser instance. - /// @param parent points to the parent widget. + /// @param tqparent points to the tqparent widget. /// @param name of this instance. - EditFunction( XParser* parser, TQWidget* parent = NULL, const char* name = NULL ); + EditFunction( XParser* parser, TQWidget* tqparent = NULL, const char* name = NULL ); /// Nothing special to do. virtual ~EditFunction() {} /// Fill the dialog's widgets with the properties of the parser function number index. diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui index 31d9bd28..ec9cd575 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -1,13 +1,13 @@ EditFunctionPage - + EditFunctionPage true - + 0 0 @@ -22,7 +22,7 @@ unnamed - + groupBox1 @@ -39,7 +39,7 @@ unnamed - + textLabel1_4 @@ -72,7 +72,7 @@ Example: f(x)=x^2 - + buttonGroup1 @@ -83,7 +83,7 @@ Example: f(x)=x^2 unnamed - + hide @@ -99,7 +99,7 @@ Example: f(x)=x^2 - + parameterValues @@ -110,7 +110,7 @@ Example: f(x)=x^2 unnamed - + useSlider @@ -124,7 +124,7 @@ Example: f(x)=x^2 Check this to change the parameter value by moving a slider. Select the slider from the list box on the right. The values vary from 0 (left) to 100 (right). - + listOfSliders @@ -138,7 +138,7 @@ Example: f(x)=x^2 Select one of the sliders to change the parameter value dynamically. The values vary from 0 (left) to 100 (right). - + useList @@ -169,7 +169,7 @@ Example: f(x)=x^2 Click here to open a list of parameter values. Here you can add, remove, and change them. - + useNoParameter @@ -188,7 +188,7 @@ Example: f(x)=x^2 - + frame5 @@ -202,7 +202,7 @@ Example: f(x)=x^2 unnamed - + customMinRange @@ -216,7 +216,7 @@ Example: f(x)=x^2 Check this button and enter the plot range boundarys below. - + textLabel1 @@ -241,7 +241,7 @@ Example: f(x)=x^2 Enter the lower boundary of the plot range. Expressions like 2*pi are allowed, too. - + customMaxRange @@ -269,7 +269,7 @@ Example: f(x)=x^2 Enter the upper boundary of the plot range. Expressions like 2*pi are allowed, too. - + textLabel1_2 @@ -282,7 +282,7 @@ Example: f(x)=x^2 - + frame6 @@ -296,7 +296,7 @@ Example: f(x)=x^2 unnamed - + textLabel2 @@ -321,7 +321,7 @@ Example: f(x)=x^2 Click this button to choose a color for the plot line. - + textLabel1_3 @@ -346,7 +346,7 @@ Example: f(x)=x^2 Change the width of the plot line in steps of 0.1mm. - + TextLabel2 @@ -366,7 +366,7 @@ Example: f(x)=x^2 Expanding - + 20 20 @@ -418,14 +418,14 @@ Example: f(x)=x^2 update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -466,7 +466,7 @@ Example: f(x)=x^2 setPalette(const QPalette&) setSelection(int,int) setCursorPosition(int) - setAlignment(int) + tqsetAlignment(int) cut() copy() paste() @@ -490,10 +490,10 @@ Example: f(x)=x^2 setTextWorkaround(const QString&) name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor @@ -519,7 +519,7 @@ Example: f(x)=x^2 frame echoMode cursorPosition - alignment + tqalignment dragEnabled readOnly inputMask @@ -565,14 +565,14 @@ Example: f(x)=x^2 update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -606,10 +606,10 @@ Example: f(x)=x^2 chooseColor() name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor @@ -671,14 +671,14 @@ Example: f(x)=x^2 update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -713,10 +713,10 @@ Example: f(x)=x^2 slotEmitRelativeValueChanged(int) name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor @@ -777,14 +777,14 @@ Example: f(x)=x^2 update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -818,10 +818,10 @@ Example: f(x)=x^2 slotSettingsChanged(int) name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor @@ -893,11 +893,11 @@ Example: f(x)=x^2 lineWidth color - + slotHelp() customRange_toggled( bool ) - - + + klineedit.h kpushbutton.h diff --git a/kmplot/kmplot/editintegralpage.ui b/kmplot/kmplot/editintegralpage.ui index 5180a8d2..bf38d0d4 100644 --- a/kmplot/kmplot/editintegralpage.ui +++ b/kmplot/kmplot/editintegralpage.ui @@ -1,10 +1,10 @@ EditIntegralPage - + EditIntegralPage - + 0 0 @@ -19,7 +19,7 @@ unnamed - + showIntegral @@ -33,7 +33,7 @@ Check this box if you want to hide the plot of the function. - + grpPoint @@ -47,7 +47,7 @@ unnamed - + textLabel1_5 @@ -58,7 +58,7 @@ txtInitX - + textLabel1_5_2 @@ -93,7 +93,7 @@ - + frame5_2_2 @@ -110,7 +110,7 @@ unnamed - + textLabel2_2_3 @@ -132,7 +132,7 @@ 0.01 - + customPrecision @@ -145,7 +145,7 @@ - + frame6_3 @@ -162,7 +162,7 @@ unnamed - + textLabel2_3 @@ -184,7 +184,7 @@ Click this button to choose a color for the plot line. - + textLabel1_3_3 @@ -209,7 +209,7 @@ Change the width of the plot line in steps of 0.1mm. - + TextLabel2_3 @@ -229,7 +229,7 @@ Expanding - + 20 62 @@ -281,7 +281,7 @@ lineWidth color - + knuminput.h diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp index c2017c8a..7fbc4101 100644 --- a/kmplot/kmplot/kconstanteditor.cpp +++ b/kmplot/kmplot/kconstanteditor.cpp @@ -40,8 +40,8 @@ #include "kconstanteditor.h" -KConstantEditor::KConstantEditor(View *v, TQWidget *parent, const char *name) - : QConstantEditor(parent,name), m_view(v) +KConstantEditor::KConstantEditor(View *v, TQWidget *tqparent, const char *name) + : QConstantEditor(tqparent,name), m_view(v) { TQString str_value; TQValueVector::iterator it; @@ -69,7 +69,7 @@ void KConstantEditor::cmdEdit_clicked() { if ( !varlist->currentItem() ) return; - constant = varlist->currentItem()->text(0).at(0).latin1(); + constant = varlist->currentItem()->text(0).tqat(0).latin1(); value = varlist->currentItem()->text(1); KEditConstant *dlg = new KEditConstant(m_view->parser(), constant, value); @@ -82,14 +82,14 @@ void KConstantEditor::cmdDelete_clicked() if ( !varlist->currentItem() ) return; - constant = varlist->currentItem()->text(0).at(0).latin1(); + constant = varlist->currentItem()->text(0).tqat(0).latin1(); value = varlist->currentItem()->text(1); TQString str; for( TQValueVector::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it) { str = it->fstr; - for (int i=str.find(')'); (uint)ifindItem(TQChar(constant), 0); //removes the item from the constant list + delete varlist->tqfindItem(TQChar(constant), 0); //removes the item from the constant list } void KConstantEditor::varlist_clicked( TQListViewItem * item ) @@ -136,7 +136,7 @@ void KConstantEditor::cmdDuplicate_clicked() { if (!varlist->currentItem()) return; - constant = varlist->currentItem()->text(0).at(0).latin1(); + constant = varlist->currentItem()->text(0).tqat(0).latin1(); value = varlist->currentItem()->text(1); TQStringList list; @@ -158,7 +158,7 @@ void KConstantEditor::cmdDuplicate_clicked() TQStringList result = KInputDialog::getItemList(i18n("Choose Name"),i18n("Choose a name for the constant:"),list, TQStringList(), false, &found); if (found) { - constant = (*result.begin()).at(0).latin1(); + constant = (*result.begin()).tqat(0).latin1(); emit newConstantSlot(); } @@ -191,7 +191,7 @@ void KConstantEditor::editConstantSlot() return; } - TQListViewItem *item = varlist->findItem(TQChar(constant), 0); + TQListViewItem *item = varlist->tqfindItem(TQChar(constant), 0); if (item!=0) item->setText(1,value); @@ -199,7 +199,7 @@ void KConstantEditor::editConstantSlot() int index = 0; for( TQValueVector::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it) { - if( it->fstr.contains(constant)!=0 ) + if( it->fstr.tqcontains(constant)!=0 ) m_view->parser()->reparse(index); //reparsing the function ++index; } diff --git a/kmplot/kmplot/kconstanteditor.h b/kmplot/kmplot/kconstanteditor.h index 93343ac3..d8514064 100644 --- a/kmplot/kmplot/kconstanteditor.h +++ b/kmplot/kmplot/kconstanteditor.h @@ -37,8 +37,9 @@ class KConstantEditor : public QConstantEditor { Q_OBJECT + TQ_OBJECT public: - KConstantEditor(View *, TQWidget *parent = 0, const char *name = 0); + KConstantEditor(View *, TQWidget *tqparent = 0, const char *name = 0); ~KConstantEditor(); public slots: diff --git a/kmplot/kmplot/keditconstant.cpp b/kmplot/kmplot/keditconstant.cpp index 4f4ab040..0ab01836 100644 --- a/kmplot/kmplot/keditconstant.cpp +++ b/kmplot/kmplot/keditconstant.cpp @@ -32,8 +32,8 @@ #include "keditconstant.h" -KEditConstant::KEditConstant(XParser *p, char &c, TQString &v, TQWidget *parent, const char *name) - : QEditConstant(parent, name,Qt::WDestructiveClose), constant(c), value(v), m_parser(p) +KEditConstant::KEditConstant(XParser *p, char &c, TQString &v, TQWidget *tqparent, const char *name) + : QEditConstant(tqparent, name,TQt::WDestructiveClose), constant(c), value(v), m_parser(p) { if ( constant != '0' ) { @@ -54,7 +54,7 @@ KEditConstant::~KEditConstant() void KEditConstant::cmdOK_clicked() { - constant = txtConstant->text().at(0).latin1(); + constant = txtConstant->text().tqat(0).latin1(); value = txtValue->text(); if ( constant<'A' || constant>'Z') { diff --git a/kmplot/kmplot/keditconstant.h b/kmplot/kmplot/keditconstant.h index e6d19d20..dcc61298 100644 --- a/kmplot/kmplot/keditconstant.h +++ b/kmplot/kmplot/keditconstant.h @@ -35,9 +35,10 @@ /// A small dialog for creating an editing constants class KEditConstant : public QEditConstant { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: - KEditConstant(XParser *p, char &, TQString &,TQWidget *parent = 0, const char *name = 0); + KEditConstant(XParser *p, char &, TQString &,TQWidget *tqparent = 0, const char *name = 0); ~KEditConstant(); public slots: diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp index 67ee0421..332d93f9 100644 --- a/kmplot/kmplot/keditparametric.cpp +++ b/kmplot/kmplot/keditparametric.cpp @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ -// Qt includes +// TQt includes #include // KDE includes @@ -41,8 +41,8 @@ #include "xparser.h" #include "View.h" -KEditParametric::KEditParametric( XParser* parser, TQWidget* parent, const char* name ) : - QEditParametric( parent, name ), m_parser(parser) +KEditParametric::KEditParametric( XParser* parser, TQWidget* tqparent, const char* name ) : + QEditParametric( tqparent, name ), m_parser(parser) { connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); @@ -103,7 +103,7 @@ void KEditParametric::setWidgets() void KEditParametric::accept() { - if ( kLineEditXFunction->text().contains('y') != 0 || kLineEditYFunction->text().contains('y') != 0) + if ( kLineEditXFunction->text().tqcontains('y') != 0 || kLineEditYFunction->text().tqcontains('y') != 0) { KMessageBox::error( this, i18n( "Recursive function not allowed")); kLineEditXFunction->setFocus(); @@ -116,7 +116,7 @@ void KEditParametric::accept() { TQString fname; m_parser->fixFunctionName(fname, XParser::ParametricX, m_x_id); - int const pos = fname.find('('); + int const pos = fname.tqfind('('); kLineEditName->setText(fname.mid(1,pos-1)); } @@ -308,7 +308,7 @@ void KEditParametric::splitEquation( const TQString equation, TQString &name, TQ { int start = 0; if( equation[ 0 ] == 'x' || equation[ 0 ] == 'y' ) start++; - int length = equation.find( '(' ) - start; + int length = equation.tqfind( '(' ) - start; name = equation.mid( start, length ); expression = equation.section( '=', 1, 1 ); diff --git a/kmplot/kmplot/keditparametric.h b/kmplot/kmplot/keditparametric.h index 334d997a..10a69dec 100644 --- a/kmplot/kmplot/keditparametric.h +++ b/kmplot/kmplot/keditparametric.h @@ -36,11 +36,12 @@ class XParser; class KEditParametric : public QEditParametric { Q_OBJECT + TQ_OBJECT public: /// @param parser points to the parser instance. - /// @param parent points to the parent widget. + /// @param tqparent points to the tqparent widget. /// @param name of this instance. - KEditParametric( XParser* parser, TQWidget* parent = NULL, const char* name = NULL ); + KEditParametric( XParser* parser, TQWidget* tqparent = NULL, const char* name = NULL ); /// Nothing special to do. virtual ~KEditParametric() {} @@ -75,6 +76,7 @@ class KEditParametric : public QEditParametric void customMaxRange_toggled(bool); void customMinRange_toggled(bool); + protected: Ufkt *m_updatedfunction; }; diff --git a/kmplot/kmplot/keditpolar.cpp b/kmplot/kmplot/keditpolar.cpp index 787e9e32..e37372e9 100644 --- a/kmplot/kmplot/keditpolar.cpp +++ b/kmplot/kmplot/keditpolar.cpp @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ -// Qt includes +// TQt includes #include // KDE includes @@ -42,8 +42,8 @@ #include "xparser.h" #include "View.h" -KEditPolar::KEditPolar( XParser* parser, TQWidget* parent, const char* name ) : - QEditPolar( parent, name ),m_parser(parser) +KEditPolar::KEditPolar( XParser* parser, TQWidget* tqparent, const char* name ) : + QEditPolar( tqparent, name ),m_parser(parser) { connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); diff --git a/kmplot/kmplot/keditpolar.h b/kmplot/kmplot/keditpolar.h index 131f2475..8b199110 100644 --- a/kmplot/kmplot/keditpolar.h +++ b/kmplot/kmplot/keditpolar.h @@ -36,11 +36,12 @@ class XParser; class KEditPolar : public QEditPolar { Q_OBJECT + TQ_OBJECT public: /// @param parser points to the parser instance. - /// @param parent points to the parent widget. + /// @param tqparent points to the tqparent widget. /// @param name of this instance. - KEditPolar( XParser* parser, TQWidget* parent = NULL, const char* name = NULL ); + KEditPolar( XParser* parser, TQWidget* tqparent = NULL, const char* name = NULL ); /// Nothing special to do. virtual ~KEditPolar() {} @@ -66,7 +67,8 @@ class KEditPolar : public QEditPolar void slotHelp(); void customMinRange_toggled(bool); void customMaxRange_toggled(bool); - + + protected: Ufkt *m_updatedfunction; }; diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp index 3f8db2c8..a67d8f9b 100644 --- a/kmplot/kmplot/kminmax.cpp +++ b/kmplot/kmplot/kminmax.cpp @@ -36,8 +36,8 @@ #include "kminmax.h" #include "xparser.h" -KMinMax::KMinMax(View *v, TQWidget *parent, const char *name) - : QMinMax(parent, name), m_view(v) +KMinMax::KMinMax(View *v, TQWidget *tqparent, const char *name) + : QMinMax(tqparent, name), m_view(v) { m_mode=-1; connect( cmdClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() )); @@ -148,7 +148,7 @@ void KMinMax::updateFunctions() if ( it->f1_mode ) //1st derivative { TQString function (it->fstr); - int i= function.find('('); + int i= function.tqfind('('); function.truncate(i); function +="\'"; list->insertItem(function ); @@ -156,7 +156,7 @@ void KMinMax::updateFunctions() if ( it->f2_mode )//2nd derivative { TQString function (it->fstr); - int i= function.find('('); + int i= function.tqfind('('); function.truncate(i); function +="\'\'"; list->insertItem(function ); @@ -164,7 +164,7 @@ void KMinMax::updateFunctions() if ( it->integral_mode )//integral { TQString function (it->fstr); - int i= function.find('('); + int i= function.tqfind('('); function.truncate(i); function = function.upper(); list->insertItem(function ); @@ -177,7 +177,7 @@ void KMinMax::updateFunctions() else cmdFind->setEnabled(true); selectItem(); - TQListBoxItem *found_item = list->findItem(selected_item,Qt::ExactMatch); + TQListBoxItem *found_item = list->tqfindItem(selected_item,TQt::ExactMatch); if ( found_item && m_view->csmode < 0) list->setSelected(found_item,true); } @@ -192,18 +192,18 @@ void KMinMax::selectItem() TQString function = ufkt->fstr; if ( m_view->cstype == 2) { - int i= function.find('('); + int i= function.tqfind('('); function.truncate(i); function +="\'\'"; } else if ( m_view->cstype == 1) { - int i= function.find('('); + int i= function.tqfind('('); function.truncate(i); function +="\'"; } //kdDebug() << "function: " << function << endl; - TQListBoxItem *item = list->findItem(function,Qt::ExactMatch); + TQListBoxItem *item = list->tqfindItem(function,TQt::ExactMatch); list->setSelected(item,true); if ( !ufkt->parameters.isEmpty() ) @@ -248,7 +248,7 @@ void KMinMax::cmdFind_clicked() if ( dminView::xmax ) { - KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").arg(View::xmin).arg(View::xmax) ); + KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").tqarg(View::xmin).tqarg(View::xmax) ); min->setFocus(); min->selectAll(); return; @@ -258,22 +258,22 @@ void KMinMax::cmdFind_clicked() TQString function( list->currentText() ); char p_mode = 0; - if ( function.contains('\'') == 1) + if ( function.tqcontains('\'') == 1) { p_mode = 1; - int pos = function.find('\''); + int pos = function.tqfind('\''); function.remove(pos,1); } - else if ( function.contains('\'') == 2) + else if ( function.tqcontains('\'') == 2) { p_mode = 2; - int pos = function.find('\''); + int pos = function.tqfind('\''); function.remove(pos,2); } else if ( function.at(0).category() == TQChar::Letter_Uppercase) { p_mode = 3; - function.at(0) = function.at(0).lower(); + function.tqat(0) = function.tqat(0).lower(); } TQString fname, fstr; @@ -308,13 +308,13 @@ void KMinMax::cmdFind_clicked() { m_view->findMinMaxValue(ufkt,p_mode,true,dmin,dmax,parameter); if ( !m_view->isCalculationStopped() ) - KMessageBox::information(this,i18n("Minimum value:\nx: %1\ny: %2").arg(dmin).arg(dmax) ); + KMessageBox::information(this,i18n("Minimum value:\nx: %1\ny: %2").tqarg(dmin).tqarg(dmax) ); } else if ( m_mode == 1) { m_view->findMinMaxValue(ufkt,p_mode,false,dmin,dmax,parameter); if ( !m_view->isCalculationStopped() ) - KMessageBox::information(this,i18n("Maximum value:\nx: %1\ny: %2").arg(dmin).arg(dmax)); + KMessageBox::information(this,i18n("Maximum value:\nx: %1\ny: %2").tqarg(dmin).tqarg(dmax)); } else if ( m_mode == 2) { @@ -336,7 +336,7 @@ void KMinMax::cmdFind_clicked() { m_view->setFocus(); m_view->update(); - KMessageBox::information(this,i18n("The integral in the interval [%1, %2] is:\n%3").arg(dmin_tmp).arg(dmax).arg(dmin)); + KMessageBox::information(this,i18n("The integral in the interval [%1, %2] is:\n%3").tqarg(dmin_tmp).tqarg(dmax).tqarg(dmin)); } } @@ -352,22 +352,22 @@ void KMinMax::list_highlighted(TQListBoxItem* item) } TQString function( list->currentText() ); char p_mode = 0; - if ( function.contains('\'') == 1) + if ( function.tqcontains('\'') == 1) { p_mode = 1; - int pos = function.find('\''); + int pos = function.tqfind('\''); function.remove(pos,1); } - else if ( function.contains('\'') == 2) + else if ( function.tqcontains('\'') == 2) { p_mode = 2; - int pos = function.find('\''); + int pos = function.tqfind('\''); function.remove(pos,2); } else if ( function.at(0).category() == TQChar::Letter_Uppercase) { p_mode = 3; - function.at(0) = function.at(0).lower(); + function.tqat(0) = function.tqat(0).lower(); } TQString const sec_function = function.section('(',0,0); for(TQValueVector::iterator it = m_view->parser()->ufkt.begin(); it!=m_view->parser()->ufkt.end(); ++it) @@ -390,22 +390,22 @@ void KMinMax::cmdParameter_clicked() { TQString function( list->currentText() ); char p_mode = 0; - if ( function.contains('\'') == 1) + if ( function.tqcontains('\'') == 1) { p_mode = 1; - int pos = function.find('\''); + int pos = function.tqfind('\''); function.remove(pos,1); } - else if ( function.contains('\'') == 2) + else if ( function.tqcontains('\'') == 2) { p_mode = 2; - int pos = function.find('\''); + int pos = function.tqfind('\''); function.remove(pos,2); } else if ( function.at(0).category() == TQChar::Letter_Uppercase) { p_mode = 3; - function.at(0) = function.at(0).lower(); + function.tqat(0) = function.tqat(0).lower(); } TQString const sec_function = function.section('(',0,0); diff --git a/kmplot/kmplot/kminmax.h b/kmplot/kmplot/kminmax.h index e564b6f5..ac68dd49 100644 --- a/kmplot/kmplot/kminmax.h +++ b/kmplot/kmplot/kminmax.h @@ -36,8 +36,9 @@ class KMinMax : public QMinMax { Q_OBJECT + TQ_OBJECT public: - KMinMax(View *, TQWidget *parent = 0, const char *name = 0); + KMinMax(View *, TQWidget *tqparent = 0, const char *name = 0); /// called every time the dialog is opened void init(char); /// update the list with functions @@ -48,7 +49,7 @@ public: ~KMinMax(); public slots: - /// the user has pressen the find/caluclate/draw button + /// the user has pressen the tqfind/caluclate/draw button void cmdFind_clicked(); /// the selecting a function that uses parameter function from a list the user can choose which paramater value he/she wants to use void cmdParameter_clicked(); diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index e6f71013..f3f6b7f6 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -59,7 +59,7 @@ KmPlot::KmPlot( KCmdLineArgs* args) { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast(factory->create(this, + m_part = static_cast(factory->create(TQT_TQOBJECT(this), "kmplot_part", "KParts::ReadOnlyPart" )); if (m_part) { @@ -82,7 +82,7 @@ KmPlot::KmPlot( KCmdLineArgs* args) } if (!initialGeometrySet()) - resize( TQSize(450, 520).expandedTo(minimumSizeHint())); + resize( TQSize(450, 520).expandedTo(tqminimumSizeHint())); // apply the saved mainwindow settings, if any, and ask the mainwindow // to automatically save settings if changed: window size, toolbar @@ -135,15 +135,15 @@ bool KmPlot::load(const KURL& url) void KmPlot::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this, "fullscreen"); connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); diff --git a/kmplot/kmplot/kmplot.h b/kmplot/kmplot/kmplot.h index bb861f49..ce8da9bc 100644 --- a/kmplot/kmplot/kmplot.h +++ b/kmplot/kmplot/kmplot.h @@ -49,6 +49,7 @@ class KToggleAction; class KmPlot : public KParts::MainWindow, virtual public KmPlotIface { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp index 9a5288a8..a51b5395 100644 --- a/kmplot/kmplot/kmplotio.cpp +++ b/kmplot/kmplot/kmplotio.cpp @@ -23,7 +23,7 @@ * */ -// Qt includes +// TQt includes #include #include @@ -53,7 +53,7 @@ KmPlotIO::~KmPlotIO() bool KmPlotIO::save( const KURL &url ) { - // saving as xml by a QDomDocument + // saving as xml by a TQDomDocument TQDomDocument doc( "kmpdoc" ); // the root tag TQDomElement root = doc.createElement( "kmpdoc" ); @@ -210,12 +210,12 @@ bool KmPlotIO::save( const KURL &url ) } -void KmPlotIO::addTag( TQDomDocument &doc, TQDomElement &parentTag, const TQString tagName, const TQString tagValue ) +void KmPlotIO::addTag( TQDomDocument &doc, TQDomElement &tqparentTag, const TQString tagName, const TQString tagValue ) { TQDomElement tag = doc.createElement( tagName ); TQDomText value = doc.createTextNode( tagValue ); tag.appendChild( value ); - parentTag.appendChild( tag ); + tqparentTag.appendChild( tag ); } bool KmPlotIO::load( const KURL &url ) @@ -435,7 +435,7 @@ void KmPlotIO::parseFunction( XParser *m_parser, const TQDomElement & n ) TQString fstr = ufkt.fstr; if ( !fstr.isEmpty() ) { - int const i = fstr.find( ';' ); + int const i = fstr.tqfind( ';' ); TQString str; if ( i == -1 ) str = fstr; @@ -530,7 +530,7 @@ void KmPlotIO::oldParseFunction( XParser *m_parser, const TQDomElement & n ) } const TQString tmp_fstr = n.namedItem( "equation" ).toElement().text(); - const int pos = tmp_fstr.find(';'); + const int pos = tmp_fstr.tqfind(';'); if ( pos == -1 ) ufkt.fstr = tmp_fstr; else @@ -538,7 +538,7 @@ void KmPlotIO::oldParseFunction( XParser *m_parser, const TQDomElement & n ) ufkt.fstr = tmp_fstr.left(pos); if ( !m_parser->getext( &ufkt, tmp_fstr) ) { - KMessageBox::error(0,i18n("The function %1 could not be loaded").arg(ufkt.fstr)); + KMessageBox::error(0,i18n("The function %1 could not be loaded").tqarg(ufkt.fstr)); return; } } @@ -546,7 +546,7 @@ void KmPlotIO::oldParseFunction( XParser *m_parser, const TQDomElement & n ) TQString fstr = ufkt.fstr; if ( !fstr.isEmpty() ) { - int const i = fstr.find( ';' ); + int const i = fstr.tqfind( ';' ); TQString str; if ( i == -1 ) str = fstr; diff --git a/kmplot/kmplot/kmplotio.h b/kmplot/kmplot/kmplotio.h index 3a92aa75..09112bbd 100644 --- a/kmplot/kmplot/kmplotio.h +++ b/kmplot/kmplot/kmplotio.h @@ -60,11 +60,11 @@ class KmPlotIO private: /** Esay way to add a tag to the Dom tree * @param &doc The document. - * @param parentTag The parent tag to support encapsulated tags. + * @param tqparentTag The tqparent tag to support encapsulated tags. * @param tagName The Name of the tag. * @param tagValue The data between the opening and cloding tag. */ - void addTag( TQDomDocument &doc, TQDomElement &parentTag, const TQString tagName, const TQString tagValue ); + void addTag( TQDomDocument &doc, TQDomElement &tqparentTag, const TQString tagName, const TQString tagValue ); /// Reads axes parameters from the node @a n. /// @param n Node containing the options. void parseAxes( const TQDomElement &n ); diff --git a/kmplot/kmplot/kmplotprogress.cpp b/kmplot/kmplot/kmplotprogress.cpp index c470c8ba..0df07475 100644 --- a/kmplot/kmplot/kmplotprogress.cpp +++ b/kmplot/kmplot/kmplotprogress.cpp @@ -27,9 +27,9 @@ #include #include "kmplotprogress.h" -//#include "kmplotprogress.moc.cpp" +//#include "kmplotprogress.tqmoc.cpp" -KmPlotProgress::KmPlotProgress( TQWidget* parent, const char* name ) : TQWidget( parent, name) +KmPlotProgress::KmPlotProgress( TQWidget* tqparent, const char* name ) : TQWidget( tqparent, name) { button = new KPushButton(this); button->setPixmap( SmallIcon( "cancel" ) ); diff --git a/kmplot/kmplot/kmplotprogress.h b/kmplot/kmplot/kmplotprogress.h index c4a039f9..f556921b 100644 --- a/kmplot/kmplot/kmplotprogress.h +++ b/kmplot/kmplot/kmplotprogress.h @@ -30,11 +30,12 @@ #include /// The progress-widget in the statusbar which appears when drawing integrals -class KmPlotProgress: public QWidget +class KmPlotProgress: public TQWidget { Q_OBJECT + TQ_OBJECT public: - KmPlotProgress( TQWidget* parent = 0, const char* name = 0 ); + KmPlotProgress( TQWidget* tqparent = 0, const char* name = 0 ); ~KmPlotProgress(); void increase(); diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp index 325241e9..9e87dda4 100644 --- a/kmplot/kmplot/kparametereditor.cpp +++ b/kmplot/kmplot/kparametereditor.cpp @@ -42,8 +42,8 @@ class ParameterValueList; -KParameterEditor::KParameterEditor(XParser *m, TQValueList *l, TQWidget *parent, const char *name) - : QParameterEditor(parent,name, true, Qt::WDestructiveClose), m_parameter(l), m_parser(m) +KParameterEditor::KParameterEditor(XParser *m, TQValueList *l, TQWidget *tqparent, const char *name) + : QParameterEditor(tqparent,name, true, TQt::WDestructiveClose), m_parameter(l), m_parser(m) { for ( TQValueList::Iterator it = m_parameter->begin(); it != m_parameter->end(); ++it ) list->insertItem( (*it).expression ); @@ -89,7 +89,7 @@ void KParameterEditor::cmdNew_clicked() } if ( checkTwoOfIt(result) ) { - KMessageBox::error(0,i18n("The value %1 already exists and will therefore not be added.").arg(result)); + KMessageBox::error(0,i18n("The value %1 already exists and will therefore not be added.").tqarg(result)); continue; } list->insertItem(result); @@ -116,7 +116,7 @@ void KParameterEditor::cmdEdit_clicked() if ( checkTwoOfIt(result) ) { if( result != list->currentText() ) - KMessageBox::error(0,i18n("The value %1 already exists.").arg(result)); + KMessageBox::error(0,i18n("The value %1 already exists.").tqarg(result)); continue; } list->removeItem( list->currentItem()); @@ -134,7 +134,7 @@ void KParameterEditor::cmdDelete_clicked() void KParameterEditor::cmdImport_clicked() { - KURL url = KFileDialog::getOpenURL( TQString::null,i18n("*.txt|Plain Text File ")); + KURL url = KFileDialog::getOpenURL( TQString(),i18n("*.txt|Plain Text File ")); if ( url.isEmpty() ) return; @@ -179,13 +179,13 @@ void KParameterEditor::cmdImport_clicked() } else if ( !verbose) { - if ( KMessageBox::warningContinueCancel(this,i18n("Line %1 is not a valid parameter value and will therefore not be included. Do you want to continue?").arg(i) ) == KMessageBox::Cancel) + if ( KMessageBox::warningContinueCancel(this,i18n("Line %1 is not a valid parameter value and will therefore not be included. Do you want to continue?").tqarg(i) ) == KMessageBox::Cancel) { file.close(); KIO::NetAccess::removeTempFile( tmpfile ); return; } - else if (KMessageBox::warningYesNo(this,i18n("Would you like to be informed about other lines that cannot be read?"), TQString::null, i18n("Get Informed"), i18n("Ignore Information") ) == KMessageBox::No) + else if (KMessageBox::warningYesNo(this,i18n("Would you like to be informed about other lines that cannot be read?"), TQString(), i18n("Get Informed"), i18n("Ignore Information") ) == KMessageBox::No) verbose = true; } } @@ -202,11 +202,11 @@ void KParameterEditor::cmdExport_clicked() { if ( !list->count() ) return; - KURL url = KFileDialog::getSaveURL( TQString::null,i18n("*.txt|Plain Text File ")); + KURL url = KFileDialog::getSaveURL( TQString(),i18n("*.txt|Plain Text File ")); if ( url.isEmpty() ) return; - if( !KIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue ) + if( !KIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).tqarg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue ) { TQString tmpfile; TQFile file; @@ -289,7 +289,7 @@ void KParameterEditor::varlist_doubleClicked( TQListBoxItem * ) bool KParameterEditor::checkTwoOfIt(const TQString & text) { - if ( list->findItem(text,Qt::ExactMatch) == 0) + if ( list->tqfindItem(text,TQt::ExactMatch) == 0) return false; else return true; diff --git a/kmplot/kmplot/kparametereditor.h b/kmplot/kmplot/kparametereditor.h index 7c1d742d..e27b7fcc 100644 --- a/kmplot/kmplot/kparametereditor.h +++ b/kmplot/kmplot/kparametereditor.h @@ -38,8 +38,9 @@ class ParameterValueList; class KParameterEditor : public QParameterEditor { Q_OBJECT + TQ_OBJECT public: - KParameterEditor(XParser *, TQValueList *, TQWidget *parent = 0, const char *name = 0); + KParameterEditor(XParser *, TQValueList *, TQWidget *tqparent = 0, const char *name = 0); ~KParameterEditor(); public slots: diff --git a/kmplot/kmplot/kprinterdlg.cpp b/kmplot/kmplot/kprinterdlg.cpp index aa74a7b5..643ab21b 100644 --- a/kmplot/kmplot/kprinterdlg.cpp +++ b/kmplot/kmplot/kprinterdlg.cpp @@ -23,7 +23,7 @@ * */ -// Qt includes +// TQt includes #include // KDE includes @@ -33,20 +33,20 @@ // local includes #include "kprinterdlg.h" -KPrinterDlg::KPrinterDlg( TQWidget *parent, const char *name ) - : KPrintDialogPage( parent, name ) +KPrinterDlg::KPrinterDlg( TQWidget *tqparent, const char *name ) + : KPrintDialogPage( tqparent, name ) { setTitle( i18n( "KmPlot Options" ) ); - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setMargin( KDialog::marginHint() ); - layout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setMargin( KDialog::marginHint() ); + tqlayout->setSpacing( KDialog::spacingHint() ); printHeaderTable = new TQCheckBox( i18n( "Print header table" ), this ); transparent_background = new TQCheckBox( i18n( "Transparent background" ), this ); - layout->addWidget( printHeaderTable ); - layout->addWidget( transparent_background ); - layout->addStretch( 1 ); + tqlayout->addWidget( printHeaderTable ); + tqlayout->addWidget( transparent_background ); + tqlayout->addStretch( 1 ); } void KPrinterDlg::getOptions( TQMap& opts, bool include_def ) diff --git a/kmplot/kmplot/kprinterdlg.h b/kmplot/kmplot/kprinterdlg.h index 46113efb..27be9a52 100644 --- a/kmplot/kmplot/kprinterdlg.h +++ b/kmplot/kmplot/kprinterdlg.h @@ -28,7 +28,7 @@ #ifndef kprintdlg_included #define kprintdlg_included -// Qt includes +// TQt includes #include // KDE includes @@ -42,9 +42,10 @@ class KPrinterDlg : public KPrintDialogPage { Q_OBJECT + TQ_OBJECT public: /// Getting the common arguments. - KPrinterDlg( TQWidget *parent = 0, const char *name = 0 ); + KPrinterDlg( TQWidget *tqparent = 0, const char *name = 0 ); /// Reimplemented. void getOptions( TQMap& opts, bool include_def = false ); diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp index 24c71994..758f6abc 100644 --- a/kmplot/kmplot/ksliderwindow.cpp +++ b/kmplot/kmplot/ksliderwindow.cpp @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ -// Qt includes +// TQt includes #include #include #include @@ -42,11 +42,11 @@ // local includes #include "ksliderwindow.h" -KSliderWindow::KSliderWindow(TQWidget* parent, int num ) : - SliderWindow( parent, "", false, Qt::WStyle_Tool-Qt::WStyle_Maximize ), m_num(num) +KSliderWindow::KSliderWindow(TQWidget* tqparent, int num ) : + SliderWindow( tqparent, "", false, TQt::WStyle_Tool-TQt::WStyle_Maximize ), m_num(num) { - setCaption(i18n( "Slider %1" ).arg( num+1 ) ); - TQToolTip::add( slider, i18n( "Slider no. %1" ).arg( num+1 )); + setCaption(i18n( "Slider %1" ).tqarg( num+1 ) ); + TQToolTip::add( slider, i18n( "Slider no. %1" ).tqarg( num+1 )); TQWhatsThis::add( this, i18n( "Move slider to change the parameter of the function plot connected to this slider." ) ); // load the min and max value + the current value @@ -61,9 +61,9 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) : installEventFilter(this); m_popupmenu = new KPopupMenu(this); - KAction *mnuMinValue = new KAction(i18n("&Change Minimum Value") ,0,this, TQT_SLOT( mnuMinValue_clicked() ),0); + KAction *mnuMinValue = new KAction(i18n("&Change Minimum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMinValue_clicked() ),0); mnuMinValue->plug(m_popupmenu); - KAction *mnuMaxValue = new KAction(i18n("&Change Maximum Value") ,0,this, TQT_SLOT( mnuMaxValue_clicked() ),0 ); + KAction *mnuMaxValue = new KAction(i18n("&Change Maximum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMaxValue_clicked() ),0 ); mnuMaxValue->plug(m_popupmenu); } diff --git a/kmplot/kmplot/ksliderwindow.h b/kmplot/kmplot/ksliderwindow.h index ff4843c8..79a3f089 100644 --- a/kmplot/kmplot/ksliderwindow.h +++ b/kmplot/kmplot/ksliderwindow.h @@ -34,10 +34,11 @@ class KSliderWindow : public SliderWindow { Q_OBJECT + TQ_OBJECT public: - /// @param parent points to the parent widget. + /// @param tqparent points to the tqparent widget. /// @param num number of this instance. - KSliderWindow(TQWidget* parent, int num ); + KSliderWindow(TQWidget* tqparent, int num ); virtual ~KSliderWindow(); private slots: diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp index ed064b85..2b10f31c 100644 --- a/kmplot/kmplot/parser.cpp +++ b/kmplot/kmplot/parser.cpp @@ -190,7 +190,7 @@ double Parser::eval(TQString str) fix_expression(str,0); - if ( str.contains('y')!=0) + if ( str.tqcontains('y')!=0) { err=9; delete []stack; @@ -347,9 +347,9 @@ int Parser::addfkt(TQString str) stkptr=stack=0; err=0; errpos=1; - const int p1=str.find('('); - int p2=str.find(','); - const int p3=str.find(")="); + const int p1=str.tqfind('('); + int p2=str.tqfind(','); + const int p3=str.tqfind(")="); fix_expression(str,p1+4); if(p1==-1 || p3==-1 || p1>p3) @@ -435,9 +435,9 @@ void Parser::reparse(Ufkt *item) err=0; errpos=1; - const int p1=str.find('('); - int p2=str.find(','); - const int p3=str.find(")="); + const int p1=str.tqfind('('); + int p2=str.tqfind(','); + const int p3=str.tqfind(")="); fix_expression(str,p1+4); @@ -520,7 +520,7 @@ void Parser::fix_expression(TQString &str, int const pos) } } TQString str_end = str.mid(pos); - str_end = str_end.replace(m_decimalsymbol, "."); //replace the locale decimal symbol with a '.' + str_end = str_end.tqreplace(m_decimalsymbol, "."); //replace the locale decimal symbol with a '.' str.truncate(pos); str.append(str_end); //kdDebug() << "str:" << str << endl; @@ -959,33 +959,33 @@ int Parser::parserError(bool showMessageBox) switch(err) { case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Syntax error").arg(TQString::number(errpos)), "KmPlot"); + "Syntax error").tqarg(TQString::number(errpos)), "KmPlot"); break; case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Missing parenthesis").arg(TQString::number(errpos)), "KmPlot"); + "Missing tqparenthesis").tqarg(TQString::number(errpos)), "KmPlot"); break; case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Function name unknown").arg(TQString::number(errpos)), "KmPlot"); + "Function name unknown").tqarg(TQString::number(errpos)), "KmPlot"); break; case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Void function variable").arg(TQString::number(errpos)), "KmPlot"); + "Void function variable").tqarg(TQString::number(errpos)), "KmPlot"); break; case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Too many functions").arg(TQString::number(errpos)), "KmPlot"); + "Too many functions").tqarg(TQString::number(errpos)), "KmPlot"); break; case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Token-memory overflow").arg(TQString::number(errpos)), "KmPlot"); + "Token-memory overflow").tqarg(TQString::number(errpos)), "KmPlot"); break; case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Stack overflow").arg(TQString::number(errpos)), "KmPlot"); + "Stack overflow").tqarg(TQString::number(errpos)), "KmPlot"); break; case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Name of function not free.").arg(TQString::number(errpos)), "KmPlot"); + "Name of function not free.").tqarg(TQString::number(errpos)), "KmPlot"); break; case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "recursive function not allowed.").arg(TQString::number(errpos)), "KmPlot"); + "recursive function not allowed.").tqarg(TQString::number(errpos)), "KmPlot"); break; - case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1." ).arg(TQString::number(errpos)), + case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1." ).tqarg(TQString::number(errpos)), "KmPlot"); break; case 11: KMessageBox::error(0, i18n("Empty function"), "KmPlot"); @@ -1006,7 +1006,7 @@ int Parser::parserError(bool showMessageBox) TQString Parser::number( double value ) { TQString str = TQString::number( value, 'g', 6 ); - str.replace( 'e', "*10^" ); + str.tqreplace( 'e', "*10^" ); // kDebug() << "returning str="< #include @@ -148,7 +148,7 @@ class Ufkt starty,///< startposition for Euler's method, the initial y-value startx, ///< startposition for Euler's method, the initial x-value last y'.valuenitial x-value last y'.valuenitial x-value integral_precision; /// parameters; ///< List with parameter for the function diff --git a/kmplot/kmplot/parseriface.h b/kmplot/kmplot/parseriface.h index eb20625f..830d684d 100644 --- a/kmplot/kmplot/parseriface.h +++ b/kmplot/kmplot/parseriface.h @@ -38,7 +38,7 @@ class ParserIface : virtual public DCOPObject { K_DCOP k_dcop: - virtual bool addFunction(const TQString &extstr, bool f_mode, bool f1_mode, bool f2_mode, bool integral_mode, bool integral_use_precision, int linewidth, int f1_linewidth, int f2_linewidth, int integral_linewidth, const TQString &str_dmin, const TQString &str_dmax, const TQString &str_startx, const TQString &str_starty, double integral_precision, QRgb color, QRgb f1_color, QRgb f2_color, QRgb integral_color, TQStringList str_parameter, int use_slider) = 0; + virtual bool addFunction(const TQString &extstr, bool f_mode, bool f1_mode, bool f2_mode, bool integral_mode, bool integral_use_precision, int linewidth, int f1_linewidth, int f2_linewidth, int integral_linewidth, const TQString &str_dmin, const TQString &str_dmax, const TQString &str_startx, const TQString &str_starty, double integral_precision, TQRgb color, TQRgb f1_color, TQRgb f2_color, TQRgb integral_color, TQStringList str_parameter, int use_slider) = 0; virtual int addFunction(const TQString &f_str) = 0; virtual bool delfkt(uint id) = 0; diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui index 92baf7e5..d74d7d93 100644 --- a/kmplot/kmplot/qconstanteditor.ui +++ b/kmplot/kmplot/qconstanteditor.ui @@ -1,10 +1,10 @@ QConstantEditor - + QConstantEditor - + 0 0 @@ -19,7 +19,7 @@ unnamed - + cmdDelete @@ -36,7 +36,7 @@ Click here to delete the selected constant; it can only be removed if it is not currently used by a plot. - + cmdEdit @@ -53,7 +53,7 @@ Click here to edit the value of the selected constant. Its name cannot be changed. - + cmdDuplicate @@ -70,7 +70,7 @@ Click here to Copy the selected constant to another constant. You can choose the new name from a list. - + cmdNew @@ -133,7 +133,7 @@ Expanding - + 20 147 @@ -163,9 +163,9 @@ varlist - clicked(QListViewItem*) + clicked(TQListViewItem*) QConstantEditor - varlist_clicked(QListViewItem*) + varlist_clicked(TQListViewItem*) cmdDuplicate @@ -175,25 +175,25 @@ varlist - doubleClicked(QListViewItem*) + doubleClicked(TQListViewItem*) QConstantEditor - varlist_doubleClicked(QListViewItem*) + varlist_doubleClicked(TQListViewItem*) qconstanteditor.ui.h - + cmdCancel_clicked() cmdNew_clicked() cmdEdit_clicked() cmdDelete_clicked() - varlist_clicked( QListViewItem * item ) + varlist_clicked( TQListViewItem * item ) cmdDuplicate_clicked() newNewConstantSlot() - varlist_doubleClicked( QListViewItem * ) - - + varlist_doubleClicked( TQListViewItem * ) + + klistview.h diff --git a/kmplot/kmplot/qconstanteditor.ui.h b/kmplot/kmplot/qconstanteditor.ui.h index 00fd2554..068f3dec 100644 --- a/kmplot/kmplot/qconstanteditor.ui.h +++ b/kmplot/kmplot/qconstanteditor.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui index 1d9bdb0a..fdf19388 100644 --- a/kmplot/kmplot/qeditconstant.ui +++ b/kmplot/kmplot/qeditconstant.ui @@ -1,10 +1,10 @@ QEditConstant - + QEditConstant - + 0 0 @@ -22,7 +22,7 @@ unnamed - + textLabel1 @@ -30,7 +30,7 @@ Variable: - + textLabel2 @@ -38,15 +38,15 @@ Value: - + - layout1 + tqlayout1 unnamed - + cmdOK @@ -67,14 +67,14 @@ Expanding - + 71 20 - + cmdCancel @@ -128,10 +128,10 @@ qeditconstant.ui.h - + txtVariable_lostFocus() - - + + klineedit.h klineedit.h diff --git a/kmplot/kmplot/qeditconstant.ui.h b/kmplot/kmplot/qeditconstant.ui.h index a4b8efba..25ba07fb 100644 --- a/kmplot/kmplot/qeditconstant.ui.h +++ b/kmplot/kmplot/qeditconstant.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui index b41573ab..6acc24d8 100644 --- a/kmplot/kmplot/qeditparametric.ui +++ b/kmplot/kmplot/qeditparametric.ui @@ -1,10 +1,10 @@ QEditParametric - + QEditParametric - + 0 0 @@ -30,7 +30,7 @@ unnamed - + groupBox1 @@ -41,14 +41,14 @@ unnamed - + textLabel4 Name: - + AlignVCenter|AlignRight @@ -91,9 +91,9 @@ Example: cos(t) The name of a function must be unique. If you leave this line empty KmPlot will set a default name. You can change it later. - + - layout9 + tqlayout9 @@ -102,7 +102,7 @@ The name of a function must be unique. If you leave this line empty KmPlot will 0 - + textLabelY @@ -110,7 +110,7 @@ The name of a function must be unique. If you leave this line empty KmPlot will y - + textLabelYF @@ -123,7 +123,7 @@ The name of a function must be unique. If you leave this line empty KmPlot will f - + textLabelArgY @@ -154,9 +154,9 @@ The dummy variable is t. Example: sin(t) - + - layout8 + tqlayout8 @@ -168,7 +168,7 @@ Example: sin(t) 0 - + textLabelX @@ -176,7 +176,7 @@ Example: sin(t) x - + textLabelXF @@ -189,7 +189,7 @@ Example: sin(t) f - + textLabelArgX @@ -201,7 +201,7 @@ Example: sin(t) - + buttonGroup1 @@ -212,7 +212,7 @@ Example: sin(t) unnamed - + checkBoxHide @@ -228,7 +228,7 @@ Example: sin(t) - + frame6 @@ -242,7 +242,7 @@ Example: sin(t) unnamed - + textLabel2 @@ -267,7 +267,7 @@ Example: sin(t) Click this button to choose a color for the plot line. - + textLabel1_3 @@ -292,7 +292,7 @@ Example: sin(t) Change the width of the plot line in steps of 0.1mm. - + TextLabel2 @@ -302,7 +302,7 @@ Example: sin(t) - + Layout1 @@ -316,7 +316,7 @@ Example: sin(t) 6 - + buttonHelp @@ -340,14 +340,14 @@ Example: sin(t) Expanding - + 20 20 - + buttonOk @@ -367,7 +367,7 @@ Example: sin(t) Click this button to apply the changes to the list of functions. - + buttonCancel @@ -386,7 +386,7 @@ Example: sin(t) - + frame5 @@ -400,7 +400,7 @@ Example: sin(t) unnamed - + textLabel1 @@ -411,7 +411,7 @@ Example: sin(t) min - + textLabel1_2 @@ -422,7 +422,7 @@ Example: sin(t) max - + customMaxRange @@ -436,7 +436,7 @@ Example: sin(t) Check this button and enter the plot maximum range boundary below. - + customMinRange @@ -528,10 +528,10 @@ Example: sin(t) buttonCancel buttonHelp - + slotHelp() - - + + klineedit.h klineedit.h diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui index e61c5c6d..aae68d87 100644 --- a/kmplot/kmplot/qeditpolar.ui +++ b/kmplot/kmplot/qeditpolar.ui @@ -1,10 +1,10 @@ QEditPolar - + QEditPolar - + 0 0 @@ -30,7 +30,7 @@ unnamed - + groupBox1 @@ -61,7 +61,7 @@ Example: loop(angle)=ln(angle) - + textLabelR @@ -69,7 +69,7 @@ Example: loop(angle)=ln(angle) r - + textLabel2_2 @@ -79,7 +79,7 @@ Example: loop(angle)=ln(angle) - + buttonGroup1 @@ -90,7 +90,7 @@ Example: loop(angle)=ln(angle) unnamed - + checkBoxHide @@ -106,7 +106,7 @@ Example: loop(angle)=ln(angle) - + frame6 @@ -120,7 +120,7 @@ Example: loop(angle)=ln(angle) unnamed - + textLabel2 @@ -145,7 +145,7 @@ Example: loop(angle)=ln(angle) Click this button to choose a color for the plot line. - + textLabel1_3 @@ -170,7 +170,7 @@ Example: loop(angle)=ln(angle) Change the width of the plot line in steps of 0.1mm. - + TextLabel2 @@ -180,7 +180,7 @@ Example: loop(angle)=ln(angle) - + Layout1 @@ -194,7 +194,7 @@ Example: loop(angle)=ln(angle) 6 - + buttonHelp @@ -218,14 +218,14 @@ Example: loop(angle)=ln(angle) Expanding - + 20 20 - + buttonOk @@ -245,7 +245,7 @@ Example: loop(angle)=ln(angle) Click this button to apply the changes to the list of functions. - + buttonCancel @@ -264,7 +264,7 @@ Example: loop(angle)=ln(angle) - + frame5 @@ -278,7 +278,7 @@ Example: loop(angle)=ln(angle) unnamed - + textLabel1_2 @@ -289,7 +289,7 @@ Example: loop(angle)=ln(angle) max - + textLabel1 @@ -328,7 +328,7 @@ Example: loop(angle)=ln(angle) Enter the upper boundary of the plot range. Expressions like 2*pi are allowed, too. - + customMinRange @@ -342,7 +342,7 @@ Example: loop(angle)=ln(angle) Check this button and enter the plot minimum range boundary below. - + customMaxRange @@ -392,10 +392,10 @@ Example: loop(angle)=ln(angle) buttonCancel buttonHelp - + slotHelp() - - + + klineedit.h kcolorbutton.h diff --git a/kmplot/kmplot/qminmax.ui b/kmplot/kmplot/qminmax.ui index d828cbd6..dc4f33b9 100644 --- a/kmplot/kmplot/qminmax.ui +++ b/kmplot/kmplot/qminmax.ui @@ -1,10 +1,10 @@ QMinMax - + QMinMax - + 0 0 @@ -30,7 +30,7 @@ true - + frame5 @@ -44,25 +44,25 @@ unnamed - + lblMin Search between the x-value: - + AlignCenter - + lblMax and: - + AlignCenter @@ -84,7 +84,7 @@ - + groupBox2 @@ -122,7 +122,7 @@ Close the dialog and return to the main window. - + cmdParameter @@ -138,5 +138,5 @@ - + diff --git a/kmplot/kmplot/qparametereditor.ui b/kmplot/kmplot/qparametereditor.ui index 619f4fd7..8c862d11 100644 --- a/kmplot/kmplot/qparametereditor.ui +++ b/kmplot/kmplot/qparametereditor.ui @@ -1,10 +1,10 @@ QParameterEditor - + QParameterEditor - + 0 0 @@ -22,7 +22,7 @@ unnamed - + frame3 @@ -119,7 +119,7 @@ Expanding - + 20 80 @@ -153,7 +153,7 @@ Expanding - + 20 21 @@ -181,5 +181,5 @@ - + diff --git a/kmplot/kmplot/settingspagecolor.ui b/kmplot/kmplot/settingspagecolor.ui index e8e85323..2e788f49 100644 --- a/kmplot/kmplot/settingspagecolor.ui +++ b/kmplot/kmplot/settingspagecolor.ui @@ -1,10 +1,10 @@ SettingsPageColor - + SettingsPageColor - + 0 0 @@ -16,11 +16,11 @@ unnamed - + tabs - + tab @@ -31,15 +31,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -78,7 +78,7 @@ Specify the color of the grid. The change will appear as soon as you press the OK button. - + textLabel2 @@ -101,7 +101,7 @@ Expanding - + 20 40 @@ -110,7 +110,7 @@ - + tab @@ -121,17 +121,17 @@ unnamed - + - layout19 + tqlayout19 unnamed - + - layout16 + tqlayout16 @@ -179,7 +179,7 @@ The default color for function number 1. Please note that this color setting only affects empty functions, so if you have defined a function at number 1 and you change the color for that number here, the setting will be shown next time you define a new function at number 1. - + textLabel3 @@ -204,7 +204,7 @@ The default color for function number 3. Please note that this color setting only affects empty functions, so if you have defined a function at number 1 and you change the color for that number here, the setting will be shown next time you define a new function at number 1. - + textLabel3_13 @@ -215,7 +215,7 @@ kcfg_Color3 - + textLabel3_2 @@ -226,7 +226,7 @@ kcfg_Color2 - + textLabel3_12 @@ -251,7 +251,7 @@ The default color for function number 4. Please note that this color setting only affects empty functions, so if you have defined a function at number 1 and you change the color for that number here, the setting will be shown next time you define a new function at number 1. - + textLabel3_11 @@ -274,22 +274,22 @@ Expanding - + 20 20 - + - layout17 + tqlayout17 unnamed - + textLabel3_9 @@ -300,7 +300,7 @@ kcfg_Color7 - + textLabel3_8 @@ -325,7 +325,7 @@ The default color for function number 9. Please note that this color setting only affects empty functions, so if you have defined a function at number 1 and you change the color for that number here, the setting will be shown next time you define a new function at number 1. - + textLabel3_10 @@ -378,7 +378,7 @@ The default color for function number 6. Please note that this color setting only affects empty functions, so if you have defined a function at number 1 and you change the color for that number here, the setting will be shown next time you define a new function at number 1. - + textLabel3_7 @@ -403,7 +403,7 @@ The default color for function number 10. Please note that this color setting only affects empty functions, so if you have defined a function at number 1 and you change the color for that number here, the setting will be shown next time you define a new function at number 1. - + textLabel3_6 @@ -428,7 +428,7 @@ Expanding - + 20 40 @@ -455,5 +455,5 @@ kcfg_Color8 kcfg_Color9 - + diff --git a/kmplot/kmplot/settingspagecoords.ui b/kmplot/kmplot/settingspagecoords.ui index cf2826b3..a4acaddc 100644 --- a/kmplot/kmplot/settingspagecoords.ui +++ b/kmplot/kmplot/settingspagecoords.ui @@ -1,10 +1,10 @@ SettingsPageCoords - + SettingsPageCoords - + 0 0 @@ -16,11 +16,11 @@ unnamed - + tabs - + tab @@ -31,15 +31,15 @@ unnamed - + - layout23 + tqlayout23 unnamed - + kcfg_XRange @@ -50,7 +50,7 @@ unnamed - + radioButton1 @@ -67,7 +67,7 @@ Select one of the predefined plot ranges. - + radioButton1_3 @@ -84,7 +84,7 @@ Select one of the predefined plot ranges. - + radioButton1_2 @@ -101,7 +101,7 @@ Select one of the predefined plot ranges. - + radioButton1_5 @@ -118,7 +118,7 @@ Select one of the predefined plot ranges. - + radioButton1_4 @@ -129,15 +129,15 @@ 4 - + - layout20 + tqlayout20 unnamed - + textLabel4_2 @@ -145,7 +145,7 @@ Max: - + textLabel4 @@ -185,7 +185,7 @@ - + kcfg_YRange @@ -196,7 +196,7 @@ unnamed - + radioButton1_6 @@ -213,7 +213,7 @@ Select one of the predefined plot ranges. - + radioButton1_3_2 @@ -230,7 +230,7 @@ Select one of the predefined plot ranges. - + radioButton1_2_2 @@ -247,7 +247,7 @@ Select one of the predefined plot ranges. - + radioButton1_5_2 @@ -264,7 +264,7 @@ Select one of the predefined plot ranges. - + radioButton1_4_2 @@ -275,15 +275,15 @@ 4 - + - layout20_2 + tqlayout20_2 unnamed - + textLabel4_2_2 @@ -291,7 +291,7 @@ Max: - + textLabel4_3 @@ -333,15 +333,15 @@ - + - layout24 + tqlayout24 unnamed - + textLabel7 @@ -363,7 +363,7 @@ Line width - + textLabel8 @@ -373,15 +373,15 @@ - + - layout25 + tqlayout25 unnamed - + textLabel9 @@ -403,7 +403,7 @@ Line width - + textLabel8_2 @@ -413,15 +413,15 @@ - + - layout26 + tqlayout26 unnamed - + textLabel8_4 @@ -446,7 +446,7 @@ Enter the length of a tic line. - + textLabel8_3 @@ -456,15 +456,15 @@ - + - layout22 + tqlayout22 unnamed - + kcfg_ShowArrows @@ -481,7 +481,7 @@ Check this if the axes should have arrows at their ends. - + kcfg_ShowLabel @@ -498,7 +498,7 @@ Check this if the axes' tics should be labeled. - + kcfg_ShowExtraFrame @@ -515,7 +515,7 @@ Check this if the plot area should be framed by an extra line. - + kcfg_ShowAxes @@ -544,7 +544,7 @@ Expanding - + 20 30 @@ -553,7 +553,7 @@ - + tab @@ -564,7 +564,7 @@ unnamed - + kcfg_GridStyle @@ -578,7 +578,7 @@ unnamed - + radioButton11 @@ -589,7 +589,7 @@ No Grid will be plotted. - + radioButton12 @@ -600,7 +600,7 @@ A line for every tic. - + radioButton13 @@ -611,7 +611,7 @@ Only little crosses in the plot area. - + radioButton14 @@ -624,15 +624,15 @@ - + - layout24 + tqlayout24 unnamed - + textLabel5 @@ -657,7 +657,7 @@ Enter the width of the grid lines. - + textLabel6 @@ -677,7 +677,7 @@ Expanding - + 20 40 @@ -751,7 +751,7 @@ radioButton14 kcfg_GridLineWidth - + klineedit.h klineedit.h diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui index e5f80ccd..6379babc 100644 --- a/kmplot/kmplot/settingspagefonts.ui +++ b/kmplot/kmplot/settingspagefonts.ui @@ -1,10 +1,10 @@ SettingsPageFonts - + SettingsPageFonts - + 0 0 @@ -26,14 +26,14 @@ Expanding - + 20 110 - + textLabel11 @@ -44,7 +44,7 @@ kcfg_HeaderTableFont - + textLabel10 @@ -63,7 +63,7 @@ kcfg_AxesFont - + textLabel10_2 @@ -119,7 +119,7 @@ - + kfontcombo.h knuminput.h diff --git a/kmplot/kmplot/settingspageprecision.ui b/kmplot/kmplot/settingspageprecision.ui index 25f732ce..6f453aae 100644 --- a/kmplot/kmplot/settingspageprecision.ui +++ b/kmplot/kmplot/settingspageprecision.ui @@ -1,10 +1,10 @@ SettingsPagePrecision - + SettingsPagePrecision - + 0 0 @@ -26,14 +26,14 @@ Expanding - + 20 29 - + groupBox3 @@ -44,7 +44,7 @@ unnamed - + textLabel1_2 @@ -55,7 +55,7 @@ kcfg_zoomStep - + textLabel1_2_2 @@ -114,7 +114,7 @@ - + groupBox2 @@ -149,7 +149,7 @@ Expanding - + 81 20 @@ -158,7 +158,7 @@ - + kcfg_anglemode @@ -169,7 +169,7 @@ unnamed - + radioButton1 @@ -183,7 +183,7 @@ Check this button to use radian mode to measure angles. This is important for trigonometric functions only. - + radioButton2 @@ -199,7 +199,7 @@ - + groupBox1 @@ -210,15 +210,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -248,7 +248,7 @@ - + kcfg_useRelativeStepWidth @@ -268,7 +268,7 @@ - + knuminput.h knuminput.h diff --git a/kmplot/kmplot/settingspagescaling.ui b/kmplot/kmplot/settingspagescaling.ui index 222359ba..a9f02243 100644 --- a/kmplot/kmplot/settingspagescaling.ui +++ b/kmplot/kmplot/settingspagescaling.ui @@ -1,10 +1,10 @@ SettingsPageScaling - + SettingsPageScaling - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout35 + tqlayout35 unnamed - + groupBox1 @@ -35,7 +35,7 @@ unnamed - + textLabel13 @@ -57,7 +57,7 @@ Horizontal - + textLabel13_2 @@ -65,7 +65,7 @@ Printing: - + textLabel12 @@ -76,7 +76,7 @@ kcfg_XScaling - + textLabel12_2 @@ -138,7 +138,7 @@ This is similar to the setting above, but this sets the distance between two x-axis-grids when printing or drawing on the screen. - + textLabel14 @@ -204,7 +204,7 @@ - + groupBox1_2 @@ -215,7 +215,7 @@ unnamed - + textLabel13_3 @@ -237,7 +237,7 @@ Horizontal - + textLabel13_2_2 @@ -245,7 +245,7 @@ Printing: - + textLabel12_3 @@ -256,7 +256,7 @@ kcfg_YScaling - + textLabel12_2_2 @@ -318,7 +318,7 @@ This is similar to the setting above, but this sets the distance between two y-axis-grids when printing or drawing on the screen. - + textLabel14_2 @@ -396,7 +396,7 @@ Expanding - + 21 91 @@ -411,5 +411,5 @@ kcfg_YScaling kcfg_YPrinting - + diff --git a/kmplot/kmplot/sliderwindow.ui b/kmplot/kmplot/sliderwindow.ui index deff716a..905c1d1c 100644 --- a/kmplot/kmplot/sliderwindow.ui +++ b/kmplot/kmplot/sliderwindow.ui @@ -1,10 +1,10 @@ SliderWindow - + SliderWindow - + 0 0 @@ -19,11 +19,11 @@ unnamed - + slider - + 200 0 @@ -48,7 +48,7 @@ 10 - + value @@ -60,7 +60,7 @@ 0 - + 45 0 @@ -69,7 +69,7 @@ 0 - + AlignVCenter|AlignRight @@ -83,5 +83,5 @@ setNum(int) - + diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp index 18d9a3b3..6e1204fa 100644 --- a/kmplot/kmplot/xparser.cpp +++ b/kmplot/kmplot/xparser.cpp @@ -50,13 +50,13 @@ bool XParser::getext( Ufkt *item, const TQString fstr ) int p1, p2, p3, pe; TQString tstr; pe = fstr.length(); - if ( fstr.find( 'N' ) != -1 ) + if ( fstr.tqfind( 'N' ) != -1 ) item->f_mode = false; else { - if ( fstr.find( "A1" ) != -1 ) + if ( fstr.tqfind( "A1" ) != -1 ) item->f1_mode = true; - if ( fstr.find( "A2" ) != -1 ) + if ( fstr.tqfind( "A2" ) != -1 ) item->f2_mode = true; } switch ( fstr[0].latin1() ) @@ -67,13 +67,13 @@ bool XParser::getext( Ufkt *item, const TQString fstr ) item->f1_mode = item->f2_mode = false; } - p1 = fstr.find( "D[" ); + p1 = fstr.tqfind( "D[" ); if ( p1 != -1 ) { p1 += 2; const TQString str = fstr.mid( p1, pe - p1); - p2 = str.find(','); - p3 = str.find(']'); + p2 = str.tqfind(','); + p3 = str.tqfind(']'); if ( p2 > 0 && p2 < p3 ) { tstr = str.left( p2 ); @@ -90,16 +90,16 @@ bool XParser::getext( Ufkt *item, const TQString fstr ) else errflg = true; } - p1 = fstr.find( "P[" ); + p1 = fstr.tqfind( "P[" ); if ( p1 != -1 ) { int i = 0; p1 += 2; TQString str = fstr.mid( p1, 1000); - p3 = str.find( ']' ); + p3 = str.tqfind( ']' ); do { - p2 = str.find( ',' ); + p2 = str.tqfind( ',' ); if ( p2 == -1 || p2 > p3 ) p2 = p3; tstr = str.left( p2++ ); @@ -148,7 +148,7 @@ void XParser::findFunctionName(TQString &function_name, int const id, int const for (bool ok=true; last_character<'x'; ++last_character) { if ( pos==0 && last_character == 'r') continue; - function_name.at(pos)=last_character; + function_name.tqat(pos)=last_character; for( TQValueVector::iterator it = ufkt.begin(); it != ufkt.end(); ++it) { if (it == ufkt.begin() && it->fname.isEmpty() ) continue; @@ -162,7 +162,7 @@ void XParser::findFunctionName(TQString &function_name, int const id, int const } ok = true; } - function_name.at(pos)='f'; + function_name.tqat(pos)='f'; function_name.append('f'); } function_name = "e"; //this should never happen @@ -179,8 +179,8 @@ void XParser::fixFunctionName( TQString &str, int const type, int const id) str.prepend( function_name ); } - int p1=str.find('('); - int p2=str.find(')'); + int p1=str.tqfind('('); + int p2=str.tqfind(')'); if( p1>=0 && str.at(p2+1)=='=') { if ( type == XParser::Polar && str.at(0)!='r' ) @@ -242,7 +242,7 @@ double XParser::euler_method(const double x, const TQValueVector::iterator return y; } -QRgb XParser::defaultColor(int function) +TQRgb XParser::defaultColor(int function) { switch ( function%10 ) { @@ -641,14 +641,14 @@ bool XParser::functionRemoveParameter(const TQString &remove_parameter, uint id) int XParser::addFunction(const TQString &f_str) { TQString added_function(f_str); - int const pos = added_function.find(';'); + int const pos = added_function.tqfind(';'); if (pos!=-1) added_function = added_function.left(pos); fixFunctionName(added_function); if ( added_function.at(0)== 'x' || added_function.at(0)== 'y') //TODO: Make it possible to define parametric functions return -1; - if ( added_function.contains('y') != 0) + if ( added_function.tqcontains('y') != 0) return -1; int const id = addfkt( added_function ); if (id==-1) @@ -664,10 +664,10 @@ int XParser::addFunction(const TQString &f_str) return id; } -bool XParser::addFunction(const TQString &fstr_const, bool f_mode, bool f1_mode, bool f2_mode, bool integral_mode, bool integral_use_precision, int linewidth, int f1_linewidth, int f2_linewidth, int integral_linewidth, const TQString &str_dmin, const TQString &str_dmax, const TQString &str_startx, const TQString &str_starty, double integral_precision, QRgb color, QRgb f1_color, QRgb f2_color, QRgb integral_color, TQStringList str_parameter, int use_slider) +bool XParser::addFunction(const TQString &fstr_const, bool f_mode, bool f1_mode, bool f2_mode, bool integral_mode, bool integral_use_precision, int linewidth, int f1_linewidth, int f2_linewidth, int integral_linewidth, const TQString &str_dmin, const TQString &str_dmax, const TQString &str_startx, const TQString &str_starty, double integral_precision, TQRgb color, TQRgb f1_color, TQRgb f2_color, TQRgb integral_color, TQStringList str_parameter, int use_slider) { TQString fstr(fstr_const); - switch ( fstr.at(0).latin1() ) + switch ( fstr.tqat(0).latin1() ) { case 'r': { @@ -745,7 +745,7 @@ bool XParser::setFunctionExpression(const TQString &f_str, uint id) return false; Ufkt *tmp_ufkt = &ufkt[ix]; TQString const old_fstr = tmp_ufkt->fstr; - TQString const fstr_begin = tmp_ufkt->fstr.left(tmp_ufkt->fstr.find('=')+1); + TQString const fstr_begin = tmp_ufkt->fstr.left(tmp_ufkt->fstr.tqfind('=')+1); tmp_ufkt->fstr = fstr_begin+f_str; reparse(tmp_ufkt); if ( parserError(false) != 0) @@ -801,7 +801,7 @@ bool XParser::sendFunction(int id, const TQString &dcopclient_target) arg << item->fstr << item->f_mode << item->f1_mode << item->f2_mode << item->integral_mode << item->integral_use_precision << item->linewidth << item->f1_linewidth << item->f2_linewidth << item->integral_linewidth << str_dmin << str_dmax << item->str_startx << item->str_starty << item->integral_precision << item->color << item->f1_color << item->f2_color << item->integral_color << str_parameters << item->use_slider; TQByteArray replay_data; TQCString replay_type; - bool ok = kapp->dcopClient()->call( str_result.utf8(), "Parser", "addFunction(TQString,bool,bool,bool,bool,bool,int,int,int,int,TQString,TQString,TQString,TQString,double,QRgb,QRgb,QRgb,QRgb,TQStringList,int)", parameters, replay_type, replay_data, false); + bool ok = kapp->dcopClient()->call( str_result.utf8(), "Parser", "addFunction(TQString,bool,bool,bool,bool,bool,int,int,int,int,TQString,TQString,TQString,TQString,double,TQRgb,TQRgb,TQRgb,TQRgb,TQStringList,int)", parameters, replay_type, replay_data, false); if (!ok) { KMessageBox::error(0, i18n("An error appeared during the transfer")); diff --git a/kmplot/kmplot/xparser.h b/kmplot/kmplot/xparser.h index d54b3506..5f4f05d5 100644 --- a/kmplot/kmplot/xparser.h +++ b/kmplot/kmplot/xparser.h @@ -28,7 +28,7 @@ #define SLIDER_COUNT 4 -// Qt includes +// TQt includes #include // local includes @@ -55,7 +55,7 @@ public: /// Line width default int linewidth0; - QRgb defaultColor(int function); + TQRgb defaultColor(int function); enum { Function, Polar, ParametricX, ParametricY }; ///types of functions ///Returns an unused function name if it is needed @@ -119,7 +119,7 @@ public: bool functionAddParameter(const TQString &new_parameter, uint id); bool functionRemoveParameter(const TQString &remove_parameter, uint id); int addFunction(const TQString &f_str); - bool addFunction(const TQString &extstr, bool f_mode, bool f1_mode, bool f2_mode, bool integral_mode, bool integral_use_precision, int linewidth, int f1_linewidth, int f2_linewidth, int integral_linewidth, const TQString &str_dmin, const TQString &str_dmax, const TQString &str_startx, const TQString &str_starty, double integral_precision, QRgb color, QRgb f1_color, QRgb f2_color, QRgb integral_color, TQStringList str_parameter, int use_slider); + bool addFunction(const TQString &extstr, bool f_mode, bool f1_mode, bool f2_mode, bool integral_mode, bool integral_use_precision, int linewidth, int f1_linewidth, int f2_linewidth, int integral_linewidth, const TQString &str_dmin, const TQString &str_dmax, const TQString &str_startx, const TQString &str_starty, double integral_precision, TQRgb color, TQRgb f1_color, TQRgb f2_color, TQRgb integral_color, TQStringList str_parameter, int use_slider); bool setFunctionExpression(const TQString &f_str, uint id); /// Get the min and max value of a graph diff --git a/kpercentage/kpercentage/kanimation.cpp b/kpercentage/kpercentage/kanimation.cpp index 93974af3..6fd581a2 100644 --- a/kpercentage/kpercentage/kanimation.cpp +++ b/kpercentage/kpercentage/kanimation.cpp @@ -1,7 +1,7 @@ // C/C++ includes #include -// Qt includes +// TQt includes #include // KDE includes @@ -97,9 +97,9 @@ KStoryBoard::KStoryBoard( const TQString filename ) : TQDict() { TQString s = t.readLine(); // line of text excluding '\n' TQString dbgString = s; - int pos = s.find ( "#"); + int pos = s.tqfind ( "#"); if (pos==-1) - pos = s.find ( ";"); + pos = s.tqfind ( ";"); if ( pos > -1 ) { dbgString = s.mid( pos +1 ); @@ -163,7 +163,7 @@ KStoryBoard::KStoryBoard( const TQString filename ) : TQDict() { TQString scene_name; current_scene->followingSceneName( scene_name ); - current_scene = find( scene_name ); + current_scene = tqfind( scene_name ); if ( current_scene ) { current_scene->setToStart(); @@ -181,7 +181,7 @@ KStoryBoard::KStoryBoard( const TQString filename ) : TQDict() void KStoryBoard::setToStart() { - current_scene = find( "init" ); + current_scene = tqfind( "init" ); if ( current_scene ) current_scene->setToStart(); } diff --git a/kpercentage/kpercentage/kanimation.h b/kpercentage/kpercentage/kanimation.h index e4231f2a..6b16883b 100644 --- a/kpercentage/kpercentage/kanimation.h +++ b/kpercentage/kpercentage/kanimation.h @@ -88,7 +88,7 @@ class KStoryBoard: public TQDict KScene *current_scene; }; -class KAnimation: public QCanvasSprite +class KAnimation: public TQCanvasSprite { public: KAnimation( const TQString stroy_filename, TQCanvasPixmapArray *a, TQCanvas *canvas ); diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp index d723629b..7e12bafc 100644 --- a/kpercentage/kpercentage/kanswer.cpp +++ b/kpercentage/kpercentage/kanswer.cpp @@ -23,7 +23,7 @@ #include #include -// Qt includes +// TQt includes #include #include #include @@ -40,9 +40,9 @@ #include "kanimation.h" #include "kanswer.h" -KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) +KAnswer::KAnswer( TQWidget *tqparent ): KDialog( tqparent, "answer", TRUE ) { - setFont( parent->font() ); + setFont( tqparent->font() ); // fix size for the background pixmap setFixedSize( TQSize( 430, 190 ) ); @@ -63,12 +63,12 @@ KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) TextLabelAnswer->setBackgroundOrigin( TQLabel::ParentOrigin ); TextLabelAnswer->setBackgroundPixmap( bgp ); - canvas->setBackgroundPixmap( bgp ); + canvas->tqsetBackgroundPixmap( bgp ); canvas_view->setBackgroundOrigin( TQCanvasView::ParentOrigin ); canvas_view->setBackgroundPixmap( bgp ); /////// - // begin layouting + // begin tqlayouting /////// mainLayout = new TQHBoxLayout( this ); mainLayout->setDirection(TQBoxLayout::LeftToRight); @@ -103,7 +103,7 @@ KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) rightLayout->addSpacing( 20 ); /////// - // end layouting + // end tqlayouting /////// connect( ButtonOK, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); @@ -217,7 +217,7 @@ void KAnswer::setupSprite() advPer = 80; - canvas = new TQCanvas( this ); + canvas = new TQCanvas( TQT_TQOBJECT(this) ); canvas->resize( size().width(), size().height() ); pixs = new TQCanvasPixmapArray( locate( "data", "kpercentage/pics/" )+"smily%1.png", 7 ); @@ -241,7 +241,7 @@ void KAnswer::timerEvent( TQTimerEvent *event ) int KAnswer::exec() { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); startTimer( 3000 ); // 5 seconds return KDialog::exec(); } diff --git a/kpercentage/kpercentage/kanswer.h b/kpercentage/kpercentage/kanswer.h index 9548e990..81392869 100644 --- a/kpercentage/kpercentage/kanswer.h +++ b/kpercentage/kpercentage/kanswer.h @@ -22,7 +22,7 @@ #ifndef KANSWER_H #define KANSWER_H -// Qt includes +// TQt includes // KDE includes #include @@ -47,14 +47,15 @@ class KPushButton; class KAnswer : public KDialog { Q_OBJECT + TQ_OBJECT public: /** - * The constructor doesn't need any parameters but the parent, + * The constructor doesn't need any parameters but the tqparent, * because it will not be used in any other context. * - * @param parent Parent widget for modal functionality + * @param tqparent Parent widget for modal functionality */ - KAnswer( TQWidget *parent ); + KAnswer( TQWidget *tqparent ); // public functions /** setting/changing feedback text and pic */ diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp index f51f8364..db4a8875 100644 --- a/kpercentage/kpercentage/kpercentage.cpp +++ b/kpercentage/kpercentage/kpercentage.cpp @@ -22,7 +22,7 @@ // C/C++ includes #include -// Qt includes +// TQt includes #include #include #include @@ -60,7 +60,7 @@ KPercentage::KPercentage( const char *name ) : // prepare exercise window, that will use the fontsize above! percent_main = new KPercentMain( this, "KPercentage" ); - // fixed geometry bacause of background pixmap + // fixed tqgeometry bacause of background pixmap setFixedSize( TQSize( 548, 248 ) ); /** load and set background pixmap */ @@ -108,7 +108,7 @@ KPercentage::KPercentage( const char *name ) : connect( button_close, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); //////// - // begin layouting + // begin tqlayouting //////// TQVBoxLayout *main_layout = new TQVBoxLayout( this, 20, 20, "main_layout" ); main_layout->setResizeMode( TQLayout::FreeResize ); @@ -145,7 +145,7 @@ KPercentage::KPercentage( const char *name ) : main_layout->addStretch(); //////// - // end layouting + // end tqlayouting //////// //////// diff --git a/kpercentage/kpercentage/kpercentage.docbook b/kpercentage/kpercentage/kpercentage.docbook index c356b9f8..318698a3 100644 --- a/kpercentage/kpercentage/kpercentage.docbook +++ b/kpercentage/kpercentage/kpercentage.docbook @@ -243,7 +243,7 @@ Programming &kpercentage; plugins is a joy to behold. Just read through the next should consult the docbook reference for further details. The example below was taken from that reference and shortened a bit for readability. --> - + XtUnmanageChildren Xt - Geometry Management @@ -251,26 +251,26 @@ taken from that reference and shortened a bit for readability. --> XtUnmanageChildren -remove a list of children from a parent widget's managed list. +remove a list of tqchildren from a tqparent widget's managed list. -widgetsremoving -XtUnmanageChildren +widgetsremoving +XtUnmanageChildren 4 March 1996 -void XtUnmanageChildren(children, num_children) - WidgetList children; - Cardinal num_children; +void XtUnmanageChildren(tqchildren, num_tqchildren) + WidgetList tqchildren; + Cardinal num_tqchildren; - + Inputs -children +tqchildren Specifies an array of child widgets. Each child must be of @@ -279,40 +279,40 @@ class RectObj or any subclass thereof. -num_children +num_tqchildren -Specifies the number of elements in children. +Specifies the number of elements in tqchildren. - + Description XtUnmanageChildren() unmaps the specified widgets -and removes them from their parent's geometry management. +and removes them from their tqparent's tqgeometry management. The widgets will disappear from the screen, and (depending -on its parent) may no longer have screen space allocated for +on its tqparent) may no longer have screen space allocated for them. -Each of the widgets in the children array must have -the same parent. +Each of the widgets in the tqchildren array must have +the same tqparent. See the “Algorithm” section below for full details of the widget unmanagement procedure. - + Usage Unmanaging widgets is the usual method for temporarily making them invisible. They can be re-managed with XtManageChildren(). -You can unmap a widget, but leave it under geometry +You can unmap a widget, but leave it under tqgeometry management by calling XtUnmapWidget(). You can destroy a widget's window without destroying the widget by calling XtUnrealizeWidget(). You can destroy a @@ -324,12 +324,12 @@ often more convenient to call XtUnmanageChild() several times than it is to declare and initialize an array of widgets to pass to XtUnmanageChildren(). Calling XtUnmanageChildren() is more efficient, however, -because it only calls the parent's change_managed() +because it only calls the tqparent's change_managed() method once. - + Algorithm XtUnmanageChildren() performs the following: @@ -358,11 +358,11 @@ by unmapping it. - + Structures The WidgetList type is simply an array of widgets: -typedef Widget *WidgetList; +typedef Widget *WidgetList; diff --git a/kpercentage/kpercentage/kpercentage.h b/kpercentage/kpercentage/kpercentage.h index c4b9b42c..cf904ee6 100644 --- a/kpercentage/kpercentage/kpercentage.h +++ b/kpercentage/kpercentage/kpercentage.h @@ -26,7 +26,7 @@ #include #endif -// Qt includes +// TQt includes #include // KDE includes @@ -49,6 +49,7 @@ class KPercentage : public KDialog { Q_OBJECT + TQ_OBJECT public: /** construtor */ KPercentage( const char *name=0 ); diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp index 67f4a687..e1966ba3 100644 --- a/kpercentage/kpercentage/kpercentmain.cpp +++ b/kpercentage/kpercentage/kpercentmain.cpp @@ -23,7 +23,7 @@ #include #include -// Qt includes +// TQt includes #include #include #include @@ -42,10 +42,10 @@ #include "kpercentage.h" -KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : - KDialog( parent, name, TRUE ) // TRUE for modal dialog +KPercentMain::KPercentMain( TQWidget *tqparent, const char *name ) : + KDialog( tqparent, name, TRUE ) // TRUE for modal dialog { - setFont( parent->font() ); + setFont( tqparent->font() ); /** load and set the background pixmap */ TQPixmap bgp( locate( "data", TQApplication::reverseLayout() ? "kpercentage/pics/kpercentmain_bg_rtl.png" : "kpercentage/pics/kpercentmain_bg.png" ) ); // resize( 520, 220 ); @@ -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->setAlignment( int( TQLineEdit::AlignHCenter ) ); + line_edit_percentage->tqsetAlignment( int( TQLineEdit::AlignHCenter ) ); line_edit_percentage->setValidator( validLine ); line_edit_basevalue = new TQLineEdit( this, "line_edit_basevalue" ); - line_edit_basevalue->setAlignment( int( TQLineEdit::AlignHCenter ) ); + line_edit_basevalue->tqsetAlignment( int( TQLineEdit::AlignHCenter ) ); line_edit_basevalue->setValidator( validLine ); line_edit_percentvalue = new TQLineEdit( this, "line_edit_percentvalue" ); - line_edit_percentvalue->setAlignment( int( TQLineEdit::AlignHCenter ) ); + line_edit_percentvalue->tqsetAlignment( int( TQLineEdit::AlignHCenter ) ); line_edit_percentvalue->setValidator( validLine ); progress_bar_count = new TQProgressBar( this, "progress_bar_count" ); @@ -119,7 +119,7 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : label_count->setBackgroundOrigin( TQDialog::ParentOrigin ); ////// - // begin layouting + // begin tqlayouting ////// TQVBoxLayout *main_layout = new TQVBoxLayout ( this, 0, -1, "main_layout" ); main_layout->setMargin( 20 ); @@ -197,17 +197,17 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : void KPercentMain::newTask() { // no Editline can be focused - line_edit_percentage->setFocusPolicy( NoFocus ); - line_edit_basevalue->setFocusPolicy( NoFocus ); - line_edit_percentvalue->setFocusPolicy( NoFocus ); + line_edit_percentage->setFocusPolicy( TQ_NoFocus ); + line_edit_basevalue->setFocusPolicy( TQ_NoFocus ); + line_edit_percentvalue->setFocusPolicy( TQ_NoFocus ); // set the number of managed tasks into a label - label_count->setText( TQString( i18n("You got %1 of %2 exercises.").arg(count).arg(number) ) ); // update Label for the Progress + label_count->setText( TQString( i18n("You got %1 of %2 exercises.").tqarg(count).tqarg(number) ) ); // update Label for the Progress // progress_bar_count->setProgress( count*100 ); // updating Progrssbar startTimer( 10 ); // set string which task is just workin on (Task x of y) - TQString taskNumber( i18n( "Exercise no. %1:" ).arg(count+1) ); + TQString taskNumber( i18n( "Exercise no. %1:" ).tqarg(count+1) ); label_number->setText( taskNumber ); // label_number->adjustSize(); @@ -245,7 +245,7 @@ void KPercentMain::newTask() // delete this one line_edit_input->clear(); // make the line_edit_layout accessable - line_edit_input->setFocusPolicy( StrongFocus ); + line_edit_input->setFocusPolicy( TQ_StrongFocus ); // set the focus on it line_edit_input->setFocus(); } @@ -292,8 +292,8 @@ void KPercentMain::slotApplyInput() total_answers++; progress_bar_right_wrong->setTotalSteps( total_answers ); progress_bar_right_wrong->setProgress( right_answers ); - label_right->setText( i18n( "%1%\nright" ).arg( (100*right_answers)/total_answers ) ); - label_wrong->setText( i18n( "%1%\nwrong" ).arg( 100-(100*right_answers)/total_answers ) ); + label_right->setText( i18n( "%1%\nright" ).tqarg( (100*right_answers)/total_answers ) ); + label_wrong->setText( i18n( "%1%\nwrong" ).tqarg( 100-(100*right_answers)/total_answers ) ); newTask(); // next task, perhaps } @@ -304,8 +304,8 @@ void KPercentMain::slotApplyInput() total_answers++; progress_bar_right_wrong->setTotalSteps( total_answers ); progress_bar_right_wrong->setProgress( right_answers ); - label_right->setText( i18n( "%1%\nright" ).arg( (100*right_answers)/total_answers ) ); - label_wrong->setText( i18n( "%1%\nwrong" ).arg( 100-(100*right_answers)/total_answers ) ); + label_right->setText( i18n( "%1%\nright" ).tqarg( (100*right_answers)/total_answers ) ); + label_wrong->setText( i18n( "%1%\nwrong" ).tqarg( 100-(100*right_answers)/total_answers ) ); } } } diff --git a/kpercentage/kpercentage/kpercentmain.h b/kpercentage/kpercentage/kpercentmain.h index 51004dc5..789d2755 100644 --- a/kpercentage/kpercentage/kpercentmain.h +++ b/kpercentage/kpercentage/kpercentmain.h @@ -22,7 +22,7 @@ #ifndef KPERCENTMAIN_H #define KPERCENTMAIN_H -// Qt includes +// TQt includes // KDE includes @@ -44,8 +44,9 @@ class TQVBoxLayout; class KPercentMain : public KDialog { Q_OBJECT + TQ_OBJECT public: - KPercentMain( TQWidget *parent, const char *name = 0 ); + KPercentMain( TQWidget *tqparent, const char *name = 0 ); /** checks, if the task is solved right */ bool validateTask(); /** prepares the dialog for a new task */ diff --git a/kpercentage/kpercentage/ksplashscreen.cpp b/kpercentage/kpercentage/ksplashscreen.cpp index 4eb43959..226fa881 100644 --- a/kpercentage/kpercentage/ksplashscreen.cpp +++ b/kpercentage/kpercentage/ksplashscreen.cpp @@ -19,7 +19,7 @@ * * ***************************************************************************/ -// Qt includes +// TQt includes #include #include @@ -39,10 +39,10 @@ KSplashScreen::KSplashScreen( KPercentage *percentage, const char *name ) : /* load the background pixmap */ TQPixmap bgp( locate( "data", "kpercentage/pics/splash.png" ) ); /* wait some time and start the main window */ - TQCanvas *canvas = new TQCanvas( this ); + TQCanvas *canvas = new TQCanvas( TQT_TQOBJECT(this) ); canvas->resize( 400, 300 ); /* set the background pixmap */ - canvas->setBackgroundPixmap( bgp ); + canvas->tqsetBackgroundPixmap( 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/kpercentage/kpercentage/ksplashscreen.h b/kpercentage/kpercentage/ksplashscreen.h index a9ffe655..638dc2a9 100644 --- a/kpercentage/kpercentage/ksplashscreen.h +++ b/kpercentage/kpercentage/ksplashscreen.h @@ -35,6 +35,7 @@ class KPercentage; class KSplashScreen : public KDialog { Q_OBJECT + TQ_OBJECT public: /** constructor */ diff --git a/kstars/ChangeLog b/kstars/ChangeLog index 5c2b696a..fe69e108 100644 --- a/kstars/ChangeLog +++ b/kstars/ChangeLog @@ -259,7 +259,7 @@ Added Milky Way countour. Added spectral type of stars to popup menu. Automated object tracking when an object is centered. Display name and coordinates of centered object in the infoPanel. -Fixed "extra layout" error messages. +Fixed "extra tqlayout" error messages. Improved efficiency of KSPlanet::findPosition(). Initial startup parameters make more sense. If focus point is below horizon when KStars restarts, a warning message diff --git a/kstars/README.i18n b/kstars/README.i18n index 6953afba..4ee54256 100644 --- a/kstars/README.i18n +++ b/kstars/README.i18n @@ -48,7 +48,7 @@ this document to answer some questions you might have. figure out the file format; briefly, it's a colon-delimited line with fields: object name, link text, link URL - Note that your alternate info_url.dat file will completely replace + Note that your alternate info_url.dat file will completely tqreplace the default, so if you want to include some links from the original, you will need to copy them over. Some of the sites we link to provide versions of their pages in other languages (e.g., seds.org). So diff --git a/kstars/README.timekeeping b/kstars/README.timekeeping index 412c371a..753fadc0 100644 --- a/kstars/README.timekeeping +++ b/kstars/README.timekeeping @@ -96,7 +96,7 @@ time has passed since the last update. For example, the LastNumUpdate variable stores the julian day of the last time object coordinates were updated for precession/nutation/aberration. This needs to happen once per simulation day, so whenever (CurrentDate-LastNumUpdate) exceeds 1.0, -it signals the update (by setting needNewCoords=true) and resets +it Q_SIGNALS the update (by setting needNewCoords=true) and resets LastNumUpdate to CurrentDate. Similarly, we use LastPlanetUpdate to update planet coordinates 100 times per day. LastSkyUpdate monitors the last time the horizontal coordinates were updated (the update diff --git a/kstars/TODO b/kstars/TODO index fa6e56ab..4d949331 100644 --- a/kstars/TODO +++ b/kstars/TODO @@ -33,7 +33,7 @@ - OpsDialog: zoomed-out faint limit not restricted to be <= zoomed-in limit -- OpsDialog: child widgets should disable when parent deselected: +- OpsDialog: child widgets should disable when tqparent deselected: Stars, Asteroids, Comets, CNames, MW, Hide obj. - OpsDialog: Remove All Trails button does nothing diff --git a/kstars/configure.in.in b/kstars/configure.in.in index 5bc872a4..19f17c3b 100644 --- a/kstars/configure.in.in +++ b/kstars/configure.in.in @@ -42,6 +42,17 @@ AC_ARG_ENABLE(libusb, dnl check if libusb is available if test "${use_libusb}" != false ; then + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + if test -z "$qt_includes"; then + CXXFLAGS="$CXXFLAGS" + else + CXXFLAGS="$CXXFLAGS -I$qt_includes" + fi + LDFLAGS="$LDFLAGS -ltqt" + AC_SUBST(LIBUSB) AC_CHECK_HEADERS(usb.h, [have_libusb="yes"], [ AC_MSG_WARN([usb.h not found, use --enable-libusb=PATH. Otherwise, INDI will compile without Apogee USB support.]) ]) @@ -52,6 +63,10 @@ if test "${use_libusb}" != false ; then [ AC_MSG_WARN([libusb not found. INDI will compile without Apogee USB support.]) ]) LIBS="$ac_save_LIBS" + CXXFLAGS="$ac_save_CXXFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + AC_LANG_RESTORE + fi dnl check if v4l2 is available diff --git a/kstars/kstars/Options.kcfgc b/kstars/kstars/Options.kcfgc index e82fba2f..bb476ff4 100644 --- a/kstars/kstars/Options.kcfgc +++ b/kstars/kstars/Options.kcfgc @@ -1,5 +1,5 @@ File=kstars.kcfg -IncludeFiles=qpoint.h +IncludeFiles=tqpoint.h ClassName=Options Singleton=yes Mutators=true diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 07af36ff..5264faa8 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -30,8 +30,8 @@ #include "addcatdialog.h" -AddCatDialog::AddCatDialog( TQWidget *parent ) - : KDialogBase( KDialogBase::Plain, i18n( "Import Catalog" ), Help|Ok|Cancel, Ok, parent ) { +AddCatDialog::AddCatDialog( TQWidget *tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "Import Catalog" ), Help|Ok|Cancel, Ok, tqparent ) { TQFrame *page = plainPage(); setMainWidget(page); @@ -106,7 +106,7 @@ void AddCatDialog::slotHelp() { * Position angle: floating-point value (position angle, in degrees) */ bool AddCatDialog::validateDataFile() { - KStars *ksw = (KStars*) topLevelWidget()->parent(); + KStars *ksw = (KStars*) tqtopLevelWidget()->tqparent(); //Create the catalog file contents: first the header CatalogContents = writeCatalogHeader(); @@ -145,10 +145,10 @@ TQString AddCatDialog::writeCatalogHeader() { TQString name = ( acd->CatalogName->text().isEmpty() ? i18n("Custom") : acd->CatalogName->text() ); TQString pre = ( acd->Prefix->text().isEmpty() ? "CC" : acd->Prefix->text() ); - TQString h = TQString("# Name: %1\n").arg( name ); - h += TQString("# Prefix: %1\n").arg( pre ); - h += TQString("# Color: %1\n").arg( acd->ColorButton->color().name() ); - h += TQString("# Epoch: %1\n").arg( acd->Epoch->value() ); + TQString h = TQString("# Name: %1\n").tqarg( name ); + h += TQString("# Prefix: %1\n").tqarg( pre ); + h += TQString("# Color: %1\n").tqarg( acd->ColorButton->color().name() ); + h += TQString("# Epoch: %1\n").tqarg( acd->Epoch->value() ); h += TQString("# "); for ( uint i=0; i < acd->FieldList->count(); ++i ) { @@ -194,7 +194,7 @@ void AddCatDialog::slotShowDataFile() { void AddCatDialog::slotPreviewCatalog() { if ( validateDataFile() ) { - KMessageBox::informationList( 0, i18n( "Preview of %1" ).arg( acd->CatalogName->text() ), + KMessageBox::informationList( 0, i18n( "Preview of %1" ).tqarg( acd->CatalogName->text() ), TQStringList::split( "\n", CatalogContents ), i18n( "Catalog Preview" ) ); } } @@ -210,7 +210,7 @@ void AddCatDialog::slotCreateCatalog() { KURL u( acd->CatalogURL->url() ); int r=KMessageBox::warningContinueCancel( 0, i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg( u.fileName() ), + "Overwrite it?" ).tqarg( u.fileName() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); @@ -220,7 +220,7 @@ void AddCatDialog::slotCreateCatalog() { TQFile OutFile( acd->CatalogURL->url() ); if ( ! OutFile.open( IO_WriteOnly ) ) { KMessageBox::sorry( 0, - i18n( "Could not open the file %1 for writing." ).arg( acd->CatalogURL->url() ), + i18n( "Could not open the file %1 for writing." ).tqarg( acd->CatalogURL->url() ), i18n( "Error Opening Output File" ) ); } else { TQTextStream outStream( &OutFile ); diff --git a/kstars/kstars/addcatdialog.h b/kstars/kstars/addcatdialog.h index be839181..93e18c84 100644 --- a/kstars/kstars/addcatdialog.h +++ b/kstars/kstars/addcatdialog.h @@ -36,10 +36,11 @@ class AddCatDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Default constructor */ - AddCatDialog( TQWidget *parent=0 ); + AddCatDialog( TQWidget *tqparent=0 ); /**Destructor (empty) */ diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui index 39488947..1e25a747 100644 --- a/kstars/kstars/addcatdialogui.ui +++ b/kstars/kstars/addcatdialogui.ui @@ -1,10 +1,10 @@ AddCatDialogUI - + AddCatDialogUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox4 @@ -62,7 +62,7 @@ - + groupBox1 @@ -73,15 +73,15 @@ unnamed - + - layout7 + tqlayout7 unnamed - + textLabel1_3 @@ -107,15 +107,15 @@ - + - layout8 + tqlayout8 unnamed - + textLabel1_3_2 @@ -143,9 +143,9 @@ - + - layout27 + tqlayout27 @@ -167,7 +167,7 @@ The coordinate epoch for the catalog - + textLabel4 @@ -175,15 +175,15 @@ Catalog name prefix: - + - layout13 + tqlayout13 unnamed - + textLabel1_4 @@ -208,7 +208,7 @@ - + textLabel3 @@ -216,9 +216,9 @@ Coordinate epoch: - + - layout12 + tqlayout12 @@ -234,7 +234,7 @@ Expanding - + 40 20 @@ -256,9 +256,9 @@ - + - layout4 + tqlayout4 @@ -272,7 +272,7 @@ Enter the filename for the output catalog file - + textLabel1_2 @@ -280,7 +280,7 @@ Catalog name: - + textLabel1 @@ -308,7 +308,7 @@ Expanding - + 20 16 @@ -350,7 +350,7 @@ CatalogName CatalogURL - + kurlrequester.h klineedit.h diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp index a5f5978e..1c6aa548 100644 --- a/kstars/kstars/addlinkdialog.cpp +++ b/kstars/kstars/addlinkdialog.cpp @@ -25,8 +25,8 @@ #include "addlinkdialog.h" #include "skyobject.h" -AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname ) - : KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).arg( oname ), Ok|Cancel, Ok, parent ), ObjectName( oname ) { +AddLinkDialog::AddLinkDialog( TQWidget *tqparent, const TQString &oname ) + : KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).tqarg( oname ), Ok|Cancel, Ok, tqparent ), ObjectName( oname ) { TQFrame *page = plainPage(); setMainWidget(page); diff --git a/kstars/kstars/addlinkdialog.h b/kstars/kstars/addlinkdialog.h index 87dfa14e..b99de203 100644 --- a/kstars/kstars/addlinkdialog.h +++ b/kstars/kstars/addlinkdialog.h @@ -36,9 +36,10 @@ class SkyMap; class AddLinkDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - AddLinkDialog( TQWidget* parent = 0, const TQString &oname=i18n("object") ); + AddLinkDialog( TQWidget* tqparent = 0, const TQString &oname=i18n("object") ); /**Destructor (empty) */ ~AddLinkDialog() {} diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui index 3e5bdf53..b2754fbb 100644 --- a/kstars/kstars/addlinkdialogui.ui +++ b/kstars/kstars/addlinkdialogui.ui @@ -1,10 +1,10 @@ AddLinkDialogUI - + AddLinkDialogUI - + 0 0 @@ -16,7 +16,7 @@ unnamed - + TypeBox @@ -27,7 +27,7 @@ unnamed - + ImageRadio @@ -35,7 +35,7 @@ Image - + InfoRadio @@ -45,9 +45,9 @@ - + - layout2 + tqlayout2 @@ -58,7 +58,7 @@ DescBox - + DescLabel @@ -66,7 +66,7 @@ Description: - + URLLabel @@ -86,7 +86,7 @@ 0 - + 450 0 @@ -95,9 +95,9 @@ - + - layout1 + tqlayout1 @@ -113,7 +113,7 @@ Expanding - + 40 20 @@ -140,7 +140,7 @@ Expanding - + 20 40 @@ -149,5 +149,5 @@ - + diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui index 93a4d804..5dc5fb3c 100644 --- a/kstars/kstars/ccdpreviewui.ui +++ b/kstars/kstars/ccdpreviewui.ui @@ -1,10 +1,10 @@ CCDPreviewForm - + CCDPreviewForm - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout2 + tqlayout2 @@ -31,13 +31,13 @@ playB - + 32 32 - + 32 32 @@ -57,13 +57,13 @@ captureB - + 32 32 - + 32 32 @@ -97,7 +97,7 @@ Expanding - + 300 21 @@ -106,7 +106,7 @@ - + videoFrame @@ -118,7 +118,7 @@ 0 - + 160 120 @@ -131,23 +131,23 @@ Sunken - + - layout19 + tqlayout19 unnamed - + - layout7 + tqlayout7 unnamed - + brightnessLabel @@ -163,7 +163,7 @@ Brightness: - + contrastLabel @@ -179,7 +179,7 @@ Contrast: - + gammaLabel @@ -195,7 +195,7 @@ Gamma: - + textLabel1_2 @@ -214,7 +214,7 @@ - + textLabel1 @@ -235,15 +235,15 @@ - + - layout18 + tqlayout18 unnamed - + brightnessBar @@ -268,7 +268,7 @@ Horizontal - + contrastBar @@ -293,7 +293,7 @@ Horizontal - + gammaBar @@ -315,17 +315,17 @@ Horizontal - + - layout17 + tqlayout17 unnamed - + - layout11 + tqlayout11 @@ -339,7 +339,7 @@ Enter the telescope focal length in mm - + FWHMLabel @@ -351,7 +351,7 @@ 0 - + 100 0 @@ -363,7 +363,7 @@ -- - + AlignCenter @@ -372,15 +372,15 @@ - + - layout8 + tqlayout8 unnamed - + textLabel1_3 @@ -399,7 +399,7 @@ Full Width at Half Maximum - + textLabel3 @@ -425,7 +425,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index 18ee3892..e9269e60 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -49,7 +49,7 @@ FILE *CCDwfp; - CCDPreviewWG::CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * parent, const char * name) : CCDPreviewForm(parent, name) + CCDPreviewWG::CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * tqparent, const char * name) : CCDPreviewForm(tqparent, name) { stdDev = inStdDev; @@ -106,7 +106,7 @@ void CCDPreviewWG::setColorFrame(bool color) TQString errMsg; struct sockaddr_in pin; struct hostent *serverHostName = gethostbyname(host.ascii()); - errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").arg(host).arg(port); + errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").tqarg(host).tqarg(port); memset(&pin, 0, sizeof(pin)); pin.sin_family = AF_INET; @@ -168,8 +168,8 @@ void CCDPreviewWG::setCtrl(int wd, int ht,int po, int bpp,unsigned long mgd) for (i=0;itotalBaseCount;i++) { streamFrame->streamBuffer[i]=0; } - resize(wd + layout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() - + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + layout()->margin() * 2 + layout()->spacing()*6); + resize(wd + tqlayout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() + + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()*6); streamFrame->resize(wd, ht); } @@ -197,14 +197,14 @@ void CCDPreviewWG::updateFWHM() fwhm_arcsec = (206.26 / focal_length) * fwhm * mu; - FWHMLabel->setText(TQString("%1").arg(fwhm_arcsec, 0, 'g', 3)); + FWHMLabel->setText(TQString("%1").tqarg(fwhm_arcsec, 0, 'g', 3)); } void CCDPreviewWG::resizeEvent(TQResizeEvent *ev) { - streamFrame->resize(ev->size().width() - layout()->margin() * 2, ev->size().height() - playB->height() - layout()->margin() * 2 - layout()->spacing()); + streamFrame->resize(ev->size().width() - tqlayout()->margin() * 2, ev->size().height() - playB->height() - tqlayout()->margin() * 2 - tqlayout()->spacing()); } void CCDPreviewWG::playPressed() @@ -263,30 +263,30 @@ void CCDPreviewWG::captureImage() if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( currentFileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } } else { - TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); } } -CCDVideoWG::CCDVideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, Qt::WNoAutoErase) +CCDVideoWG::CCDVideoWG(TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase) { streamImage = NULL; streamBuffer = NULL; displayBuffer = NULL; - grayTable=new QRgb[256]; + grayTable=new TQRgb[256]; for (int i=0;i<256;i++) { - grayTable[i]=qRgb(i,i,i); + grayTable[i]=tqRgb(i,i,i); } - grayTable[255]=qRgb(255,0,0); + grayTable[255]=tqRgb(255,0,0); } CCDVideoWG::~CCDVideoWG() @@ -375,7 +375,7 @@ void CCDVideoWG::redrawVideoWG(void) if (val>255.0) { val=255.0; } - val=qRound(val*(254.0/255.0)); + val=tqRound(val*(254.0/255.0)); displayBuffer[Width*y+x]=(int) val; } else { diff --git a/kstars/kstars/ccdpreviewwg.h b/kstars/kstars/ccdpreviewwg.h index ee079f81..d6eddbfc 100644 --- a/kstars/kstars/ccdpreviewwg.h +++ b/kstars/kstars/ccdpreviewwg.h @@ -31,9 +31,10 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; class CCDPreviewWG : public CCDPreviewForm { Q_OBJECT + TQ_OBJECT public: - CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * parent =0, const char * name =0); + CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * tqparent =0, const char * name =0); ~CCDPreviewWG(); friend class CCDVideoWG; @@ -70,12 +71,13 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; void updateFWHM(); }; - class CCDVideoWG : public QFrame + class CCDVideoWG : public TQFrame { Q_OBJECT + TQ_OBJECT public: - CCDVideoWG(TQWidget * parent =0, const char * name =0); + CCDVideoWG(TQWidget * tqparent =0, const char * name =0); ~CCDVideoWG(); friend class CCDPreviewWG; @@ -85,9 +87,9 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; private: void redrawVideoWG(void); long totalBaseCount; - QRgb *grayTable; - QImage *streamImage; - QPixmap qPix; + TQRgb *grayTable; + TQImage *streamImage; + TQPixmap qPix; KPixmapIO kPixIO; unsigned char *streamBuffer; unsigned char *displayBuffer; diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp index 5449c48e..66981101 100644 --- a/kstars/kstars/colorscheme.cpp +++ b/kstars/kstars/colorscheme.cpp @@ -144,7 +144,7 @@ void ColorScheme::copy( const ColorScheme &cs ) { TQString ColorScheme::colorNamed( const TQString &name ) const { //TQString color( Palette[ name ] ); if ( ! hasColorNamed( name ) ) { - kdWarning() << i18n( "No color named \"%1\" found in color scheme." ).arg( name ) << endl; + kdWarning() << i18n( "No color named \"%1\" found in color scheme." ).tqarg( name ) << endl; //color = "#FFFFFF"; //set to white if no color found return "#FFFFFF"; } @@ -168,7 +168,7 @@ TQString ColorScheme::keyAt( int i ) const { } TQString ColorScheme::nameFromKey( const TQString &key ) const { - return nameAt( KeyName.findIndex( key ) ); + return nameAt( KeyName.tqfindIndex( key ) ); } void ColorScheme::setColor( const TQString &key, const TQString &color ) { @@ -191,8 +191,8 @@ bool ColorScheme::load( const TQString &filename ) { bool ok(false); int newmode = line.left(1).toInt( &ok ); if ( ok ) setStarColorMode( newmode ); - if ( line.contains(':') ) { - int newintens = line.mid( line.find(':')+1, 2 ).toInt( &ok ); + if ( line.tqcontains(':') ) { + int newintens = line.mid( line.tqfind(':')+1, 2 ).toInt( &ok ); if ( ok ) setStarColorIntensity( newintens ); } @@ -201,19 +201,19 @@ bool ColorScheme::load( const TQString &filename ) { while ( !stream.eof() ) { line = stream.readLine(); - if ( line.contains(':')==1 ) { //the new color preset format contains a ":" in each line, followed by the name of the color + if ( line.tqcontains(':')==1 ) { //the new color preset format contains a ":" in each line, followed by the name of the color ++inew; if ( iold ) return false; //we read at least one line without a colon...file is corrupted. //If this line has a valid Key, set the color. - TQString tkey = line.mid( line.find(':')+1 ).stripWhiteSpace(); - TQString tname = line.left( line.find(':')-1 ); + TQString tkey = line.mid( line.tqfind(':')+1 ).stripWhiteSpace(); + TQString tname = line.left( line.tqfind(':')-1 ); - if ( KeyName.contains( tkey ) ) { + if ( KeyName.tqcontains( tkey ) ) { setColor( tkey, tname ); } else { //attempt to translate from old color ID TQString k( line.mid( 5 ).stripWhiteSpace() + "Color" ); - if ( KeyName.contains( k ) ) { + if ( KeyName.tqcontains( k ) ) { setColor( k, tname ); } else { kdWarning() << "Could not use the key \"" << tkey << @@ -248,7 +248,7 @@ bool ColorScheme::save( const TQString &name ) { TQString filename = name.lower().stripWhiteSpace(); if ( !filename.isEmpty() ) { for( unsigned int i=0; ireadEntry( TQString(*it), TQString( *Default.at( KeyName.findIndex(*it) ) ) ) ); + setColor( TQString(*it), conf->readEntry( TQString(*it), TQString( *Default.at( KeyName.tqfindIndex(*it) ) ) ) ); setStarColorMode( conf->readNumEntry( "StarColorMode", 0 ) ); setStarColorIntensity( conf->readNumEntry( "StarColorIntensity", 5 ) ); diff --git a/kstars/kstars/colorscheme.h b/kstars/kstars/colorscheme.h index e61c455b..22edb1e6 100644 --- a/kstars/kstars/colorscheme.h +++ b/kstars/kstars/colorscheme.h @@ -65,7 +65,7 @@ class ColorScheme { TQString colorNamed( const TQString &name ) const; /**@p i the index of the color to retrieve - *@return a color by its index in the QMap + *@return a color by its index in the TQMap */ TQString colorAt( int i ) const; diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp index ec9aa240..d2178857 100644 --- a/kstars/kstars/conbridlg.cpp +++ b/kstars/kstars/conbridlg.cpp @@ -36,13 +36,13 @@ //TODO find a better and faster way to implement this, this operation can be memory and CPU intensive. -ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *parent) : - KDialogBase(KDialogBase::Plain, i18n( "Brightness/Contrast" ), Ok|Cancel, Ok, parent ) +ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *tqparent) : + KDialogBase(KDialogBase::Plain, i18n( "Brightness/Contrast" ), Ok|Cancel, Ok, tqparent ) { float pixdiff, datadiff; contrast = brightness = 0; - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; displayImage = viewer->image->displayImage; tempImage = new TQImage(displayImage->copy()); width = displayImage->width(); @@ -231,7 +231,7 @@ void ContrastBrightnessDlg::setBrightness(int brightnessValue) } -TQSize ContrastBrightnessDlg::sizeHint() const +TQSize ContrastBrightnessDlg::tqsizeHint() const { return TQSize(400,130); } diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h index 62193855..eaabcf2e 100644 --- a/kstars/kstars/conbridlg.h +++ b/kstars/kstars/conbridlg.h @@ -29,11 +29,12 @@ class ContrastBrightnessDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ContrastBrightnessDlg(TQWidget *parent=0); + ContrastBrightnessDlg(TQWidget *tqparent=0); ~ContrastBrightnessDlg(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void range(int min, int max, int & num); void range(float min, float max, float & num); diff --git a/kstars/kstars/contrastbrightnessgui.ui b/kstars/kstars/contrastbrightnessgui.ui index b05db5b3..70e54fa2 100644 --- a/kstars/kstars/contrastbrightnessgui.ui +++ b/kstars/kstars/contrastbrightnessgui.ui @@ -1,10 +1,10 @@ ConBriForm - + ConBriForm - + 0 0 @@ -19,7 +19,7 @@ unnamed - + briSlider @@ -36,7 +36,7 @@ NoMarks - + conLabel @@ -66,7 +66,7 @@ -128 - + briLabel @@ -74,7 +74,7 @@ Brightness: - + conSlider @@ -118,7 +118,7 @@ setValue(int) - + knuminput.h knuminput.h diff --git a/kstars/kstars/data/Cities.dat b/kstars/kstars/data/Cities.dat index 2adacf45..4528bb50 100644 --- a/kstars/kstars/data/Cities.dat +++ b/kstars/kstars/data/Cities.dat @@ -1271,7 +1271,7 @@ Kings Beach : Queensland : Australia Kingsport : Tennessee : USA : 36 : 32 : 42 : N : 82 : 32 : 35 : W : -5.0 : US Kingston : : Jamaica : 18 : 0 : 0 : N : 76 : 44 : 59 : W : -5.0 : -- Kingston : Ontario : Canada : 44 : 13 : 11 : N : 76 : 35 : 59 : W : -5.0 : US -Kinshasa : : Congo (Democratic Republic) : 4 : 22 : 58 : S : 15 : 26 : 59 : E : x : -- +Kinshasa : : Congo (Detqmocratic Republic) : 4 : 22 : 58 : S : 15 : 26 : 59 : E : x : -- Kiruna : : Sweden : 67 : 49 : 0 : N : 20 : 19 : 0 : E : 1.0 : EU Kisangani : : Dem rep of Congo : 0 : 31 : 0 : N : 25 : 11 : 0 : E : 1.0 : -- Kismayu : : Somalia : 0 : 23 : 0 : S : 42 : 33 : 0 : E : 3.0 : -- diff --git a/kstars/kstars/data/info_url.dat b/kstars/kstars/data/info_url.dat index 225a24d5..c3c0e8d4 100644 --- a/kstars/kstars/data/info_url.dat +++ b/kstars/kstars/data/info_url.dat @@ -185,7 +185,7 @@ Mars:NASA JPL Page:http://www.jpl.nasa.gov/solar_system/planets/mars_index.html Mars:Welcome to Mars!:http://www.amnh.org/rose/mars/index.html Mars:The Whole Mars Catalog:http://www.spaceref.com/mars/ Mars:The Mars Society:http://www.marssociety.org/ -Mars:The "face" on Mars:http://mars.jpl.nasa.gov/mgs/msss/camera/images/moc_5_24_01/face/index.html +Mars:The "face" on Mars:http://mars.jpl.nasa.gov/mgs/msss/camera/images/tqmoc_5_24_01/face/index.html Jupiter:Wikipedia Page:http://en.wikipedia.org/wiki/Jupiter_(planet) Jupiter:SEDS Information Page:http://www.seds.org/nineplanets/nineplanets/jupiter.html Jupiter:NASA JPL Page:http://www.jpl.nasa.gov/solar_system/planets/jupiter_index.html diff --git a/kstars/kstars/data/tips b/kstars/kstars/data/tips index 91f82248..1cbcc989 100644 --- a/kstars/kstars/data/tips +++ b/kstars/kstars/data/tips @@ -83,7 +83,7 @@

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

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

To switch between Equatorial and Horizontal coordinate +

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

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

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

diff --git a/kstars/kstars/deepskyobject.cpp b/kstars/kstars/deepskyobject.cpp index 280729e5..5e0597f5 100644 --- a/kstars/kstars/deepskyobject.cpp +++ b/kstars/kstars/deepskyobject.cpp @@ -88,7 +88,7 @@ void DeepSkyObject::setCatalog( const TQString &cat ) { TQImage* DeepSkyObject::readImage( void ) { TQFile file; if ( Image==0 ) { //Image not currently set; try to load it from disk. - TQString fname = name().lower().replace( TQRegExp(" "), "" ) + ".png"; + TQString fname = name().lower().tqreplace( TQRegExp(" "), "" ) + ".png"; if ( KSUtils::openDataFile( file, fname ) ) { file.close(); diff --git a/kstars/kstars/deepskyobject.h b/kstars/kstars/deepskyobject.h index c10305aa..6faf1494 100644 --- a/kstars/kstars/deepskyobject.h +++ b/kstars/kstars/deepskyobject.h @@ -107,7 +107,7 @@ public: */ TQString catalog( void ) const; -/**Set the internal Catalog value according to the QString +/**Set the internal Catalog value according to the TQString *argument: * "M" : CAT_MESSIER * "NGC" : CAT_NGC @@ -181,7 +181,7 @@ public: /**Show Deep-sky object popup menu. Overloaded from virtual *SkyObject::showPopupMenu() *@param pmenu pointer to the KSPopupMenu object - *@param pos QPojnt holding the x,y coordinates for the menu + *@param pos TQPojnt holding the x,y coordinates for the menu */ virtual void showPopupMenu( KSPopupMenu *pmenu, TQPoint pos ) { pmenu->createDeepSkyObjectMenu( this ); pmenu->popup( pos ); } diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index 4bbb6a91..1194d4bd 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -57,7 +57,7 @@ #include "devicemanager.h" #include "indistd.h" -LogEdit::LogEdit( TQWidget *parent, const char *name ) : KTextEdit( parent, name ) +LogEdit::LogEdit( TQWidget *tqparent, const char *name ) : KTextEdit( tqparent, name ) { setFrameStyle( TQFrame::StyledPanel ); setFrameShadow( TQFrame::Plain ); @@ -69,13 +69,13 @@ void LogEdit::focusOutEvent( TQFocusEvent *e ) { TQWidget::focusOutEvent(e); } -ClickLabel::ClickLabel( TQWidget *parent, const char *name ) : TQLabel( parent, name ) +ClickLabel::ClickLabel( TQWidget *tqparent, const char *name ) : TQLabel( tqparent, name ) {} DetailDialog::DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, - TQWidget *parent, const char *name ) : - KDialogBase( KDialogBase::Tabbed, i18n( "Object Details" ), Close, Close, parent, name ) , - selectedObject(o), ksw((KStars*)parent), Data(0), Pos(0), Links(0), Adv(0), Log(0) + TQWidget *tqparent, const char *name ) : + KDialogBase( KDialogBase::Tabbed, i18n( "Object Details" ), Close, Close, tqparent, name ) , + selectedObject(o), ksw((KStars*)tqparent), Data(0), Pos(0), Links(0), Adv(0), Log(0) { //Modify color palette setPaletteBackgroundColor( palette().color( TQPalette::Active, TQColorGroup::Base ) ); @@ -135,20 +135,20 @@ void DetailDialog::createGeneralTab() Data->Names->setText( s->longname() ); Data->Type->setText( s->sptype() + " " + i18n("star") ); - Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( + Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).tqarg( KGlobal::locale()->formatNumber( s->mag(), 1 ) ) ); //show to tenths place //distance if ( s->distance() > 2000. || s->distance() < 0. ) // parallax < 0.5 mas Data->Distance->setText( TQString(i18n("larger than 2000 parsecs", "> 2000 pc") ) ); else if ( s->distance() > 50.0 ) //show to nearest integer - Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( + Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).tqarg( TQString::number( int( s->distance() + 0.5 ) ) ) ); else if ( s->distance() > 10.0 ) //show to tenths place - Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( + Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).tqarg( KGlobal::locale()->formatNumber( s->distance(), 1 ) ) ); else //show to hundredths place - Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( + Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).tqarg( KGlobal::locale()->formatNumber( s->distance(), 2 ) ) ); //Note multiplicity/variablility in angular size label @@ -183,28 +183,28 @@ void DetailDialog::createGeneralTab() //Magnitude: The moon displays illumination fraction instead if ( selectedObject->name() == "Moon" ) { Data->MagLabel->setText( i18n("Illumination:") ); - Data->Mag->setText( TQString("%1 %").arg( int( ((KSMoon *)selectedObject)->illum()*100. ) ) ); + Data->Mag->setText( TQString("%1 %").tqarg( int( ((KSMoon *)selectedObject)->illum()*100. ) ) ); } else { - Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( + Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).tqarg( KGlobal::locale()->formatNumber( ps->mag(), 1 ) ) ); //show to tenths place } //Distance from Earth. The moon requires a unit conversion if ( ps->name() == "Moon" ) { - Data->Distance->setText( i18n("distance in kilometers", "%1 km").arg( + Data->Distance->setText( i18n("distance in kilometers", "%1 km").tqarg( KGlobal::locale()->formatNumber( ps->rearth()*AU_KM ) ) ); } else { - Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").arg( + Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").tqarg( KGlobal::locale()->formatNumber( ps->rearth() ) ) ); } //Angular size; moon and sun in arcmin, others in arcsec if ( ps->angSize() ) { if ( ps->name() == "Sun" || ps->name() == "Moon" ) - Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( + Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( ps->angSize() ) ) ); else - Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").arg( + Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").tqarg( KGlobal::locale()->formatNumber( ps->angSize()*60.0 ) ) ); } else { Data->AngSize->setText( "--" ); @@ -230,11 +230,11 @@ void DetailDialog::createGeneralTab() if ( dso->ugc() != 0 ) { if ( ! oname.isEmpty() ) oname += ", "; - oname += "UGC " + TQString("%1").arg( dso->ugc() ); + oname += "UGC " + TQString("%1").tqarg( dso->ugc() ); } if ( dso->pgc() != 0 ) { if ( ! oname.isEmpty() ) oname += ", "; - oname += "PGC " + TQString("%1").arg( dso->pgc() ); + oname += "PGC " + TQString("%1").tqarg( dso->pgc() ); } if ( ! oname.isEmpty() ) pname += ", " + oname; @@ -245,7 +245,7 @@ void DetailDialog::createGeneralTab() if ( dso->mag() > 90.0 ) Data->Mag->setText( "--" ); else - Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( + Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).tqarg( KGlobal::locale()->formatNumber( dso->mag(), 1 ) ) ); //show to tenths place //No distances at this point... @@ -253,10 +253,10 @@ void DetailDialog::createGeneralTab() //Only show decimal place for small angular sizes if ( dso->a() > 10.0 ) - Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( + Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").tqarg( int( dso->a() ) ) ); else if ( dso->a() ) - Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( + Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( dso->a(), 1 ) ) ); else Data->AngSize->setText( "--" ); @@ -313,10 +313,10 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo //because we don't want a thousands-place separator! TQString sEpoch = TQString::number( ut.epoch(), 'f', 1 ); //Replace the decimal point with localized decimal symbol - sEpoch.replace( ".", KGlobal::locale()->decimalSymbol() ); + sEpoch.tqreplace( ".", KGlobal::locale()->decimalSymbol() ); - Pos->RALabel->setText( i18n( "RA (%1):" ).arg( sEpoch ) ); - Pos->DecLabel->setText( i18n( "Dec (%1):" ).arg( sEpoch ) ); + Pos->RALabel->setText( i18n( "RA (%1):" ).tqarg( sEpoch ) ); + Pos->DecLabel->setText( i18n( "Dec (%1):" ).tqarg( sEpoch ) ); Pos->RA->setText( selectedObject->ra()->toHMSString() ); Pos->Dec->setText( selectedObject->dec()->toDMSString() ); Pos->Az->setText( selectedObject->az()->toDMSString() ); @@ -331,7 +331,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo ha.setH( 24.0 - ha.Hours() ); sgn = '-'; } - Pos->HA->setText( TQString("%1%2").arg(sgn).arg( ha.toHMSString() ) ); + Pos->HA->setText( TQString("%1%2").tqarg(sgn).tqarg( ha.toHMSString() ) ); //Airmass is approximated as the secant of the zenith distance, //equivalent to 1./sin(Alt). Beware of Inf at Alt=0! @@ -484,7 +484,7 @@ void DetailDialog::createLogTab() vlay->addWidget( Log ); if ( selectedObject->userLog.isEmpty() ) - Log->UserLog->setText(i18n("Record here observation logs and/or data on %1.").arg(selectedObject->translatedName())); + Log->UserLog->setText(i18n("Record here observation logs and/or data on %1.").tqarg(selectedObject->translatedName())); else Log->UserLog->setText(selectedObject->userLog); @@ -658,7 +658,7 @@ void DetailDialog::removeLinkDialog() currentItemTitle = Links->ImagesList->currentText(); } - if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 link?").arg(currentItemTitle), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) + if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 link?").tqarg(currentItemTitle), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) return; switch (type) @@ -706,9 +706,9 @@ bool DetailDialog::verifyUserData(int type) for (i=0; iname() && title == currentItemTitle) { ObjectFound = true; @@ -723,9 +723,9 @@ bool DetailDialog::verifyUserData(int type) for (i=0; iname() && title == currentItemTitle) { ObjectFound = true; @@ -774,7 +774,7 @@ bool DetailDialog::readUserFile(int type)//, int sourceFileType) return true; } -void DetailDialog::populateADVTree(TQListViewItem *parent) +void DetailDialog::populateADVTree(TQListViewItem *tqparent) { // list done if (!treeIt->current()) @@ -782,20 +782,20 @@ void DetailDialog::populateADVTree(TQListViewItem *parent) // if relative top level [KSLABEL] if (treeIt->current()->Type == 0) - forkTree(parent); + forkTree(tqparent); while (treeIt->current()) { if (treeIt->current()->Type == 0) { - forkTree(parent); + forkTree(tqparent); continue; } else if (treeIt->current()->Type == 1) break; - if (parent) - new TQListViewItem( parent, treeIt->current()->Name); + if (tqparent) + new TQListViewItem( tqparent, treeIt->current()->Name); else new TQListViewItem( Adv->ADVTree, treeIt->current()->Name); @@ -803,11 +803,11 @@ void DetailDialog::populateADVTree(TQListViewItem *parent) } } -void DetailDialog::forkTree(TQListViewItem *parent) +void DetailDialog::forkTree(TQListViewItem *tqparent) { TQListViewItem *current = 0; - if (parent) - current = new TQListViewItem(parent, treeIt->current()->Name); + if (tqparent) + current = new TQListViewItem(tqparent, treeIt->current()->Name); else current = new TQListViewItem(Adv->ADVTree, treeIt->current()->Name); @@ -845,13 +845,13 @@ TQString DetailDialog::parseADVData(TQString link) TQString subLink; int index; - if ( (index = link.find("KSOBJ")) != -1) + if ( (index = link.tqfind("KSOBJ")) != -1) { link.remove(index, 5); link = link.insert(index, selectedObject->name()); } - if ( (index = link.find("KSRA")) != -1) + if ( (index = link.tqfind("KSRA")) != -1) { link.remove(index, 4); subLink = TQString().sprintf("%02d%02d%02d", selectedObject->ra0()->hour(), selectedObject->ra0()->minute(), selectedObject->ra0()->second()); @@ -860,7 +860,7 @@ TQString DetailDialog::parseADVData(TQString link) link = link.insert(index, subLink); } - if ( (index = link.find("KSDEC")) != -1) + if ( (index = link.tqfind("KSDEC")) != -1) { link.remove(index, 5); if (selectedObject->dec()->degree() < 0) @@ -905,8 +905,8 @@ void DetailDialog::centerTelescope() int selectedCoord(0); SkyPoint sp; - // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element - // i.e. the first telescope we find! + // Find the first device with ETQUATORIAL_EOD_COORD or ETQUATORIAL_COORD and with SLEW element + // i.e. the first telescope we tqfind! INDIMenu *imenu = ksw->getINDIMenu(); @@ -917,10 +917,10 @@ void DetailDialog::centerTelescope() { indidev = imenu->mgr.at(i)->indi_dev.at(j); indidev->stdDev->currentObject = NULL; - prop = indidev->findProp("EQUATORIAL_EOD_COORD"); + prop = indidev->findProp("ETQUATORIAL_EOD_COORD"); if (prop == NULL) { - prop = indidev->findProp("EQUATORIAL_COORD"); + prop = indidev->findProp("ETQUATORIAL_COORD"); if (prop == NULL) { prop = indidev->findProp("HORIZONTAL_COORD"); @@ -938,7 +938,7 @@ void DetailDialog::centerTelescope() if (ConnectEle->state == PS_OFF) { - KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").arg(indidev->label)); + KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").tqarg(indidev->label)); return; } @@ -953,7 +953,7 @@ void DetailDialog::centerTelescope() if (!DecEle) continue; break; - // Horizontal + //Qt::Horizontal case 1: if (prop->perm == PP_RO) continue; AzEle = prop->findElement("AZ"); @@ -990,10 +990,10 @@ void DetailDialog::centerTelescope() sp.set (ksw->map()->clickedPoint()->ra(), ksw->map()->clickedPoint()->dec()); if (useJ2000) - sp.apparentCoord(ksw->data()->ut().djd(), (long double) J2000); + sp.aptqparentCoord(ksw->data()->ut().djd(), (long double) J2000); - RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second())); - DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec())); + RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second())); + DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec())); break; @@ -1009,8 +1009,8 @@ void DetailDialog::centerTelescope() sp.setAlt(*ksw->map()->clickedPoint()->alt()); } - AzEle->write_w->setText(TQString("%1:%2:%3").arg(sp.az()->degree()).arg(sp.az()->arcmin()).arg(sp.az()->arcsec())); - AltEle->write_w->setText(TQString("%1:%2:%3").arg(sp.alt()->degree()).arg(sp.alt()->arcmin()).arg(sp.alt()->arcsec())); + AzEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.az()->degree()).tqarg(sp.az()->arcmin()).tqarg(sp.az()->arcsec())); + AltEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.alt()->degree()).tqarg(sp.alt()->arcmin()).tqarg(sp.alt()->arcsec())); break; } @@ -1040,7 +1040,7 @@ void DetailDialog::showThumbnail() { //If no image found, load "no image" image //If that isn't found, make it blank. TQFile file; - TQString fname = "thumb-" + selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png"; + TQString fname = "thumb-" + selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png"; if ( KSUtils::openDataFile( file, fname ) ) { file.close(); Thumbnail->load( file.name(), "PNG" ); @@ -1060,7 +1060,7 @@ void DetailDialog::updateThumbnail() { if ( tp.exec() == TQDialog::Accepted ) { TQString fname = locateLocal( "appdata", "thumb-" - + selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png" ); + + selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png" ); Data->Image->setPixmap( *(tp.image()) ); diff --git a/kstars/kstars/detaildialog.h b/kstars/kstars/detaildialog.h index 301a2a13..dd6a5f8a 100644 --- a/kstars/kstars/detaildialog.h +++ b/kstars/kstars/detaildialog.h @@ -56,8 +56,9 @@ struct ADVTreeData */ class LogEdit : public KTextEdit { Q_OBJECT + TQ_OBJECT public: - LogEdit( TQWidget *parent=0, const char *name=0 ); + LogEdit( TQWidget *tqparent=0, const char *name=0 ); ~LogEdit() {} signals: @@ -73,15 +74,16 @@ protected: */ class ClickLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: - ClickLabel( TQWidget *parent=0, const char *name=0 ); + ClickLabel( TQWidget *tqparent=0, const char *name=0 ); ~ClickLabel() {} signals: void clicked(); protected: - void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == LeftButton ) emit clicked(); } + void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == Qt::LeftButton ) emit clicked(); } }; /**@class DetailDialog is a window showing detailed information for a selected object. @@ -104,10 +106,11 @@ protected: class DetailDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, TQWidget *parent=0, const char *name=0); + DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, TQWidget *tqparent=0, const char *name=0); /**Destructor (empty) */ @@ -211,11 +214,11 @@ private: /**Populate the TreeView of known astronomical databases in the Advanced Tab */ - void populateADVTree(TQListViewItem *parent); + void populateADVTree(TQListViewItem *tqparent); /**For the databases TreeView */ - void forkTree(TQListViewItem *parent); + void forkTree(TQListViewItem *tqparent); /**Data for the Advanced Tab TreeView is stored in the file advinterface.dat. *This function parses advinterface.dat. diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui index 2f7893b0..9a85a18f 100644 --- a/kstars/kstars/details_data.ui +++ b/kstars/kstars/details_data.ui @@ -1,10 +1,10 @@ DetailsDataUI - + DetailsDataUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout67 + tqlayout67 @@ -30,7 +30,7 @@ 0 - + Names @@ -45,11 +45,11 @@ <p align="center">Primary Name, Other Names</p> - + WordBreak|AlignCenter - + DataFrame @@ -74,25 +74,25 @@ unnamed - + - layout20 + tqlayout20 unnamed - + - layout12 + tqlayout12 unnamed - + - layout60_2 + tqlayout60_2 @@ -121,7 +121,7 @@ Object Type - + InLabel @@ -141,7 +141,7 @@ in - + AlignTop @@ -180,7 +180,7 @@ Expanding - + 140 20 @@ -199,16 +199,16 @@ Expanding - + 20 16 - + - layout19 + tqlayout19 @@ -235,7 +235,7 @@ Expanding - + 77 20 @@ -246,17 +246,17 @@ - + - layout22 + tqlayout22 unnamed - + - layout21 + tqlayout21 @@ -317,7 +317,7 @@ 0.00 mag - + MagLabel @@ -345,11 +345,11 @@ Magnitude: - + AlignTop - + DistanceLabel @@ -377,7 +377,7 @@ Distance: - + AlignTop @@ -405,7 +405,7 @@ 0.00 pc - + AngSizeLabel @@ -433,7 +433,7 @@ Size: - + AlignTop @@ -449,16 +449,16 @@ Expanding - + 20 8 - + - layout36_2 + tqlayout36_2 @@ -481,16 +481,16 @@ Expanding - + 16 20 - + - layout35_2 + tqlayout35_2 @@ -532,7 +532,7 @@ Expanding - + 20 20 @@ -557,7 +557,7 @@ Fixed - + 20 8 @@ -590,7 +590,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082 - + kactivelabel.h kpushbutton.h diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui index a32f4b30..974372d6 100644 --- a/kstars/kstars/details_database.ui +++ b/kstars/kstars/details_database.ui @@ -1,10 +1,10 @@ DetailsDatabaseUI - + DetailsDatabaseUI - + 0 0 @@ -48,7 +48,7 @@ - + klistview.h diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui index dbe0b75e..9b661310 100644 --- a/kstars/kstars/details_links.ui +++ b/kstars/kstars/details_links.ui @@ -1,10 +1,10 @@ DetailsLinksUI - + DetailsLinksUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout79 + tqlayout79 @@ -30,7 +30,7 @@ 0 - + InfoTitle @@ -66,16 +66,16 @@ Fixed - + 20 16 - + - layout80 + tqlayout80 @@ -84,7 +84,7 @@ 0 - + ImagesTitle @@ -113,9 +113,9 @@ - + - layout91 + tqlayout91 @@ -163,7 +163,7 @@ Expanding - + 40 20 @@ -176,7 +176,7 @@ - + klistbox.h klistbox.h diff --git a/kstars/kstars/details_log.ui b/kstars/kstars/details_log.ui index 51d337f8..94e77070 100644 --- a/kstars/kstars/details_log.ui +++ b/kstars/kstars/details_log.ui @@ -1,10 +1,10 @@ DetailsLogUI - + DetailsLogUI - + 0 0 @@ -22,7 +22,7 @@ 0 - + LogTitle @@ -73,5 +73,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082 - + diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui index f2e96b9b..3cef8785 100644 --- a/kstars/kstars/details_position.ui +++ b/kstars/kstars/details_position.ui @@ -1,10 +1,10 @@ DetailsPositionUI - + DetailsPositionUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout56 + tqlayout56 @@ -30,7 +30,7 @@ 0 - + CoordTitle @@ -43,7 +43,7 @@ <p align="center">Coordinates</p> - + CoordFrame @@ -68,17 +68,17 @@ unnamed - + - layout54 + tqlayout54 unnamed - + - layout50 + tqlayout50 @@ -134,7 +134,7 @@ 00:00:00 - + DecLabel @@ -154,11 +154,11 @@ Dec (2000.0): - + AlignTop - + RALabel @@ -178,7 +178,7 @@ RA (2000.0): - + AlignTop @@ -194,16 +194,16 @@ Expanding - + 90 16 - + - layout50_2 + tqlayout50_2 @@ -259,7 +259,7 @@ 00:00:00 - + AltLabel @@ -279,11 +279,11 @@ Altitude: - + AlignTop - + AzLabel @@ -303,7 +303,7 @@ Azimuth: - + AlignTop @@ -321,30 +321,30 @@ Expanding - + 20 0 - + - layout55 + tqlayout55 unnamed - + - layout53 + tqlayout53 unnamed - + HALabel @@ -364,7 +364,7 @@ Hour angle: - + AlignTop @@ -405,22 +405,22 @@ Expanding - + 170 20 - + - layout52 + tqlayout52 unnamed - + AirmassLabel @@ -440,7 +440,7 @@ Airmass: - + AlignTop @@ -487,16 +487,16 @@ Fixed - + 20 16 - + - layout76 + tqlayout76 @@ -505,7 +505,7 @@ 0 - + RSTTitle @@ -518,7 +518,7 @@ <p align="center">Rise/Set/Transit</p> - + RSTFrame @@ -543,17 +543,17 @@ unnamed - + - layout142 + tqlayout142 unnamed - + - layout141 + tqlayout141 @@ -609,7 +609,7 @@ 00:00 - + TimeSetLabel @@ -629,11 +629,11 @@ Set time: - + AlignTop - + TimeTransitLabel @@ -653,11 +653,11 @@ Transit time: - + AlignTop - + TimeRiseLabel @@ -677,7 +677,7 @@ Rise time: - + AlignTop @@ -718,16 +718,16 @@ Expanding - + 83 20 - + - layout140 + tqlayout140 @@ -758,7 +758,7 @@ 00:00:00 - + AzSetLabel @@ -778,11 +778,11 @@ Azimuth at set: - + AlignTop - + AltTransitLabel @@ -802,7 +802,7 @@ Altitude at transit: - + AlignTop @@ -856,7 +856,7 @@ 00:00:00 - + AzRiseLabel @@ -876,7 +876,7 @@ Azimuth at rise: - + AlignTop @@ -894,7 +894,7 @@ Expanding - + 20 0 @@ -909,7 +909,7 @@ - + kactivelabel.h kactivelabel.h diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index 0f95455c..705ddfe0 100644 --- a/kstars/kstars/devicemanager.cpp +++ b/kstars/kstars/devicemanager.cpp @@ -42,14 +42,14 @@ ** This allow KStars to control multiple devices distributed acorss ** multiple servers seemingly in a way that is completely transparent ** to devices and drivers alike. -** The device Manager can be thought of as the 'networking' parent -** of devices, while indimenu is 'GUI' parent of devices +** The device Manager can be thought of as the 'networking' tqparent +** of devices, while indimenu is 'GUI' tqparent of devices *******************************************************************/ -DeviceManager::DeviceManager(INDIMenu *INDIparent, int inID) +DeviceManager::DeviceManager(INDIMenu *INDItqparent, int inID) { - parent = INDIparent; + tqparent = INDItqparent; mgrID = inID; indi_dev.setAutoDelete(true); @@ -87,7 +87,7 @@ bool DeviceManager::indiConnect(TQString inHost, TQString inPort) TQString errMsg; struct sockaddr_in pin; struct hostent *serverHostName = gethostbyname(host.ascii()); - errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").arg(host).arg(port); + errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").tqarg(host).tqarg(port); memset(&pin, 0, sizeof(pin)); pin.sin_family = AF_INET; @@ -154,8 +154,8 @@ void DeviceManager::dataReceived() tcflush(serverFD, TCIFLUSH); sNotifier->disconnect(); close(serverFD); - parent->removeDeviceMgr(mgrID); - KMessageBox::error(0, TQString::fromLatin1(errmsg)); + tqparent->removeDeviceMgr(mgrID); + KMessageBox::error(0, TQString::tqfromLatin1(errmsg)); return; } @@ -309,17 +309,17 @@ INDI_D * DeviceManager::addDevice (XMLEle *dep, char errmsg[]) if (!ap) return NULL; - if (parent->currentLabel.isEmpty()) - parent->setCustomLabel(valuXMLAtt(ap)); + if (tqparent->currentLabel.isEmpty()) + tqparent->setCustomLabel(valuXMLAtt(ap)); - dp = new INDI_D(parent, this, TQString(valuXMLAtt(ap)), parent->currentLabel); + dp = new INDI_D(tqparent, this, TQString(valuXMLAtt(ap)), tqparent->currentLabel); indi_dev.append(dp); emit newDevice(); // Reset label - parent->currentLabel = ""; + tqparent->currentLabel = ""; /* ok */ return dp; @@ -397,7 +397,7 @@ void DeviceManager::doMsg (XMLEle *msg, INDI_D *dp) if (timestamp) txt_w->insert(TQString(valuXMLAtt(timestamp)) + TQString(" ")); else - txt_w->insert( KStarsDateTime::currentDateTime().toString("yyyy/mm/dd - h:m:s ap ")); + txt_w->insert( KStarsDateTime::tqcurrentDateTime().toString("yyyy/mm/dd - h:m:s ap ")); /* finally! the msg */ message = findXMLAtt(msg, "message"); @@ -405,7 +405,7 @@ void DeviceManager::doMsg (XMLEle *msg, INDI_D *dp) txt_w->insert( TQString(valuXMLAtt(message)) + TQString("\n")); if ( Options::indiMessages() ) - parent->ksw->statusBar()->changeItem( TQString(valuXMLAtt(message)), 0); + tqparent->ksw->statusBar()->changeItem( TQString(valuXMLAtt(message)), 0); } diff --git a/kstars/kstars/devicemanager.h b/kstars/kstars/devicemanager.h index fe9af04c..78b2b933 100644 --- a/kstars/kstars/devicemanager.h +++ b/kstars/kstars/devicemanager.h @@ -23,14 +23,15 @@ class TQSocketNotifier; // INDI device manager -class DeviceManager : public QObject +class DeviceManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - DeviceManager(INDIMenu *INDIparent, int inID); + DeviceManager(INDIMenu *INDItqparent, int inID); ~DeviceManager(); - INDIMenu *parent; + INDIMenu *tqparent; TQPtrList indi_dev; @@ -39,8 +40,8 @@ class DeviceManager : public QObject FILE *serverFP; LilXML *XMLParser; TQSocketNotifier *sNotifier; - QString host; - QString port; + TQString host; + TQString port; int dispatchCommand (XMLEle *root, char errmsg[]); diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui index 54dc4b3f..f1181256 100644 --- a/kstars/kstars/devmanager.ui +++ b/kstars/kstars/devmanager.ui @@ -1,10 +1,10 @@ devManager - + devManager - + 0 0 @@ -22,11 +22,11 @@ unnamed - + ConfTabWidget - + tab @@ -51,7 +51,7 @@ - Status + tqStatus true @@ -104,14 +104,14 @@ 0 - + 0 125 - + serverLogGroup @@ -122,11 +122,11 @@ unnamed - + serverLogText - + 0 90 @@ -144,7 +144,7 @@ - + indiModeGroup @@ -155,7 +155,7 @@ unnamed - + localR @@ -166,7 +166,7 @@ true - + serverR @@ -176,9 +176,9 @@ - + - layout6 + tqlayout6 @@ -216,7 +216,7 @@ Expanding - + 61 20 @@ -227,7 +227,7 @@ - + TabPage @@ -241,7 +241,7 @@ - Status + tqStatus true @@ -276,15 +276,15 @@ clientListView - + - layout5_2 + tqlayout5_2 unnamed - + groupBox1_2 @@ -321,7 +321,7 @@ - + groupBox2_2 @@ -366,7 +366,7 @@ Expanding - + 20 31 @@ -378,9 +378,9 @@ - + - layout6 + tqlayout6 @@ -396,14 +396,14 @@ Expanding - + 289 20 - + cancelB @@ -426,7 +426,7 @@ close() - + klistview.h kpushbutton.h diff --git a/kstars/kstars/dms.cpp b/kstars/kstars/dms.cpp index 724f9af2..587cca2c 100644 --- a/kstars/kstars/dms.cpp +++ b/kstars/kstars/dms.cpp @@ -59,19 +59,19 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { //remove any instances of unit characters. //h, d, m, s, ', ", or the degree symbol (ASCII 176) - entry.replace( TQRegExp("h"), "" ); - entry.replace( TQRegExp("d"), "" ); - entry.replace( TQRegExp("m"), "" ); - entry.replace( TQRegExp("s"), "" ); + entry.tqreplace( TQRegExp("h"), "" ); + entry.tqreplace( TQRegExp("d"), "" ); + entry.tqreplace( TQRegExp("m"), "" ); + entry.tqreplace( TQRegExp("s"), "" ); TQString sdeg; sdeg.sprintf("%c", 176); - entry.replace( TQRegExp(sdeg), "" ); - entry.replace( TQRegExp("\'"), "" ); - entry.replace( TQRegExp("\""), "" ); + entry.tqreplace( TQRegExp(sdeg), "" ); + entry.tqreplace( TQRegExp("\'"), "" ); + entry.tqreplace( TQRegExp("\""), "" ); //Account for localized decimal-point settings //TQString::toDouble() requires that the decimal symbol is "." - entry.replace( KGlobal::locale()->decimalSymbol(), "." ); + entry.tqreplace( KGlobal::locale()->decimalSymbol(), "." ); //empty entry returns false if ( entry.isEmpty() ) { @@ -99,7 +99,7 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { TQStringList fields; //check for colon-delimiters or space-delimiters - if ( entry.contains(':') ) + if ( entry.tqcontains(':') ) fields = TQStringList::split( ':', entry ); else fields = TQStringList::split( " ", entry ); @@ -120,8 +120,8 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { else { double mx = fields[1].toDouble( &checkValue ); if ( checkValue ) { - fields[1] = TQString("%1").arg( int(mx) ); - fields.append( TQString("%1").arg( int( 60.0*(mx - int(mx)) ) ) ); + fields[1] = TQString("%1").tqarg( int(mx) ); + fields.append( TQString("%1").tqarg( int( 60.0*(mx - int(mx)) ) ) ); } else { setD( 0.0 ); return false; diff --git a/kstars/kstars/dms.h b/kstars/kstars/dms.h index 7cbbaa22..165b5ce1 100644 --- a/kstars/kstars/dms.h +++ b/kstars/kstars/dms.h @@ -313,7 +313,7 @@ public: void setRadians( const double &a ); /**return the equivalent angle between 0 and 360 degrees. - *@warning does not change the value of the parent angle itself. + *@warning does not change the value of the tqparent angle itself. */ const dms reduce( void ) const; diff --git a/kstars/kstars/dmsbox.cpp b/kstars/kstars/dmsbox.cpp index 1857b1bf..9faa30d5 100644 --- a/kstars/kstars/dmsbox.cpp +++ b/kstars/kstars/dmsbox.cpp @@ -26,8 +26,8 @@ #include #include -dmsBox::dmsBox(TQWidget *parent, const char *name, bool dg) - : KLineEdit(parent,name), EmptyFlag(true) { +dmsBox::dmsBox(TQWidget *tqparent, const char *name, bool dg) + : KLineEdit(tqparent,name), EmptyFlag(true) { setMaxLength(14); setMaximumWidth(160); setDegType( dg ); diff --git a/kstars/kstars/dmsbox.h b/kstars/kstars/dmsbox.h index c98bc2c1..81590a4e 100644 --- a/kstars/kstars/dmsbox.h +++ b/kstars/kstars/dmsbox.h @@ -42,16 +42,17 @@ class dmsBox : public KLineEdit { Q_OBJECT -Q_PROPERTY (bool degType READ degType WRITE setDegType) + TQ_OBJECT +TQ_PROPERTY (bool degType READ degType WRITE setDegType) public: /**Constructor for the dmsBox object. - *@param parent pointer to the parent QWidget + *@param tqparent pointer to the tqparent TQWidget *@param ni the name of the object *@param deg if TRUE use deg/arcmin/arcsec; otherwise * use hours/min/sec. */ - dmsBox(TQWidget *parent, const char *ni=0, bool deg=TRUE); + dmsBox(TQWidget *tqparent, const char *ni=0, bool deg=TRUE); /**Destructor (empty)*/ ~dmsBox(); diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp index 74cd169f..bed2895b 100644 --- a/kstars/kstars/draglistbox.cpp +++ b/kstars/kstars/draglistbox.cpp @@ -21,8 +21,8 @@ #include "draglistbox.h" -DragListBox::DragListBox( TQWidget *parent, const char *name, WFlags f ) - : KListBox( parent, name, f ) { +DragListBox::DragListBox( TQWidget *tqparent, const char *name, WFlags f ) + : KListBox( tqparent, name, f ) { setAcceptDrops( TRUE ); dragging = FALSE; @@ -36,7 +36,7 @@ void DragListBox::dragEnterEvent( TQDragEnterEvent *evt ) evt->accept(); } -bool DragListBox::contains( const TQString &s ) const { +bool DragListBox::tqcontains( const TQString &s ) const { for ( uint i=0; i class TQDragEnterEvent; -class QDragDropEvent; +class TQDragDropEvent; /**@class DragListBox *@short Extension of KListBox that allows Drag-and-Drop @@ -32,17 +32,18 @@ class QDragDropEvent; class DragListBox : public KListBox { Q_OBJECT + TQ_OBJECT public: /**@short Default constructor */ - DragListBox( TQWidget *parent = 0, const char *name = 0, WFlags = 0 ); + DragListBox( TQWidget *tqparent = 0, const char *name = 0, WFlags = 0 ); /**@short Default destructor */ ~DragListBox(); int ignoreIndex() const { return IgnoreIndex; } - bool contains( const TQString &s ) const; + bool tqcontains( const TQString &s ) const; void dragEnterEvent( TQDragEnterEvent *evt ); void dropEvent( TQDropEvent *evt ); diff --git a/kstars/kstars/filesource.cpp b/kstars/kstars/filesource.cpp index 8e38d9a4..8a1854a4 100644 --- a/kstars/kstars/filesource.cpp +++ b/kstars/kstars/filesource.cpp @@ -27,7 +27,7 @@ FileSource::FileSource(KStarsData *ksdata, float magnitude) // kdDebug() << "count()=" << data->starList.count() << endl; fileNumber = ksdata->starList.count() / 1000 + 1; lineNumber = ksdata->starList.count() % 1000; - // the first file contains 12 comment lines at the beginning which must skipped + // the first file tqcontains 12 comment lines at the beginning which must skipped if (fileNumber == 1) { lineNumber += 12; } // kdDebug() << "fileNumber=" << fileNumber << " lineNumber=" << lineNumber << endl; diff --git a/kstars/kstars/filesource.h b/kstars/kstars/filesource.h index d9ab95d9..7de46055 100644 --- a/kstars/kstars/filesource.h +++ b/kstars/kstars/filesource.h @@ -90,7 +90,7 @@ class FileSource : public TQDataSource { *A low value needs longer to reload data, but it doesn't interrupt the *main event loop (it's smoother). *But it's important to know that 500 lines to read is very fast, but - *appending to QList in StarDataSink will take the most time and this + *appending to TQList in StarDataSink will take the most time and this *will also defined with this value. */ #define maxLines 500 diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index 29dfa6cb..c7719cc4 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -33,8 +33,8 @@ #include "objectnamelist.h" -FindDialog::FindDialog( TQWidget* parent ) : - KDialogBase( KDialogBase::Plain, i18n( "Find Object" ), Ok|Cancel, Ok, parent ), +FindDialog::FindDialog( TQWidget* tqparent ) : + KDialogBase( KDialogBase::Plain, i18n( "Find Object" ), Ok|Cancel, Ok, tqparent ), vlay(0), hlay(0), SearchList(0), SearchBox(0), filterTypeLabel(0), filterType(0), currentitem(0) { @@ -48,7 +48,7 @@ FindDialog::FindDialog( TQWidget* parent ) : SearchBox = new TQLineEdit( page, "SearchBox" ); filterTypeLabel = new TQLabel( page, "filterTypeLabel" ); - filterTypeLabel->setAlignment( AlignRight ); + filterTypeLabel->tqsetAlignment( AlignRight ); filterTypeLabel->setText( i18n( "Filter by type: " ) ); filterType = new TQComboBox( page, "filterType" ); @@ -73,7 +73,7 @@ FindDialog::FindDialog( TQWidget* parent ) : SearchList->setVScrollBarMode( TQListBox::AlwaysOn ); SearchList->setHScrollBarMode( TQListBox::AlwaysOff ); -//Pack Widgets into layout manager +//Pack Widgets into tqlayout manager hlay->addWidget( filterTypeLabel, 0, 0 ); hlay->addWidget( filterType, 0, 0 ); @@ -108,13 +108,13 @@ FindDialog::~FindDialog() { } void FindDialog::init() { - SearchBox->clear(); // QLineEdit + SearchBox->clear(); // TQLineEdit filterType->setCurrentItem(0); // show all types of objects filter(); } void FindDialog::filter() { //Filter the list of names with the string in the SearchBox - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); SearchList->clear(); ObjectNameList &ObjNames = p->data()->ObjNames; @@ -132,13 +132,13 @@ void FindDialog::filter() { //Filter the list of names with the string in the S } } setListItemEnabled(); // Automatically highlight first item - SearchBox->setFocus(); // set cursor to QLineEdit + SearchBox->setFocus(); // set cursor to TQLineEdit } void FindDialog::filterByType() { - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); - SearchList->clear(); // QListBox + SearchList->clear(); // TQListBox TQString searchFor = SearchBox->text().lower(); // search string ObjectNameList &ObjNames = p->data()->ObjNames; @@ -158,7 +158,7 @@ void FindDialog::filterByType() { } setListItemEnabled(); // Automatically highlight first item - SearchBox->setFocus(); // set cursor to QLineEdit + SearchBox->setFocus(); // set cursor to TQLineEdit } void FindDialog::setListItemEnabled() { @@ -169,7 +169,7 @@ void FindDialog::setListItemEnabled() { void FindDialog::updateSelection (TQListBoxItem *it) { currentitem = (SkyObjectNameListItem *) it; - SearchBox->setFocus(); // set cursor to QLineEdit + SearchBox->setFocus(); // set cursor to TQLineEdit } void FindDialog::setFilter( int f ) { @@ -198,7 +198,7 @@ void FindDialog::setFilter( int f ) { void FindDialog::slotOk() { //If no valid object selected, show a sorry-box. Otherwise, emit accept() if ( currentItem() == 0 ) { - TQString message = i18n( "No object named %1 found." ).arg( SearchBox->text() ); + TQString message = i18n( "No object named %1 found." ).tqarg( SearchBox->text() ); KMessageBox::sorry( 0, message, i18n( "Bad object name" ) ); } else { accept(); diff --git a/kstars/kstars/finddialog.h b/kstars/kstars/finddialog.h index 71059da0..b3e559d4 100644 --- a/kstars/kstars/finddialog.h +++ b/kstars/kstars/finddialog.h @@ -35,9 +35,9 @@ class TQListBoxItem; class SkyObjectNameListItem; /**@class FindDialog - *Dialog window for finding SkyObjects by name. The dialog contains + *Dialog window for finding SkyObjects by name. The dialog tqcontains *a TQListBox showing the list of named objects, a TQLineEdit for filtering - *the list by name, and a QCombobox for filtering the list by object type. + *the list by name, and a TQCombobox for filtering the list by object type. * *@short Find Object Dialog *@author Jason Harris @@ -46,12 +46,13 @@ class SkyObjectNameListItem; class FindDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: -/**Constructor. Creates all widgets and packs them in QLayouts. Connects +/**Constructor. Creates all widgets and packs them in TQLayouts. Connects *Signals and Slots. Runs initObjectList(). */ - FindDialog( TQWidget* parent = 0 ); + FindDialog( TQWidget* tqparent = 0 ); /**Destructor */ diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui index 2a071439..d88eda84 100644 --- a/kstars/kstars/fitsheaderdialog.ui +++ b/kstars/kstars/fitsheaderdialog.ui @@ -1,10 +1,10 @@ fitsHeaderDialog - + fitsHeaderDialog - + 0 0 @@ -82,14 +82,14 @@ Expanding - + 300 20 - + closeB @@ -113,5 +113,5 @@ close() - + diff --git a/kstars/kstars/fitshistogram.cpp b/kstars/kstars/fitshistogram.cpp index 3d28de46..ddeb1897 100644 --- a/kstars/kstars/fitshistogram.cpp +++ b/kstars/kstars/fitshistogram.cpp @@ -37,9 +37,9 @@ - FITSHistogram::FITSHistogram(TQWidget *parent, const char * name) : histDialog(parent, name) + FITSHistogram::FITSHistogram(TQWidget *tqparent, const char * name) : histDialog(tqparent, name) { - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; setModal(false); @@ -54,7 +54,7 @@ type = 0; napply=0; - histFrame->setCursor(Qt::CrossCursor); + histFrame->setCursor(TQt::CrossCursor); histFrame->setMouseTracking(true); setMouseTracking(true); @@ -75,14 +75,14 @@ void FITSHistogram::updateBoxes() { if (minSlider->value() == BARS) - minOUT->setText(TQString("%1").arg((int) viewer->stats.max)); + minOUT->setText(TQString("%1").tqarg((int) viewer->stats.max)); else - minOUT->setText(TQString("%1").arg( (int) ( ceil (minSlider->value() * binSize) + viewer->stats.min))); + minOUT->setText(TQString("%1").tqarg( (int) ( ceil (minSlider->value() * binSize) + viewer->stats.min))); if (maxSlider->value() == BARS) - maxOUT->setText(TQString("%1").arg((int) viewer->stats.max)); + maxOUT->setText(TQString("%1").tqarg((int) viewer->stats.max)); else - maxOUT->setText(TQString("%1").arg( (int) ( ceil (maxSlider->value() * binSize) + viewer->stats.min))); + maxOUT->setText(TQString("%1").tqarg( (int) ( ceil (maxSlider->value() * binSize) + viewer->stats.min))); update(); } @@ -165,7 +165,7 @@ void FITSHistogram::constructHistogram(float * buffer) kdDebug() << "Maximum height is " << maxHeight << " -- binsize " << binSize << endl; histogram = new TQPixmap(500, 150, 1); - histogram->fill(Qt::black); + histogram->fill(TQt::black); TQPainter p(histogram); TQPen pen( white, 1); p.setPen(pen); @@ -217,9 +217,9 @@ void FITSHistogram::updateIntenFreq(int x) int index = (int) ceil(x * binSize); - intensityOUT->setText(TQString("%1").arg((int) ( index + viewer->stats.min))); + intensityOUT->setText(TQString("%1").tqarg((int) ( index + viewer->stats.min))); - frequencyOUT->setText(TQString("%1").arg(histArray[x])); + frequencyOUT->setText(TQString("%1").tqarg(histArray[x])); } @@ -234,9 +234,9 @@ int FITSHistogram::findMax() return max; } -FITSHistogramCommand::FITSHistogramCommand(TQWidget * parent, FITSHistogram *inHisto, int newType, int lmin, int lmax) +FITSHistogramCommand::FITSHistogramCommand(TQWidget * tqparent, FITSHistogram *inHisto, int newType, int lmin, int lmax) { - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; type = newType; histo = inHisto; oldImage = new TQImage(); diff --git a/kstars/kstars/fitshistogram.h b/kstars/kstars/fitshistogram.h index fe30c2d1..2d8fdfd4 100644 --- a/kstars/kstars/fitshistogram.h +++ b/kstars/kstars/fitshistogram.h @@ -29,9 +29,10 @@ class FITSHistogram : public histDialog { Q_OBJECT + TQ_OBJECT public: - FITSHistogram(TQWidget *parent, const char * name = 0); + FITSHistogram(TQWidget *tqparent, const char * name = 0); ~FITSHistogram(); void constructHistogram(float *buffer); @@ -63,7 +64,7 @@ class FITSHistogramCommand : public KCommand { public: - FITSHistogramCommand(TQWidget * parent, FITSHistogram *inHisto, int newType, int lmin, int lmax); + FITSHistogramCommand(TQWidget * tqparent, FITSHistogram *inHisto, int newType, int lmin, int lmax); ~FITSHistogramCommand(); void execute(); diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp index d5d5ce3c..226cc74a 100644 --- a/kstars/kstars/fitsimage.cpp +++ b/kstars/kstars/fitsimage.cpp @@ -52,7 +52,7 @@ /* Load info */ typedef struct { - uint replace; /* replacement for blank/NaN-values */ + uint tqreplace; /* replacement for blank/NaN-values */ uint use_datamin;/* Use DATAMIN/MAX-scaling if possible */ uint compose; /* compose images with naxis==3 */ } FITSLoadVals; @@ -64,9 +64,9 @@ static FITSLoadVals plvals = 0 /* Dont compose images */ }; -FITSImage::FITSImage(TQWidget * parent, const char * name) : TQScrollView(parent, name), zoomFactor(1.2) +FITSImage::FITSImage(TQWidget * tqparent, const char * name) : TQScrollView(tqparent, name), zoomFactor(1.2) { - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; reducedImgBuffer = NULL; displayImage = NULL; @@ -74,9 +74,9 @@ FITSImage::FITSImage(TQWidget * parent, const char * name) : TQScrollView(parent addChild(imgFrame); currentZoom = 0.0; - grayTable=new QRgb[256]; + grayTable=new TQRgb[256]; for (int i=0;i<256;i++) - grayTable[i]=qRgb(i,i,i); + grayTable[i]=tqRgb(i,i,i); viewport()->setMouseTracking(true); imgFrame->setMouseTracking(true); @@ -161,14 +161,14 @@ void FITSImage::contentsMouseMoveEvent ( TQMouseEvent * e ) if (validPoint) { - viewer->statusBar()->changeItem(TQString("%1 , %2").arg( (int) x).arg( (int) y), 0); + viewer->statusBar()->changeItem(TQString("%1 , %2").tqarg( (int) x).tqarg( (int) y), 0); viewer->statusBar()->changeItem( KGlobal::locale()->formatNumber( viewer->imgBuffer[(int) (y * width + x)], 3 ), 1 ); - setCursor(Qt::CrossCursor); + setCursor(TQt::CrossCursor); } else { //viewer->statusBar()->changeItem(TQString("(X,Y)"), 0); - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); } } @@ -299,7 +299,7 @@ int FITSImage::loadFits (const char *filename) } trans.datamin = 0.0; trans.datamax = 255.0; - trans.replacement = plvals.replace; + trans.replacement = plvals.tqreplace; trans.dsttyp = 'c'; //displayImage->create(width, height, 32); @@ -338,7 +338,7 @@ int FITSImage::loadFits (const char *filename) //for (j=0; j < width; j++) //{ //val = dest[j]; - //displayImage->setPixel(j, i, qRgb(val, val, val)); + //displayImage->setPixel(j, i, tqRgb(val, val, val)); //} for (j = 0 ; j < width; j++) displayImage->setPixel(j, i, dest[j]); @@ -459,7 +459,7 @@ void FITSImage::fitsZoomDefault() } -FITSFrame::FITSFrame(FITSImage * img, TQWidget * parent, const char * name) : TQFrame(parent, name, Qt::WNoAutoErase) +FITSFrame::FITSFrame(FITSImage * img, TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase) { image = img; setPaletteBackgroundColor(image->viewport()->paletteBackgroundColor()); diff --git a/kstars/kstars/fitsimage.h b/kstars/kstars/fitsimage.h index 72efc408..d0befa9b 100644 --- a/kstars/kstars/fitsimage.h +++ b/kstars/kstars/fitsimage.h @@ -44,6 +44,7 @@ class FITSFrame; class FITSImage : public TQScrollView { Q_OBJECT + TQ_OBJECT public: @@ -56,7 +57,7 @@ class FITSImage : public TQScrollView { friend class FITSChangeCommand; friend class FITSProcessCommand; - FITSImage(TQWidget * parent, const char * name = 0); + FITSImage(TQWidget * tqparent, const char * name = 0); ~FITSImage(); enum scaleType { FITSAuto = 0 , FITSLinear, FITSLog, FITSSqrt, FITSCustom }; @@ -73,7 +74,7 @@ class FITSImage : public TQScrollView { void clearMem(); private: - FITSViewer *viewer; /* parent FITSViewer */ + FITSViewer *viewer; /* tqparent FITSViewer */ FITSFrame *imgFrame; /* Frame holding the image */ TQImage *displayImage; /* FITS image that is displayed in the GUI */ TQImage *templateImage; /* backup image for currentImage */ @@ -85,7 +86,7 @@ class FITSImage : public TQScrollView { double currentWidth,currentHeight; /* Current width and height due to zoom */ const double zoomFactor; /* Image zoom factor */ double currentZoom; /* Current Zoom level */ - QRgb *grayTable; + TQRgb *grayTable; unsigned char *reducedImgBuffer; /* scaled image buffer (0-255) range */ @@ -105,12 +106,13 @@ class FITSImage : public TQScrollView { void fitsZoomDefault(); }; -class FITSFrame : public QFrame +class FITSFrame : public TQFrame { Q_OBJECT + TQ_OBJECT public: - FITSFrame(FITSImage * img, TQWidget * parent = 0, const char * name = 0); + FITSFrame(FITSImage * img, TQWidget * tqparent = 0, const char * name = 0); ~FITSFrame(); private: diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp index 6a4d7fcd..ebb9e11d 100644 --- a/kstars/kstars/fitsprocess.cpp +++ b/kstars/kstars/fitsprocess.cpp @@ -31,13 +31,13 @@ #define ELEM_SWAP(a,b) { register float t=(a);(a)=(b);(b)=t; } - FITSProcess::FITSProcess(FITSViewer *parent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode) + FITSProcess::FITSProcess(FITSViewer *tqparent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode) { float * buffer = NULL; darkCombineMode = darkMode; flatCombineMode = flatMode; darkflatCombineMode = darkflatMode; - viewer = parent; + viewer = tqparent; finalDark = NULL; finalFlat = NULL; finalDarkFlat = NULL; @@ -311,10 +311,10 @@ void FITSProcess::reduce() } -FITSProcessCommand::FITSProcessCommand(FITSViewer *parent) +FITSProcessCommand::FITSProcessCommand(FITSViewer *tqparent) { - viewer = parent; + viewer = tqparent; oldImage = new TQImage(); // TODO apply maximum compression against this buffer buffer = (float *) malloc (viewer->image->width * viewer->image->height * sizeof(float)); diff --git a/kstars/kstars/fitsprocess.h b/kstars/kstars/fitsprocess.h index da0e597e..0917148f 100644 --- a/kstars/kstars/fitsprocess.h +++ b/kstars/kstars/fitsprocess.h @@ -36,7 +36,7 @@ class TQImage; class FITSProcess { public: - FITSProcess(FITSViewer *parent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode); + FITSProcess(FITSViewer *tqparent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode); ~FITSProcess(); TQPtrList darkFrames; @@ -67,7 +67,7 @@ class FITSProcessCommand : public KCommand { public: - FITSProcessCommand(FITSViewer *parent); + FITSProcessCommand(FITSViewer *tqparent); ~FITSProcessCommand(); void execute(); diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index 2d0ca2ed..ccf0f75d 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -91,8 +91,8 @@ extern int fits_ieee64_motorola; uc[4] = p[3]; uc[5] = p[2]; uc[6] = p[1]; uc[7] = p[0]; \ val = *(FITS_BITPIXM64 *)uc; } else val = *(FITS_BITPIXM64 *)p; } -FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) - : KMainWindow (parent, name) +FITSViewer::FITSViewer (const KURL *url, TQWidget *tqparent, const char *name) + : KMainWindow (tqparent, name) { image = NULL; currentURL = *url; @@ -118,7 +118,7 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) statusBar()->insertItem("", 2); statusBar()->setItemFixed(2, 100); statusBar()->insertItem(i18n("Welcome to KStars FITS Viewer"), 3, 1, true); - statusBar()->setItemAlignment(3 , Qt::AlignLeft); + statusBar()->setItemAlignment(3 , TQt::AlignLeft); /* FITS initializations */ if (!initFITS()) @@ -131,41 +131,41 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) if (KSUtils::openDataFile( tempFile, "imgreduction.png" ) ) { - new KAction( i18n("Image Reduction"), tempFile.name(), KShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new KAction( i18n("Image Reduction"), tempFile.name(), KShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); tempFile.close(); } else - new KAction( i18n("Image Reduction"), "blend", KShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new KAction( i18n("Image Reduction"), "blend", KShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); /*if (KSUtils::openDataFile( tempFile, "bricon.png" ) ) { - new KAction( i18n("Brightness/Contrast"), tempFile.name(), KShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new KAction( i18n("Brightness/Contrast"), tempFile.name(), KShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); tempFile.close(); } else*/ - new KAction( i18n("Brightness/Contrast"), "contrast+", KShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new KAction( i18n("Brightness/Contrast"), "contrast+", KShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); if (KSUtils::openDataFile( tempFile, "histogram.png" ) ) { - new KAction ( i18n("Histogram"), tempFile.name(), KShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new KAction ( i18n("Histogram"), tempFile.name(), KShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); tempFile.close(); } else - new KAction ( i18n("Histogram"), "wizard", KShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new KAction ( i18n("Histogram"), "wizard", KShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection()); - KStdAction::copy(this, TQT_SLOT(fitsCOPY()), actionCollection()); - KStdAction::zoomIn(image, TQT_SLOT(fitsZoomIn()), actionCollection()); - KStdAction::zoomOut(image, TQT_SLOT(fitsZoomOut()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); + KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(fitsCOPY()), actionCollection()); + KStdAction::zoomIn(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomIn()), actionCollection()); + KStdAction::zoomOut(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomOut()), actionCollection()); new KAction( i18n( "&Default Zoom" ), "viewmagfit.png", KShortcut( "Ctrl+D" ), - image, TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); - new KAction( i18n( "Statistics"), "sum", 0, this, TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats"); - new KAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, this, TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor"); + TQT_TQOBJECT(image), TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); + new KAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats"); + new KAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor"); - /* Create GUI */ + /* Create GUI */ createGUI("fitsviewer.rc"); /* initially resize in accord with KDE rules */ @@ -311,7 +311,7 @@ float * FITSViewer::loadData(const char *filename, float *buffer) if (fread(tempData, 1, width * height * bpp, ifp->fp) != (unsigned int) (width * height * bpp)) { - KMessageBox::error(0, i18n("Unable to read FITS data from file. %1.\n").arg(strerror(errno))); + KMessageBox::error(0, i18n("Unable to read FITS data from file. %1.\n").tqarg(strerror(errno))); return (NULL); } @@ -388,7 +388,7 @@ void FITSViewer::calculateStats() kdDebug() << "Average: " << stats.average << " - stddev: " << stats.stddev << endl; kdDebug() << "Width: " << stats.width << " - Height " << stats.height << " - bitpix " << stats.bitpix << endl;*/ - statusBar()->changeItem( TQString("%1 x %2").arg( (int) stats.width).arg( (int) stats.height), 2); + statusBar()->changeItem( TQString("%1 x %2").tqarg( (int) stats.width).tqarg( (int) stats.height), 2); } @@ -549,13 +549,13 @@ void FITSViewer::fileSave() currentURL = backupCurrent; return; } - if (currentURL.path().contains('.') == 0) currentURL.setPath(currentURL.path() + ".fits"); + if (currentURL.path().tqcontains('.') == 0) currentURL.setPath(currentURL.path() + ".fits"); if (TQFile::exists(currentURL.path())) { - int r=KMessageBox::warningContinueCancel(static_cast(parent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg(currentURL.fileName()), + "Overwrite it?" ).tqarg(currentURL.fileName()), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); @@ -588,8 +588,8 @@ void FITSViewer::fileSave() { recordList = record[j]; - if ( (index = recordList.find("BITPIX")) != -1) - recordList.replace(index, FITS_CARD_SIZE, bitpixRec); + if ( (index = recordList.tqfind("BITPIX")) != -1) + recordList.tqreplace(index, FITS_CARD_SIZE, bitpixRec); fwrite(recordList.ascii(), 1, FITS_RECORD_SIZE, ifp->fp); } @@ -692,7 +692,7 @@ void FITSViewer::fileSave() } else { - TQString message = i18n( "Invalid URL: %1" ).arg( currentURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); } @@ -880,15 +880,15 @@ void FITSViewer::fitsStatistics() calculateStats(); - stat.widthOUT->setText(TQString("%1").arg(stats.width)); - stat.heightOUT->setText(TQString("%1").arg(stats.height)); - stat.bitpixOUT->setText(TQString("%1").arg(stats.bitpix)); - stat.maxOUT->setText(TQString("%1").arg(stats.max)); - stat.minOUT->setText(TQString("%1").arg(stats.min)); - stat.atMaxOUT->setText(TQString("%1").arg(stats.maxAt)); - stat.atMinOUT->setText(TQString("%1").arg(stats.minAt)); - stat.meanOUT->setText(TQString("%1").arg(stats.average)); - stat.stddevOUT->setText(TQString("%1").arg(stats.stddev)); + stat.widthOUT->setText(TQString("%1").tqarg(stats.width)); + stat.heightOUT->setText(TQString("%1").tqarg(stats.height)); + stat.bitpixOUT->setText(TQString("%1").tqarg(stats.bitpix)); + stat.maxOUT->setText(TQString("%1").tqarg(stats.max)); + stat.minOUT->setText(TQString("%1").tqarg(stats.min)); + stat.atMaxOUT->setText(TQString("%1").tqarg(stats.maxAt)); + stat.atMinOUT->setText(TQString("%1").tqarg(stats.minAt)); + stat.meanOUT->setText(TQString("%1").tqarg(stats.average)); + stat.stddevOUT->setText(TQString("%1").tqarg(stats.stddev)); stat.exec(); @@ -903,7 +903,7 @@ void FITSViewer::fitsHeader() fitsHeaderDialog header(this); header.headerView->setSorting(-1); - header.headerView->setColumnAlignment(1, Qt::AlignHCenter); + header.headerView->setColumnAlignment(1, TQt::AlignHCenter); for (unsigned int i=0; i < record.count(); i++) { @@ -914,14 +914,14 @@ void FITSViewer::fitsHeader() { property = recordList.left(FITS_CARD_SIZE); - equal = property.find('='); + equal = property.tqfind('='); if (equal == -1) { - if (property.contains(" ") != FITS_CARD_SIZE) + if (property.tqcontains(" ") != FITS_CARD_SIZE) cards << property << "" << ""; recordList.remove(0, FITS_CARD_SIZE); - if (property.find("END") != -1) + if (property.tqfind("END") != -1) break; else continue; @@ -929,11 +929,11 @@ void FITSViewer::fitsHeader() cards << property.left(equal); - slash = property.find("'"); + slash = property.tqfind("'"); if (slash != -1) - slash = property.find("'", slash + 1) + 1; + slash = property.tqfind("'", slash + 1) + 1; else - slash = property.find('/') - 1; + slash = property.tqfind('/') - 1; cards << property.mid(equal + 2, slash - (equal + 2)).simplifyWhiteSpace().remove("'"); cards << property.mid(slash + 1, FITS_CARD_SIZE - (slash + 1)).simplifyWhiteSpace(); @@ -952,9 +952,9 @@ void FITSViewer::fitsHeader() } -FITSChangeCommand::FITSChangeCommand(TQWidget * parent, int inType, TQImage* newIMG, TQImage *oldIMG) +FITSChangeCommand::FITSChangeCommand(TQWidget * tqparent, int inType, TQImage* newIMG, TQImage *oldIMG) { - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; newImage = new TQImage(); oldImage = new TQImage(); *newImage = newIMG->copy(); diff --git a/kstars/kstars/fitsviewer.h b/kstars/kstars/fitsviewer.h index f630654a..37f1167c 100644 --- a/kstars/kstars/fitsviewer.h +++ b/kstars/kstars/fitsviewer.h @@ -47,6 +47,7 @@ class FITSHistogram; class FITSViewer : public KMainWindow { Q_OBJECT + TQ_OBJECT public: @@ -59,7 +60,7 @@ class FITSViewer : public KMainWindow { friend class FITSProcessCommand; /**Constructor. */ - FITSViewer (const KURL *imageName, TQWidget *parent, const char *name = 0); + FITSViewer (const KURL *imageName, TQWidget *tqparent, const char *name = 0); ~FITSViewer(); @@ -124,7 +125,7 @@ class FITSViewer : public KMainWindow { class FITSChangeCommand : public KCommand { public: - FITSChangeCommand(TQWidget * parent, int inType, TQImage *newIMG, TQImage *oldIMG); + FITSChangeCommand(TQWidget * tqparent, int inType, TQImage *newIMG, TQImage *oldIMG); ~FITSChangeCommand(); void execute(); diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 4f243f0e..600b34a5 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -32,8 +32,8 @@ #include "dmsbox.h" #include "focusdialog.h" -FocusDialog::FocusDialog( TQWidget *parent ) - : KDialogBase( KDialogBase::Plain, i18n( "Set Focus Manually" ), Ok|Cancel, Ok, parent ) { +FocusDialog::FocusDialog( TQWidget *tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "Set Focus Manually" ), Ok|Cancel, Ok, tqparent ) { Point = 0; //initialize pointer to null UsedAltAz = false; //assume RA/Dec by default @@ -42,7 +42,7 @@ FocusDialog::FocusDialog( TQWidget *parent ) setMainWidget(page); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); fdlg = new FocusDialogDlg(page); - fdlg->epochName->setValidator( new KDoubleValidator( fdlg->epochName ) ); + fdlg->epochName->setValidator( new KDoubleValidator( TQT_TQOBJECT(fdlg->epochName) ) ); vlay->addWidget( fdlg ); connect( fdlg->raBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); @@ -81,7 +81,7 @@ void FocusDialog::validatePoint() { dms dec( fdlg->decBox->createDms( true, &decOk ) ); TQString message; - KStars *ks = (KStars*) parent(); + KStars *ks = (KStars*) tqparent(); if ( raOk && decOk ) { //make sure values are in valid range @@ -97,7 +97,7 @@ void FocusDialog::validatePoint() { Point = new SkyPoint( ra, dec ); double epoch0 = getEpoch( fdlg->epochName->text() ); long double jd0 = epochToJd ( epoch0 ); - Point->apparentCoord(jd0, ks->data()->ut().djd() ); + Point->aptqparentCoord(jd0, ks->data()->ut().djd() ); TQDialog::accept(); } else { @@ -152,7 +152,7 @@ long double FocusDialog::epochToJd (double epoch) { } -TQSize FocusDialog::sizeHint() const +TQSize FocusDialog::tqsizeHint() const { return TQSize(240,210); } diff --git a/kstars/kstars/focusdialog.h b/kstars/kstars/focusdialog.h index 6ca6858d..9b4d4807 100644 --- a/kstars/kstars/focusdialog.h +++ b/kstars/kstars/focusdialog.h @@ -35,9 +35,10 @@ class FocusDialogDlg; class FocusDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - FocusDialog( TQWidget *parent=0 ); + FocusDialog( TQWidget *tqparent=0 ); /**Destructor (empty). */ ~FocusDialog(); @@ -46,7 +47,7 @@ public: SkyPoint* point() const { return Point; } /**@return suggested size of focus window. */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /**@return whether user set the AltAz coords */ bool usedAltAz() const { return UsedAltAz; } diff --git a/kstars/kstars/focusdialogdlg.ui b/kstars/kstars/focusdialogdlg.ui index f1cc486c..97600b6a 100644 --- a/kstars/kstars/focusdialogdlg.ui +++ b/kstars/kstars/focusdialogdlg.ui @@ -1,10 +1,10 @@ FocusDialogDlg - + FocusDialogDlg - + 0 0 @@ -16,11 +16,11 @@ unnamed - + fdTab - + rdTab @@ -31,7 +31,7 @@ unnamed - + raLabel @@ -61,7 +61,7 @@ Enter new Declination - + decLabel @@ -69,7 +69,7 @@ New dec: - + epochLabel @@ -77,7 +77,7 @@ Epoch: - + epochName @@ -90,7 +90,7 @@ - + aaTab @@ -101,7 +101,7 @@ unnamed - + azLabel @@ -109,7 +109,7 @@ New azimuth: - + altLabel @@ -138,7 +138,7 @@ Expanding - + 20 20 @@ -155,7 +155,7 @@ Expanding - + 20 20 @@ -201,10 +201,10 @@ 789c6dd7594f23471007f0f7fd14d6d6db2aaaf58c3db647511eb831b7317794879ac30760cc61c010e5bba7dcf5af5688167664fdb66bbaababbb67cccf1f8dab93c3c68f9fdf5e16b298968d7222cf8d1fd5eb6cf6f1e75f7ffcfded7b9a3656ff9aad46fafdb76fdf078b46d9389a3fd42bf04841699e964933b830b79a7019dd0b96955b895b5a703bcd572e08eea576ff6570ae0eedd477b792103f854b8b2fc6d1163f77237e646e37113f89b6f8307e3bf1785a8b0eedbc696eb7ad9db7e01ee6476ee4ffe0c6fd158c7c69182cde4eec6e87fea50dfbf8176e6ba7d07f96669999cfa325ccaf862bcc97a36dbccf60f178cee11cde706761f16917ae30fe6b7488a7851bf14d7327417f676eb4f756eea41e2f57e6d83e83919f6cba117f04235fd9765b3b0fa36dfc398cf973edc67a6fb951ffe768ab6765ee26b8dff213ef5f4630e2b9e7463ea7ee8ee5ff60ee2618af8eb6fe3238437eb91bf1299cdbfacad3cadd5617f5a11738c7fe4adcb8ffd68d7aeec15e8fc3683b9f62ee2518ef33dafa3f75e3bc957086f86eb4d56f3db8e8e6dd56f01a5cc1bbe65e629673d8ebd18d0efdc9058cf9f2c08df9e630ce037db8719ec37c7a9a7fb708f10267b65e7cef46fb3e9ca3fd23dad6ef0cf67abe99f304f95ec3a8871cbb71be52d8d777e8b6fee412f6f958be3adf5ea817b561afe7d86ded7c67ce13c46fc37ede2766c17a17059cd9f38e466e8c3f8eb6fd700f0b9ef7095c37cd3d37de178f2be76dcf876fa343bd790267f012f67a77cc319f69b4ed872e2ca8e732daeabfe3c6fa9cc235f21f9b8bd4f2a5cd687bfedbfd659ee7ede017b842becf6eb44fa3cbd0df8559b0ffe808ceb0ff37e01afba3652e52cc87a26dbe276ecca7097790ff73b4cdef0616ac4fdf6df1c2d1d67ee8c6f80318eb4bd1180ff529513f0ecf7b694b62f5a002ceccb2662e523c2fb7605f9f0fd8fbbf75e3bc2dcd3e9ebcb9f17ce8c05e8f83685bcf701e44eb2db65e4fd1b65eebe62245be53b8c6f3ffdd8dfd3933fbf884761f5f0edcd88f951bf118bf44bde926dae24fe01ae7af76e3f9169e2f45bb143c0f5fdcf6fea23b18f773eac6f3e63ddac6db75e37df5e8c6fbae65aebcde6d37beaf84f528aa52f03c9dc3359ea79939c627d136deab1befaf75b883ef23e76e3ccfaea36d7dc2f795322b05ebfb0ad738af7db7ad371f99fd7e59b8b13f276e9cdf1318f5e54337e6d78cb67cf761ec170efba1acaa1afd9db92d3f3a36d729ea77efc6f33cbccf2beddfe6478fe6d85e45dbfd851bf1577007f5d877e3bc86f5a9ea3a2d6cffdfc1debe116df5db73a39e37b0e777191dda257c7fa83b6e8a2eaae00eeceb13d6b7d69f325b79b058fd32b170c1a55ebffaac2ccae2b9e6118f79c253bd6ef9ee3fd7587fef79c60f7acf3cc617fcc84ffcac6d8ffcc20b7ee5377ee7257ff027aff1bac66ff0269716cf5b1ab7cd3bbcabb17ddee37d3ee0433ee2633ee1019ff290cff89c2ff89229c48b66f1ac3d5df135df7093134eb9c56dcef4b3c35dee71ce393111dbfa8c784a4205955451cd1d1ad1982634a55bbad3f80eddd38c1ef882e66cf52ab5ff2b8d7ea4277aa6175ad06bb866f446efb4d4df0ffad4fed762ffb7b44e1b9cd2266dd142c75e5ddb3cd0bb3e347a477bd9d5f83ee245e3f7689f0ee830f67d44c77412ee186946033aa5e197fecfe85c7bf7be2fe892aee89a6ea84989f6bfa434f4eff9df52c509b5d0779b32ea684d13ea528f728d1e882ebfce37f6cf077422b4ea5b440ad14af1a15452ab473aee52c65ff39789b64fe955f44eb9937b5d858c5b32d377c0c32a7fee7ecd5fe61aff284ff22c2fb290577993775db1443fb53ef2219f5ff2bf93356d5b970dd9d41eb77820dbb223bbab155ed55ffab2f725ffb1eccb81aed6931cca116ab490633909d10339fd5ffdef795d869ae7923bc27226e772415d5986b51d683663b9d4fcfbb1ff190fe54aaec35aeaa577ee20f24673e94b531249a585fc2b69ebfe3ed7dae91f75ba964b5c03e9d344ba1add93bce0826c3f87f3b2a9fb6f18aeba10ba2f563f25eb1b563771a5d17531e2513c5fba538b3111cd690dd73c7ef6a95f4c8aa99de12fe77da4951de9ffffea730be7fd9fdfbffd0b690edc6c - + checkLineEdits() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/fov.cpp b/kstars/kstars/fov.cpp index 2820221a..572bca0f 100644 --- a/kstars/kstars/fov.cpp +++ b/kstars/kstars/fov.cpp @@ -73,11 +73,11 @@ FOV::FOV( TQString sname ) { void FOV::draw( TQPainter &p, float pixelsize ) { p.setPen( TQColor( color() ) ); - p.setBrush( Qt::NoBrush ); + p.setBrush( TQt::NoBrush ); int w = p.viewport().width(); int h = p.viewport().height(); - switch ( shape() ) { + switch ( tqshape() ) { case 0: { //Square int s = int( pixelsize ); p.drawRect( (w - s)/2, (h - s)/2, s, s ); @@ -128,9 +128,9 @@ void FOV::draw( TQPainter &p, float pixelsize ) { } case 4: { // Solid Circle int s = int( pixelsize ); - p.setBrush( TQBrush ( TQColor( color() ), Qt::Dense4Pattern) ); + p.setBrush( TQBrush ( TQColor( color() ), TQt::Dense4Pattern) ); p.drawEllipse( (w - s)/2, (h - s)/2, s, s ); - p.setBrush(Qt::NoBrush); + p.setBrush(TQt::NoBrush); break; } } diff --git a/kstars/kstars/fov.h b/kstars/kstars/fov.h index 03d2f5c7..f37512ab 100644 --- a/kstars/kstars/fov.h +++ b/kstars/kstars/fov.h @@ -32,21 +32,21 @@ class FOV { public: FOV(); FOV( TQString name ); //in this case, read params from fov.dat - FOV( TQString name, float size, int shape=0, TQString color="#FFFFFF" ); + FOV( TQString name, float size, int tqshape=0, TQString color="#FFFFFF" ); ~FOV() {} // enum SHAPE { FOV_SQUARE=0, FOV_CIRCLE=1, FOV_CROSSHAIRS=2, FOV_BULLSEYE=3, FOV_UNKNOWN }; TQString name() const { return Name; } void setName( const TQString &n ) { Name = n; } - int shape() const { return Shape; } + int tqshape() const { return Shape; } void setShape( int s ) { Shape = s; } float size() const { return Size; } void setSize( float s ) { Size = s; } TQString color() const { return Color; } void setColor( const TQString &c ) { Color = c; } - /**@short draw the FOV symbol on a QPainter + /**@short draw the FOV symbol on a TQPainter *@param p reference to the target TQPainter. The painter should already be started. *@param size the size of the target symbol, in pixels. */ diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index 05080043..6cf848ac 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -39,10 +39,10 @@ //---------FOVDialog---------------// -FOVDialog::FOVDialog( TQWidget *parent ) - : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, parent ) { +FOVDialog::FOVDialog( TQWidget *tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, tqparent ) { - ks = (KStars*)parent; + ks = (KStars*)TQT_TQWIDGET(tqparent); TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); @@ -134,7 +134,7 @@ void FOVDialog::paintEvent( TQPaintEvent * ) { TQFont smallFont = p.font(); smallFont.setPointSize( p.font().pointSize() - 2 ); p.setFont( smallFont ); - p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f->size() ), 3 ) ); + p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( f->size() ), 3 ) ); } } @@ -164,14 +164,14 @@ void FOVDialog::slotEditFOV() { newfdlg.ui->FOVName->setText( f->name() ); newfdlg.ui->FOVEdit->setText( KGlobal::locale()->formatNumber( f->size(), 3 ) ); newfdlg.ui->ColorButton->setColor( TQColor( f->color() ) ); - newfdlg.ui->ShapeBox->setCurrentItem( f->shape() ); + newfdlg.ui->ShapeBox->setCurrentItem( f->tqshape() ); newfdlg.slotUpdateFOV(); if ( newfdlg.exec() == TQDialog::Accepted ) { FOV *newfov = new FOV( newfdlg.ui->FOVName->text(), newfdlg.ui->FOVEdit->text().toDouble(), newfdlg.ui->ShapeBox->currentItem(), newfdlg.ui->ColorButton->color().name() ); fov->FOVListBox->changeItem( newfdlg.ui->FOVName->text(), fov->FOVListBox->currentItem() ); - FOVList.replace( fov->FOVListBox->currentItem(), newfov ); + FOVList.tqreplace( fov->FOVListBox->currentItem(), newfov ); } } @@ -192,8 +192,8 @@ void FOVDialog::slotRemoveFOV() { } //-------------NewFOV------------------// -NewFOV::NewFOV( TQWidget *parent ) - : KDialogBase( KDialogBase::Plain, i18n( "New FOV Indicator" ), Ok|Cancel, Ok, parent ), f() { +NewFOV::NewFOV( TQWidget *tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "New FOV Indicator" ), Ok|Cancel, Ok, tqparent ), f() { TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); ui = new NewFOVUI( page ); @@ -231,21 +231,21 @@ void NewFOV::paintEvent( TQPaintEvent * ) { p.begin( ui->ViewBox ); p.fillRect( ui->ViewBox->contentsRect(), TQColor( "black" ) ); f.draw( p, (float)( 0.3*ui->ViewBox->contentsRect().width() ) ); - p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f.size() ), 3 ) ); + p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( f.size() ), 3 ) ); p.end(); } void NewFOV::slotComputeFOV() { //DEBUG - kdDebug() << ":" << sender()->name() << ":" << endl; - if ( sender()->name() == TQString( "ComputeEyeFOV" ) ) kdDebug() << "A" << endl; - if ( sender()->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) kdDebug() << "B" << endl; + kdDebug() << ":" << TQT_TQOBJECT(const_cast(sender()))->name() << ":" << endl; + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) ) kdDebug() << "A" << endl; + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) kdDebug() << "B" << endl; - if ( sender()->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) ui->FOVEdit->setText( KGlobal::locale()->formatNumber( ui->EyeFOV->value() * ui->EyeLength->value() / ui->TLength1->value() ) ); - else if ( sender()->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) + else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) ui->FOVEdit->setText( KGlobal::locale()->formatNumber( ui->ChipSize->value() * 3438.0 / ui->TLength2->value() ) ); - else if ( sender()->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { + else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { ui->FOVEdit->setText( KGlobal::locale()->formatNumber( 34.34 * 1.2 * ui->WaveLength->value() / ui->RTDiameter->value() ) ); // Beam width for an antenna is usually a circle on the sky. ui->ShapeBox->setCurrentItem(4); diff --git a/kstars/kstars/fovdialog.h b/kstars/kstars/fovdialog.h index 8f7b6de8..02429390 100644 --- a/kstars/kstars/fovdialog.h +++ b/kstars/kstars/fovdialog.h @@ -34,8 +34,9 @@ class NewFOVUI; class FOVDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FOVDialog( TQWidget *parent=0 ); + FOVDialog( TQWidget *tqparent=0 ); ~FOVDialog(); unsigned int currentItem() const; TQPtrList FOVList; @@ -63,8 +64,9 @@ private: class NewFOV : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - NewFOV( TQWidget *parent=0 ); + NewFOV( TQWidget *tqparent=0 ); ~NewFOV() {} NewFOVUI *ui; diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui index 66ae1f5a..818f39bf 100644 --- a/kstars/kstars/fovdialogui.ui +++ b/kstars/kstars/fovdialogui.ui @@ -1,10 +1,10 @@ FOVDialogUI - + FOVDialogUI - + 0 0 @@ -23,7 +23,7 @@ FOVListBox - + 160 0 @@ -36,9 +36,9 @@ The list of defined field-of-view (FOV) symbols. You can add a symbol to the list using the "New" button, remove a symbol using the "Remove" button, and modify a symbol using the "Edit" button. A schematic of the highlighted symbol is drawn at right. - + - layout4 + tqlayout4 @@ -55,7 +55,7 @@ Add a new FOV symbol - Add a new field-of-view (FOV) symbol to the list. You can define the size, shape, and color of the new symbol. + Add a new field-of-view (FOV) symbol to the list. You can define the size, tqshape, and color of the new symbol. @@ -68,7 +68,7 @@ Fixed - + 20 16 @@ -86,7 +86,7 @@ Modify the highlighted FOV symbol - Press this button to modify the highlighted FOV symbol. You can change its size, shape and color. + Press this button to modify the highlighted FOV symbol. You can change its size, tqshape and color. @@ -113,14 +113,14 @@ Fixed - + 20 20 - + ViewBox @@ -132,7 +132,7 @@ 0 - + 80 80 @@ -169,7 +169,7 @@ Expanding - + 20 60 @@ -182,7 +182,7 @@ - + klistbox.h kpushbutton.h diff --git a/kstars/kstars/geolocation.h b/kstars/kstars/geolocation.h index c3b6524e..b1fa7e37 100644 --- a/kstars/kstars/geolocation.h +++ b/kstars/kstars/geolocation.h @@ -282,7 +282,7 @@ public: */ void geodToCart (void); -/**The geoid is an elliposid which fits the shape of the Earth. It is +/**The geoid is an elliposid which fits the tqshape of the Earth. It is *characterized by two parameters: the semimajor axis and the *flattening. * diff --git a/kstars/kstars/histdialog.ui b/kstars/kstars/histdialog.ui index 38b268e6..202106fc 100644 --- a/kstars/kstars/histdialog.ui +++ b/kstars/kstars/histdialog.ui @@ -1,10 +1,10 @@ histDialog - + histDialog - + 0 0 @@ -20,13 +20,13 @@ 0 - + 640 325 - + 640 325 @@ -42,15 +42,15 @@ unnamed - + - layout17 + tqlayout17 unnamed - + maxSlider @@ -58,7 +58,7 @@ Horizontal - + histFrame @@ -70,13 +70,13 @@ 0 - + 500 150 - + 500 150 @@ -89,7 +89,7 @@ Raised - + minSlider @@ -99,15 +99,15 @@ - + - layout5 + tqlayout5 unnamed - + maxLabel @@ -141,7 +141,7 @@ Expanding - + 130 20 @@ -164,7 +164,7 @@ true - + intensityLabel @@ -188,7 +188,7 @@ true - + frequencyLabel @@ -196,7 +196,7 @@ Frequency: - + minLabel @@ -222,9 +222,9 @@ - + - layout13 + tqlayout13 @@ -240,14 +240,14 @@ Expanding - + 270 20 - + applyB @@ -261,7 +261,7 @@ true - + cancelB @@ -274,7 +274,7 @@ - + scaleGroup @@ -285,7 +285,7 @@ unnamed - + autoR @@ -296,7 +296,7 @@ true - + linearR @@ -304,7 +304,7 @@ Linear - + logR @@ -312,7 +312,7 @@ Logarithmic - + sqrtR @@ -332,7 +332,7 @@ reject() - + klineedit.h klineedit.h diff --git a/kstars/kstars/imagereductiondlg.cpp b/kstars/kstars/imagereductiondlg.cpp index bfcafebc..842e9618 100644 --- a/kstars/kstars/imagereductiondlg.cpp +++ b/kstars/kstars/imagereductiondlg.cpp @@ -24,7 +24,7 @@ #include "imagereductiondlg.h" - ImageReductionDlg::ImageReductionDlg(TQWidget * parent, const char * name) : imageReductionUI(parent, name) + ImageReductionDlg::ImageReductionDlg(TQWidget * tqparent, const char * name) : imageReductionUI(tqparent, name) { connect(darkAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFile())); connect(flatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFlatFile())); @@ -52,7 +52,7 @@ ImageReductionDlg::~ImageReductionDlg() void ImageReductionDlg::addDarkFile() { - KURL::List fileURLs = KFileDialog::getOpenURLs( TQString::null, "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Dark Frames")); + KURL::List fileURLs = KFileDialog::getOpenURLs( TQString(), "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Dark Frames")); const int limit = (int) fileURLs.size(); for (int i=0; i < limit ; ++i) @@ -65,7 +65,7 @@ void ImageReductionDlg::addDarkFile() void ImageReductionDlg::addFlatFile() { - KURL::List fileURLs = KFileDialog::getOpenURLs( TQString::null, "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Flat Frames")); + KURL::List fileURLs = KFileDialog::getOpenURLs( TQString(), "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Flat Frames")); const int limit = (int) fileURLs.size(); @@ -79,7 +79,7 @@ void ImageReductionDlg::addFlatFile() void ImageReductionDlg::addDarkFlatFile() { - KURL::List fileURLs = KFileDialog::getOpenURLs( TQString::null, "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Dark Flat Frames")); + KURL::List fileURLs = KFileDialog::getOpenURLs( TQString(), "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Dark Flat Frames")); const int limit = (int) fileURLs.size(); for (int i=0; i < limit; ++i) diff --git a/kstars/kstars/imagereductiondlg.h b/kstars/kstars/imagereductiondlg.h index 2e7bff26..03feba93 100644 --- a/kstars/kstars/imagereductiondlg.h +++ b/kstars/kstars/imagereductiondlg.h @@ -23,9 +23,10 @@ class ImageReductionDlg : public imageReductionUI { Q_OBJECT + TQ_OBJECT public: - ImageReductionDlg(TQWidget * parent, const char * name = 0); + ImageReductionDlg(TQWidget * tqparent, const char * name = 0); ~ImageReductionDlg(); diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index 218e9ec2..38c43c9c 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -1,10 +1,10 @@ imageReductionUI - + imageReductionUI - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + darkFrameGroup @@ -46,7 +46,7 @@ unnamed - + File Name @@ -77,9 +77,9 @@ LastColumn - + - layout8 + tqlayout8 @@ -95,14 +95,14 @@ Expanding - + 71 20 - + darkAddB @@ -110,7 +110,7 @@ Add... - + darkRemoveB @@ -121,7 +121,7 @@ Remove - + darkDetailsB @@ -136,7 +136,7 @@ - + darkbg @@ -147,7 +147,7 @@ unnamed - + darkAverageB @@ -158,7 +158,7 @@ true - + darkMedianB @@ -176,7 +176,7 @@ Expanding - + 20 31 @@ -187,9 +187,9 @@ - + - layout1 + tqlayout1 @@ -197,15 +197,15 @@ - + - layout14 + tqlayout14 unnamed - + FlatFieldFrameGroup @@ -224,7 +224,7 @@ unnamed - + File Name @@ -255,9 +255,9 @@ LastColumn - + - layout7 + tqlayout7 @@ -273,14 +273,14 @@ Expanding - + 71 20 - + flatAddB @@ -288,7 +288,7 @@ Add... - + flatRemoveB @@ -299,7 +299,7 @@ Remove - + flatDetailsB @@ -314,7 +314,7 @@ - + flatFieldbg @@ -325,7 +325,7 @@ unnamed - + flatAverageB @@ -336,7 +336,7 @@ true - + flatMedianB @@ -354,7 +354,7 @@ Expanding - + 20 31 @@ -365,15 +365,15 @@ - + - layout14_2 + tqlayout14_2 unnamed - + FlatFieldDarkFrameG @@ -392,7 +392,7 @@ unnamed - + File Name @@ -423,9 +423,9 @@ LastColumn - + - layout7_2 + tqlayout7_2 @@ -441,14 +441,14 @@ Expanding - + 71 20 - + darkflatAddB @@ -456,7 +456,7 @@ Add... - + darkflatRemoveB @@ -467,7 +467,7 @@ Remove - + darkflatDetailsB @@ -482,7 +482,7 @@ - + darkflatFieldbg @@ -493,7 +493,7 @@ unnamed - + darkflatAverageB @@ -504,7 +504,7 @@ true - + darkflatMedian @@ -522,7 +522,7 @@ Expanding - + 20 31 @@ -533,9 +533,9 @@ - + - layout12 + tqlayout12 @@ -551,14 +551,14 @@ Expanding - + 210 20 - + buttonOk @@ -575,7 +575,7 @@ true - + buttonCancel @@ -607,5 +607,5 @@ reject() - + diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index 7ad344da..adf1f3f9 100644 --- a/kstars/kstars/imagesequence.cpp +++ b/kstars/kstars/imagesequence.cpp @@ -37,11 +37,11 @@ #define RETRY_MAX 12 #define RETRY_PERIOD 5000 -imagesequence::imagesequence(TQWidget* parent, const char* name, bool modal, WFlags fl) -: imgSequenceDlg(parent,name, modal,fl) +imagesequence::imagesequence(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: imgSequenceDlg(tqparent,name, modal,fl) { - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; INDIMenu *devMenu = ksw->getINDIMenu(); if (devMenu) @@ -79,7 +79,7 @@ imagesequence::~imagesequence() { } -bool imagesequence::updateStatus() +bool imagesequence::updatetqStatus() { bool result; @@ -249,8 +249,8 @@ void imagesequence::startSequence() currentFilter = filterCombo->currentText(); lastFilter = filterCombo->currentItem(); - fullImgCountOUT->setText( TQString("%1").arg(seqTotalCount)); - currentImgCountOUT->setText(TQString("%1").arg(seqCurrentCount)); + fullImgCountOUT->setText( TQString("%1").tqarg(seqTotalCount)); + currentImgCountOUT->setText(TQString("%1").tqarg(seqCurrentCount)); // Ok, now let's connect signals and slots for this device connect(stdDevCCD, TQT_SIGNAL(FITSReceived(TQString)), this, TQT_SLOT(newFITS(TQString))); @@ -290,7 +290,7 @@ void imagesequence::stopSequence() if (stdDevCCD) { - stdDevCCD->seqCount = 0; + stdDevCCD->setqCount = 0; stdDevCCD->batchMode = false; stdDevCCD->ISOMode = false; @@ -315,7 +315,7 @@ void imagesequence::checkCCD(int ccdNum) if (!idevice) { - KMessageBox::error(this, i18n("INDI device %1 no longer exists.").arg(targetCCD)); + KMessageBox::error(this, i18n("INDI device %1 no longer exists.").tqarg(targetCCD)); CCDCombo->removeItem(ccdNum); lastCCD = CCDCombo->currentItem(); if (lastCCD != -1) @@ -325,7 +325,7 @@ void imagesequence::checkCCD(int ccdNum) if (!idevice->isOn()) { - KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").arg(targetCCD)); + KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").tqarg(targetCCD)); CCDCombo->setCurrentItem(lastCCD); return; @@ -344,7 +344,7 @@ void imagesequence::newFITS(TQString deviceLabel) seqCurrentCount++; imgProgress->setProgress(seqCurrentCount); - currentImgCountOUT->setText( TQString("%1").arg(seqCurrentCount)); + currentImgCountOUT->setText( TQString("%1").tqarg(seqCurrentCount)); // if we're done if (seqCurrentCount == seqTotalCount) @@ -395,7 +395,7 @@ bool imagesequence::verifyCCDIntegrity() if (!idevice) { - KMessageBox::error(this, i18n("INDI device %1 no longer exists.").arg(targetCCD)); + KMessageBox::error(this, i18n("INDI device %1 no longer exists.").tqarg(targetCCD)); CCDCombo->removeItem(CCDCombo->currentItem()); lastCCD = CCDCombo->currentItem(); return false; @@ -403,7 +403,7 @@ bool imagesequence::verifyCCDIntegrity() if (!idevice->isOn()) { - KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").arg(currentCCD)); + KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").tqarg(currentCCD)); return false; } @@ -449,7 +449,7 @@ bool imagesequence::verifyFilterIntegrity() filterDevice = devMenu->findDeviceByLabel(targetFilter); if (filterDevice == NULL) { - KMessageBox::error(this, i18n("INDI device %1 no longer exists.").arg(targetFilter)); + KMessageBox::error(this, i18n("INDI device %1 no longer exists.").tqarg(targetFilter)); filterCombo->removeItem(filterCombo->currentItem()); filterCombo->setCurrentItem(0); currentFilter = filterCombo->currentText(); @@ -461,7 +461,7 @@ bool imagesequence::verifyFilterIntegrity() // #2 Make sure it's connected if (!filterDevice->isOn()) { - KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").arg(targetFilter)); + KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").tqarg(targetFilter)); filterCombo->setCurrentItem(0); currentFilter = filterCombo->currentText(); filterPosCombo->clear(); @@ -568,7 +568,7 @@ void imagesequence::captureImage() if (seqExpose < exposeElem->min || seqExpose > exposeElem->max) { stopSequence(); - KMessageBox::error(this, i18n("Expose duration is invalid. %1 supports expose durations from %2 to %3 seconds only.").arg(currentCCD).arg(exposeElem->min).arg(exposeElem->max)); + KMessageBox::error(this, i18n("Expose duration is invalid. %1 supports expose durations from %2 to %3 seconds only.").tqarg(currentCCD).tqarg(exposeElem->min).tqarg(exposeElem->max)); return; } @@ -580,7 +580,7 @@ void imagesequence::captureImage() exposeElem->spinChanged(seqExpose); } else - exposeElem->write_w->setText( TQString("%1").arg(seqExpose)); + exposeElem->write_w->setText( TQString("%1").tqarg(seqExpose)); } @@ -609,19 +609,19 @@ void imagesequence::updateFilterCombo(int filterNum) if (filterList.empty()) for (unsigned int i=0; i <= filterMax; i++) - filterList << TQString("%1").arg(i); + filterList << TQString("%1").tqarg(i); // Fill filter combo if (filterList.count() <= filterMax) { filterPosCombo->insertStringList(filterList); for (unsigned int i = filterList.count() ; i <= filterMax ; i++) - filterPosCombo->insertItem(TQString("%1").arg(i)); + filterPosCombo->insertItem(TQString("%1").tqarg(i)); } else { // filterMax < filterList.count() for (unsigned int i = 0 ; i <= filterMax ; i++) - filterPosCombo->insertItem(TQString("%1").arg(filterList[i])); + filterPosCombo->insertItem(TQString("%1").tqarg(filterList[i])); } @@ -668,7 +668,7 @@ void imagesequence::selectFilter() filterElem->spinChanged(filterElem->targetValue); } else - filterElem->write_w->setText(TQString("%1").arg(filterElem->targetValue)); + filterElem->write_w->setText(TQString("%1").tqarg(filterElem->targetValue)); // We're done! Send it to the driver filterProp->newText(); diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index 8d467593..ceeacfbb 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -21,13 +21,14 @@ class INDIStdDevice; class imagesequence : public imgSequenceDlg { Q_OBJECT + TQ_OBJECT public: - imagesequence(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + imagesequence(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~imagesequence(); -bool updateStatus(); +bool updatetqStatus(); private: KStars *ksw; diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index 4d3e5a15..b92ee486 100644 --- a/kstars/kstars/imageviewer.cpp +++ b/kstars/kstars/imageviewer.cpp @@ -29,17 +29,17 @@ #include -ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *parent, const char *name) - : KMainWindow (parent, name), imageURL (*url), fileIsImage (false), +ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *tqparent, const char *name) + : KMainWindow (tqparent, name), imageURL (*url), fileIsImage (false), ctrl (false), key_s (false), key_q (false), downloadJob(0) { // toolbar can dock only on top-position and can't be minimized // JH: easier to just disable its mobility toolBar()->setMovingEnabled( false ); - KAction *action = new KAction (i18n ("Close Window"), "fileclose", CTRL+Key_Q, this, TQT_SLOT (close()), actionCollection()); + KAction *action = new KAction (i18n ("Close Window"), "fileclose", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection()); action->plug (toolBar()); - action = new KAction (i18n ("Save Image"), "filesave", CTRL+Key_S, this, TQT_SLOT (saveFileToDisc()), actionCollection()); + action = new KAction (i18n ("Save Image"), "filesave", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection()); action->plug (toolBar()); statusBar()->insertItem( capText, 0, 1, true ); @@ -60,9 +60,9 @@ ImageViewer::~ImageViewer() { if (!file->remove()) // if the file was not complete downloaded the suffix is ".part" { - kdDebug()<name())<name())<setName (file->name() + ".part"); // set new suffix to filename - kdDebug()<name())<name())<remove()) kdDebug()<<"file removed\n"; else @@ -86,7 +86,7 @@ void ImageViewer::resizeEvent (TQResizeEvent */*ev*/) void ImageViewer::closeEvent (TQCloseEvent *ev) { if (ev) // not if closeEvent (0) is called, because segfault - ev->accept(); // parent-widgets should not get this event, so it will be filtered + ev->accept(); // tqparent-widgets should not get this event, so it will be filtered this->~ImageViewer(); // destroy the object, so the object can only allocated with operator new, not as a global/local variable } @@ -208,9 +208,9 @@ void ImageViewer::saveFileToDisc() TQFile f (newURL.directory() + "/" + newURL.fileName()); if (f.exists()) { - int r=KMessageBox::warningContinueCancel(static_cast(parent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg(newURL.fileName()), + "Overwrite it?" ).tqarg(newURL.fileName()), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); if(r==KMessageBox::Cancel) return; diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h index 0c317a25..ed475f6c 100644 --- a/kstars/kstars/imageviewer.h +++ b/kstars/kstars/imageviewer.h @@ -37,7 +37,7 @@ *save these files. For other formats, like PNG, this is not so important *because they can directly saved by TQImage. * - *The download-slave works asynchron so the parent-widget can be used at + *The download-slave works asynchron so the tqparent-widget can be used at *this time. The save-slave works synchronously, but this is not important *because the files are at this time local saved and this works not so long. */ @@ -47,10 +47,11 @@ class TQFile; class ImageViewer : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - ImageViewer (const KURL *imageName, const TQString &capText, TQWidget *parent, const char *name = 0); + ImageViewer (const KURL *imageName, const TQString &capText, TQWidget *tqparent, const char *name = 0); /**Destructor. If there is a partially downloaded image file, delete it.*/ ~ImageViewer(); diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui index 024493fe..f73c9575 100644 --- a/kstars/kstars/imgsequencedlgui.ui +++ b/kstars/kstars/imgsequencedlgui.ui @@ -1,10 +1,10 @@ imgSequenceDlg - + imgSequenceDlg - + 0 0 @@ -25,7 +25,7 @@ unnamed - + progressGroup @@ -36,23 +36,23 @@ unnamed - + - layout25 + tqlayout25 unnamed - + - layout24 + tqlayout24 unnamed - + progressLabel @@ -60,11 +60,11 @@ Progress: - + currentImgCountOUT - + 50 0 @@ -77,7 +77,7 @@ - + textLabel1_4_2_2 @@ -85,11 +85,11 @@ of - + fullImgCountOUT - + 50 0 @@ -102,7 +102,7 @@ - + completedLabel @@ -141,7 +141,7 @@ Expanding - + 51 20 @@ -150,9 +150,9 @@ - + - layout9 + tqlayout9 @@ -168,14 +168,14 @@ Expanding - + 270 20 - + startB @@ -189,7 +189,7 @@ true - + stopB @@ -206,7 +206,7 @@ true - + closeB @@ -219,15 +219,15 @@ - + - layout10 + tqlayout10 unnamed - + setupGroup @@ -238,23 +238,23 @@ unnamed - + - layout30 + tqlayout30 unnamed - + - layout29 + tqlayout29 unnamed - + textLabel1_5 @@ -268,7 +268,7 @@ - + textLabel1 @@ -282,7 +282,7 @@ - + exposureLabel @@ -296,7 +296,7 @@ - + textLabel1_2 @@ -310,7 +310,7 @@ - + textLabel1_3 @@ -326,15 +326,15 @@ - + - layout28 + tqlayout28 unnamed - + CCDCombo @@ -375,7 +375,7 @@ - + ISOCheck @@ -391,7 +391,7 @@ - + setupGroup_2 @@ -402,15 +402,15 @@ unnamed - + - layout29_2 + tqlayout29_2 unnamed - + textLabel1_5_2 @@ -424,7 +424,7 @@ - + textLabel1_2_2 @@ -440,12 +440,12 @@ - + filterPosCombo - + filterCombo @@ -460,7 +460,7 @@ Expanding - + 21 81 @@ -483,7 +483,7 @@ stopB closeB - + kprogress.h klineedit.h diff --git a/kstars/kstars/indi/LICENSE b/kstars/kstars/indi/LICENSE index ae23fcfd..fbb61ee9 100644 --- a/kstars/kstars/indi/LICENSE +++ b/kstars/kstars/indi/LICENSE @@ -135,7 +135,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated +all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -257,7 +257,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline +structure tqlayouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/kstars/kstars/indi/Makefile.am b/kstars/kstars/indi/Makefile.am index 29aa23a6..ff4982c2 100644 --- a/kstars/kstars/indi/Makefile.am +++ b/kstars/kstars/indi/Makefile.am @@ -1,3 +1,6 @@ +# set the include path for X, qt and KDE +INCLUDES= $(all_includes) + appdatadir = $(kde_datadir)/kstars appdata_DATA = drivers.xml apogee_caminfo.xml @@ -17,45 +20,59 @@ noinst_LIBRARIES = liblilxml.a libindicom.a indiserver_SOURCES = indiserver.c fq.c indiserver_LDADD = liblilxml.a ${LIBPTHREAD} ${USE_THREADS} $(LIBSOCKET) +indiserver_LDFLAGS = $(LIB_QT) lx200generic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200autostar.cpp lx200_16.cpp lx200gps.cpp lx200generic.cpp lx200classic.cpp lx200generic_LDADD = liblilxml.a libindicom.a -lm +lx200generic_LDFLAGS = $(LIB_QT) lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp lx200basic_LDADD = liblilxml.a libindicom.a +lx200basic_LDFLAGS = $(LIB_QT) celestrongps_SOURCES = indidrivermain.c base64.c eventloop.c celestronprotocol.c celestrongps.cpp celestrongps_LDADD = liblilxml.a libindicom.a -lm +celestrongps_LDFLAGS = $(LIB_QT) apmount_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c apmount.cpp apmount_LDADD = liblilxml.a libindicom.a +apmount_LDFLAGS = $(LIB_QT) fliccd_SOURCES = eventloop.c base64.c fli_ccd.c indidrivermain.c fliccd_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm -lz $(LIBSOCKET) +fliccd_LDFLAGS = $(LIB_QT) fliwheel_SOURCES = eventloop.c base64.c fli_wheel.c indidrivermain.c fliwheel_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm +fliwheel_LDFLAGS = $(LIB_QT) v4ldriver_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_v4l.cpp v4ldriver_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz +v4ldriver_LDFLAGS = $(LIB_QT) v4lphilips_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp v4lphilips.cpp indi_philips.cpp v4lphilips_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz +v4lphilips_LDFLAGS = $(LIB_QT) meade_lpi_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_lpi.cpp meade_lpi_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lz +meade_lpi_LDFLAGS = $(LIB_QT) temma_SOURCES = indidrivermain.c base64.c eventloop.c temmadriver.c temma_LDADD = liblilxml.a libindicom.a -lm +temma_LDFLAGS = $(LIB_QT) skycommander_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c skycommander.c skycommander_LDADD = liblilxml.a libindicom.a -lm +skycommander_LDFLAGS = $(LIB_QT) apogee_ppi_SOURCES = apogee_ppi.cpp base64.c eventloop.c indidrivermain.c apogee_ppi_LDADD = libindicom.a liblilxml.a apogee/libapogee_PPI.la -lz +apogee_ppi_LDFLAGS = $(LIB_QT) sbigccd_SOURCES = sbigccd.cpp base64.c eventloop.c indidrivermain.c sbigccd_LDADD = libindicom.a liblilxml.a -lz +sbigccd_LDFLAGS = $(LIB_QT) install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp index d1c05b66..b400dbcb 100644 --- a/kstars/kstars/indi/apmount.cpp +++ b/kstars/kstars/indi/apmount.cpp @@ -40,7 +40,8 @@ #if !(TIMEZONE_IS_INT) -static int daylight = 0; +//static int daylight = 0; +int daylight = 0; #endif static inline double timezoneOffset() @@ -230,7 +231,7 @@ void APMount::initProperties() fillNumber(&EqN[0], "RA", "RA H:M:S", "%10.6m", 0., 24., 0., 0.); fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.); - fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); + fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); fillNumber(&GeoN[0], "LAT", "Lat. D:M:S +N", "%10.6m", -90., 90., 0., 0.); fillNumber(&GeoN[1], "LONG", "Long. D:M:S +E", "%10.6m", 0., 360., 0., 0.); @@ -728,9 +729,9 @@ void APMount::ISNewSwitch (const char *dev, const char *name, ISState *states, c IUUpdateSwitches(&AlignmentSP, states, names, n); index = getOnSwitch(&AlignmentSP); - if ( ( err = setAlignmentMode(index) < 0) ) + if ( ( err = tqsetAlignmentMode(index) < 0) ) { - handleError(&AlignmentSP, err, "Setting alignment"); + handleError(&AlignmentSP, err, "Setting tqalignment"); return; } diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp index 4e8c1b00..f96d228a 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera.cpp @@ -45,7 +45,7 @@ bool CApnCamera::Expose( double Duration, bool Light ) unsigned short TotalVPixels; - while ( read_ImagingStatus() != Apn_Status_Flushing ) + while ( read_ImagingtqStatus() != Apn_Status_Flushing ) { Sleep( 20 ); } @@ -128,7 +128,7 @@ bool CApnCamera::Expose( double Duration, bool Light ) PostRoiRows = 1; } - // Set up the geometry for a full frame device + // Set up the tqgeometry for a full frame device if ( m_ApnSensorInfo->m_EnableSingleRowOffset ) { PreRoiVBinning += PreRoiRows; @@ -296,7 +296,7 @@ unsigned short CApnCamera::GetExposurePixelsV() double CApnCamera::read_InputVoltage() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtInputVoltage; } @@ -329,7 +329,7 @@ unsigned short CApnCamera::read_FirmwareVersion() bool CApnCamera::read_ShutterState() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtShutterState; } @@ -559,15 +559,15 @@ void CApnCamera::write_DataBits( Apn_Resolution BitResolution ) } } -Apn_Status CApnCamera::read_ImagingStatus() +Apn_tqStatus CApnCamera::read_ImagingtqStatus() { bool Exposing, Active, Done, Flushing, WaitOnTrigger; bool DataHalted, RamError; - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); - // Update the ImagingStatus + // Update the ImagingtqStatus Exposing = false; Active = false; Done = false; @@ -599,42 +599,42 @@ Apn_Status CApnCamera::read_ImagingStatus() if ( RamError ) { - m_pvtImagingStatus = Apn_Status_PatternError; + m_pvtImagingtqStatus = Apn_Status_PatternError; } else { if ( DataHalted ) { - m_pvtImagingStatus = Apn_Status_DataError; + m_pvtImagingtqStatus = Apn_Status_DataError; } else { if ( WaitOnTrigger ) { - m_pvtImagingStatus = Apn_Status_WaitingOnTrigger; + m_pvtImagingtqStatus = Apn_Status_WaitingOnTrigger; } else { if ( Done && m_pvtImageInProgress ) { m_pvtImageReady = true; - m_pvtImagingStatus = Apn_Status_ImageReady; + m_pvtImagingtqStatus = Apn_Status_ImageReady; } else { if ( Active ) { if ( Exposing ) - m_pvtImagingStatus = Apn_Status_Exposing; + m_pvtImagingtqStatus = Apn_Status_Exposing; else - m_pvtImagingStatus = Apn_Status_ImagingActive; + m_pvtImagingtqStatus = Apn_Status_ImagingActive; } else { if ( Flushing ) - m_pvtImagingStatus = Apn_Status_Flushing; + m_pvtImagingtqStatus = Apn_Status_Flushing; else - m_pvtImagingStatus = Apn_Status_Idle; + m_pvtImagingtqStatus = Apn_Status_Idle; } } } @@ -642,39 +642,39 @@ Apn_Status CApnCamera::read_ImagingStatus() } /* - switch( m_pvtImagingStatus ) + switch( m_pvtImagingtqStatus ) { case Apn_Status_DataError: - OutputDebugString( "ImagingStatus: Apn_Status_DataError" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_DataError" ); break; case Apn_Status_PatternError: - OutputDebugString( "ImagingStatus: Apn_Status_PatternError" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_PatternError" ); break; case Apn_Status_Idle: - OutputDebugString( "ImagingStatus: Apn_Status_Idle" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_Idle" ); break; case Apn_Status_Exposing: - OutputDebugString( "ImagingStatus: Apn_Status_Exposing" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_Exposing" ); break; case Apn_Status_ImagingActive: - OutputDebugString( "ImagingStatus: Apn_Status_ImagingActive" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_ImagingActive" ); break; case Apn_Status_ImageReady: - OutputDebugString( "ImagingStatus: Apn_Status_ImageReady" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_ImageReady" ); break; case Apn_Status_Flushing: - OutputDebugString( "ImagingStatus: Apn_Status_Flushing" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_Flushing" ); break; case Apn_Status_WaitingOnTrigger: - OutputDebugString( "ImagingStatus: Apn_Status_WaitingOnTrigger" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_WaitingOnTrigger" ); break; default: - OutputDebugString( "ImagingStatus: UNDEFINED!!" ); + OutputDebugString( "ImagingtqStatus: UNDEFINED!!" ); break; } */ - return m_pvtImagingStatus; + return m_pvtImagingtqStatus; } Apn_LedMode CApnCamera::read_LedMode() @@ -763,16 +763,16 @@ void CApnCamera::write_CoolerEnable( bool CoolerEnable ) m_pvtCoolerEnable = CoolerEnable; } -Apn_CoolerStatus CApnCamera::read_CoolerStatus() +Apn_CoolertqStatus CApnCamera::read_CoolertqStatus() { bool CoolerAtTemp; bool CoolerActive; bool CoolerTempRevised; - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); - // Update CoolerStatus + // Update CoolertqStatus CoolerActive = false; CoolerAtTemp = false; CoolerTempRevised = false; @@ -789,25 +789,25 @@ Apn_CoolerStatus CApnCamera::read_CoolerStatus() // Now derive our cooler state if ( !CoolerActive ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Off; + m_pvtCoolertqStatus = Apn_CoolerStatus_Off; } else { if ( CoolerTempRevised ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Revision; + m_pvtCoolertqStatus = Apn_CoolerStatus_Revision; } else { if ( CoolerAtTemp ) - m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint; + m_pvtCoolertqStatus = Apn_CoolerStatus_AtSetPoint; else - m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint; + m_pvtCoolertqStatus = Apn_CoolerStatus_RampingToSetPoint; } } - return m_pvtCoolerStatus; + return m_pvtCoolertqStatus; } double CApnCamera::read_CoolerSetPoint() @@ -874,14 +874,14 @@ void CApnCamera::write_CoolerBackoffPoint( double BackoffPoint ) double CApnCamera::read_CoolerDrive() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtCoolerDrive; } double CApnCamera::read_TempCCD() { - // UpdateGeneralStatus(); + // UpdateGeneraltqStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -910,7 +910,7 @@ double CApnCamera::read_TempCCD() double CApnCamera::read_TempHeatsink() { - // UpdateGeneralStatus(); + // UpdateGeneraltqStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -1493,7 +1493,7 @@ long CApnCamera::InitDefaults() unsigned short PreRoiRows, PostRoiRows; unsigned short PreRoiVBinning, PostRoiVBinning; - unsigned short UnbinnedRoiY; // Vertical ROI pixels + unsigned short UnbinnedRoiY; //Qt::Vertical ROI pixels // Read the Camera ID register @@ -1782,8 +1782,8 @@ long CApnCamera::InitDefaults() Write( FPGA_REG_TEMP_RAMP_DOWN_A, m_ApnSensorInfo->m_TempRampRateOne ); Write( FPGA_REG_TEMP_RAMP_DOWN_B, m_ApnSensorInfo->m_TempRampRateTwo ); // the collor code not only determines the m_pvtCoolerEnable state, but - // also implicitly calls UpdateGeneralStatus() as part of read_CoolerStatus() - if ( read_CoolerStatus() == Apn_CoolerStatus_Off ) + // also implicitly calls UpdateGeneraltqStatus() as part of read_CoolertqStatus() + if ( read_CoolertqStatus() == Apn_CoolerStatus_Off ) m_pvtCoolerEnable = false; else m_pvtCoolerEnable = true; @@ -1827,7 +1827,7 @@ long CApnCamera::WriteTwelveBitOffset() return 0; } -void CApnCamera::UpdateGeneralStatus() +void CApnCamera::UpdateGeneraltqStatus() { unsigned short StatusReg; unsigned short HeatsinkTempReg; diff --git a/kstars/kstars/indi/apogee/ApnCamera.h b/kstars/kstars/indi/apogee/ApnCamera.h index b0e6af03..90f49ff2 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.h +++ b/kstars/kstars/indi/apogee/ApnCamera.h @@ -129,7 +129,7 @@ public: void write_DataBits( Apn_Resolution BitResolution ); - Apn_Status read_ImagingStatus(); + Apn_tqStatus read_ImagingtqStatus(); Apn_LedMode read_LedMode(); void write_LedMode( Apn_LedMode LedMode ); @@ -138,7 +138,7 @@ public: bool read_CoolerEnable(); void write_CoolerEnable( bool CoolerEnable ); - Apn_CoolerStatus read_CoolerStatus(); + Apn_CoolertqStatus read_CoolertqStatus(); double read_CoolerSetPoint(); void write_CoolerSetPoint( double SetPoint ); double read_CoolerBackoffPoint(); @@ -231,7 +231,7 @@ public: long InitTwelveBitAD(); long WriteTwelveBitOffset(); - void UpdateGeneralStatus(); + void UpdateGeneraltqStatus(); // Internal private variables bool m_ResetVerticalArrays; @@ -264,8 +264,8 @@ public: double m_pvtCoolerBackoffPoint; - Apn_CoolerStatus m_pvtCoolerStatus; - Apn_Status m_pvtImagingStatus; + Apn_CoolertqStatus m_pvtCoolertqStatus; + Apn_tqStatus m_pvtImagingtqStatus; bool m_pvtShutterState; bool m_pvtImageInProgress; bool m_pvtImageReady; diff --git a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp index cce9ba37..095dcf0a 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp @@ -16,14 +16,14 @@ bool CApnCamera::read_Present() { // OutputDebugString( "read_Present()" ); - USHORT ApStatus; + USHORT AptqStatus; USHORT DatumA; USHORT DatumB; char szMsg[80]; DatumA = 0x0; DatumB = 0x0; - ApStatus = 0; + AptqStatus = 0; Write( FPGA_REG_SCRATCH, 0x8086 ); Read( FPGA_REG_SCRATCH, DatumA ); diff --git a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp index 0f739121..9113ae8f 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp @@ -92,7 +92,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer, while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingStatus(); + read_ImagingtqStatus(); } Width = m_pvtWidth; diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp index a6bbad42..1661d028 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp @@ -76,7 +76,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer, while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingStatus(); + read_ImagingtqStatus(); } Width = m_pvtWidth; @@ -161,7 +161,7 @@ long CApnCamera::PostStopExposure( bool DigitizeData ) while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingStatus(); + read_ImagingtqStatus(); } pRequestData = new USHORT[m_pvtWidth*m_pvtHeight]; diff --git a/kstars/kstars/indi/apogee/Apogee.h b/kstars/kstars/indi/apogee/Apogee.h index d97740b2..70c1c359 100644 --- a/kstars/kstars/indi/apogee/Apogee.h +++ b/kstars/kstars/indi/apogee/Apogee.h @@ -29,7 +29,7 @@ #define Apn_CameraMode_ExternalTrigger 3 #define Apn_CameraMode_ExternalShutter 4 -#define Apn_Status int +#define Apn_tqStatus int #define Apn_Status_DataError -2 #define Apn_Status_PatternError -1 #define Apn_Status_Idle 0 @@ -54,7 +54,7 @@ #define Apn_LedState_ExtStartReadout 6 #define Apn_LedState_AtTemp 7 -#define Apn_CoolerStatus int +#define Apn_CoolertqStatus int #define Apn_CoolerStatus_Off 0 #define Apn_CoolerStatus_RampingToSetPoint 1 #define Apn_CoolerStatus_AtSetPoint 2 @@ -67,7 +67,7 @@ #define Apn_FanMode_High 3 -#define Camera_Status int +#define Camera_tqStatus int #define Camera_Status_Idle 0 #define Camera_Status_Waiting 1 #define Camera_Status_Exposing 2 @@ -76,7 +76,7 @@ #define Camera_Status_ImageReady 5 #define Camera_Status_Flushing 6 -#define Camera_CoolerStatus int +#define Camera_CoolertqStatus int #define Camera_CoolerStatus_Off 0 #define Camera_CoolerStatus_RampingToSetPoint 1 #define Camera_CoolerStatus_Correcting 2 diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 67d217ec..2b97db7e 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp @@ -56,8 +56,8 @@ CCameraIO::CCameraIO() m_WaitingforLine = false; m_WaitingforTrigger = false; - m_Status = Camera_Status_Idle; - m_CoolerStatus = Camera_CoolerStatus_Off; + m_tqStatus = Camera_Status_Idle; + m_CoolertqStatus = Camera_CoolerStatus_Off; m_ExposureBinX = 0; m_ExposureBinY = 0; @@ -88,7 +88,7 @@ CCameraIO::CCameraIO() m_FastShutterBits_Mode = 0; m_FastShutterBits_Test = 0; - m_IRQMask = 0; + m_IRTQMask = 0; saveIRQS = 0; } @@ -240,7 +240,7 @@ bool CCameraIO::FilterHome() // Check for strobe unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_GotTrigger ) { // Cycle all the way around if it's on the first time @@ -268,13 +268,13 @@ bool CCameraIO::FilterHome() Sleep ( STEP_DELAY ); val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_GotTrigger ) { Sleep ( 10 ); val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_GotTrigger ) { // Restore normal priority @@ -502,12 +502,12 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize int i; unsigned short BIC = m_ExposureBIC + m_ExposureStartX; - // Update internal variables in case application did not poll read_Status + // Update internal variables in case application did not poll read_tqStatus m_WaitingforTrigger = false; m_WaitingforLine = false; if ( m_WaitingforImage ) - { // In case application did not poll read_Status + { // In case application did not poll read_tqStatus m_WaitingforImage = false; ///////////////////////////////////// @@ -516,7 +516,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_FrameDone ) != 0 ) break; if ( clock() > StopTime ) return false; // Timed out @@ -553,7 +553,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -611,7 +611,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UnmaskIrqs(); +// UntqmaskIrqs(); if ( ret ) { // We were successfull @@ -679,7 +679,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) int i; if ( m_WaitingforLine ) - { // In case application did not poll read_Status + { // In case application did not poll read_tqStatus m_WaitingforLine = false; ///////////////////////////////////// @@ -688,7 +688,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -746,7 +746,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UnmaskIrqs(); +// UntqmaskIrqs(); return ret; } @@ -763,10 +763,10 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s if ( m_WaitingforTrigger ) { - Camera_Status stat; + Camera_tqStatus stat; while ( true ) { // This will wait forever if no trigger happens - stat = read_Status(); + stat = read_tqStatus(); if ( stat == Camera_Status_Exposing ) break; Sleep( 220 ); // dont bog down the CPU while polling } @@ -778,7 +778,7 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s clock_t StopTime = clock() + long( ( 1.2 * Duration + m_Timeout ) * CLOCKS_PER_SEC ); while ( true ) { - Camera_Status stat = read_Status(); + Camera_tqStatus stat = read_tqStatus(); if ( stat == Camera_Status_ImageReady ) break; if ( clock() > StopTime ) return false; // Timed out, no image available @@ -791,43 +791,43 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s //////////////////////////////////////////////////////////// // Camera Settings -Camera_Status CCameraIO::read_Status() +Camera_tqStatus CCameraIO::read_tqStatus() { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_Exposing ) //11.0 { ATLTRACE( "Exposing\r\n" ); m_WaitingforTrigger = false; - m_Status = Camera_Status_Exposing; + m_tqStatus = Camera_Status_Exposing; } else if ( m_WaitingforTrigger ) - m_Status = Camera_Status_Waiting; + m_tqStatus = Camera_Status_Waiting; else if ( m_WaitingforImage && ( val & RegBit_FrameDone ) ) //11.11 { ATLTRACE( "ImageReady\r\n" ); m_WaitingforImage = false; - m_Status = Camera_Status_ImageReady; + m_tqStatus = Camera_Status_ImageReady; } else if ( m_WaitingforLine && ( val & RegBit_LineDone ) ) //11.1 { ATLTRACE( "LineReady\r\n" ); m_WaitingforLine = false; - m_Status = Camera_Status_LineReady; + m_tqStatus = Camera_Status_LineReady; } else if ( m_WaitingforImage || m_WaitingforLine ) { ATLTRACE( "Flushing\r\n" ); - m_Status = Camera_Status_Flushing; + m_tqStatus = Camera_Status_Flushing; } else - m_Status = Camera_Status_Idle; + m_tqStatus = Camera_Status_Idle; - return m_Status; + return m_tqStatus; } bool CCameraIO::read_Present() @@ -839,13 +839,13 @@ bool CCameraIO::read_Present() bool FailedLoopback = false; unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( !( val & RegBit_LoopbackTest ) ) FailedLoopback = true; m_RegShadow[ Reg_BICCounter ] &= ~RegBit_LoopbackTest; // clear bit to 0 Write( Reg_BICCounter, m_RegShadow[ Reg_BICCounter ] ); - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_LoopbackTest ) FailedLoopback = true; */ @@ -884,7 +884,7 @@ bool CCameraIO::read_Present() bool CCameraIO::read_Shutter() { unsigned short regval = 0; - Read( Reg_Status, regval ); + Read( Reg_tqStatus, regval ); if ( !( regval & RegBit_Exposing ) ) { // We are not exposing, but might have finnshed an exposure // and have not called GetImage yet, so update our internal variable @@ -917,7 +917,7 @@ void CCameraIO::write_ForceShutterOpen( bool val ) m_RegShadow[ Reg_Command ] &= ~RegBit_ShutterOverride; // clear bit to 0 unsigned short regval = 0; - Read( Reg_Status, regval ); + Read( Reg_tqStatus, regval ); if ( ( regval & RegBit_Exposing ) ) { // Shutter will remain open if a Light frame is being taken @@ -1076,7 +1076,7 @@ void CCameraIO::write_CoolerSetPoint( double val ) Write( Reg_TempSetPoint, m_RegShadow[ Reg_TempSetPoint ] ); } -Camera_CoolerStatus CCameraIO::read_CoolerStatus() +Camera_CoolertqStatus CCameraIO::read_CoolertqStatus() { unsigned short val = 0; Read( Reg_CommandReadback, val ); @@ -1084,34 +1084,34 @@ Camera_CoolerStatus CCameraIO::read_CoolerStatus() if ( val & RegBit_CoolerEnable ) //12.15 { unsigned short val2 = 0; - Read( Reg_Status, val2 ); + Read( Reg_tqStatus, val2 ); if ( val & RegBit_CoolerShutdown ) //12.8 { if ( val2 & RegBit_ShutdownComplete ) //11.6 - m_CoolerStatus = Camera_CoolerStatus_AtAmbient; + m_CoolertqStatus = Camera_CoolerStatus_AtAmbient; else - m_CoolerStatus = Camera_CoolerStatus_RampingToAmbient; + m_CoolertqStatus = Camera_CoolerStatus_RampingToAmbient; } else { if ( val2 & RegBit_TempAtMax ) //11.5 - m_CoolerStatus = Camera_CoolerStatus_AtMax; + m_CoolertqStatus = Camera_CoolerStatus_AtMax; else if ( val2 & RegBit_TempAtMin ) //11.4 - m_CoolerStatus = Camera_CoolerStatus_AtMin; + m_CoolertqStatus = Camera_CoolerStatus_AtMin; else if ( val2 & RegBit_TempAtSetPoint ) //11.7 - m_CoolerStatus = Camera_CoolerStatus_AtSetPoint; + m_CoolertqStatus = Camera_CoolerStatus_AtSetPoint; // Check against last known cooler status - else if ( m_CoolerStatus == Camera_CoolerStatus_AtSetPoint ) - m_CoolerStatus = Camera_CoolerStatus_Correcting; + else if ( m_CoolertqStatus == Camera_CoolerStatus_AtSetPoint ) + m_CoolertqStatus = Camera_CoolerStatus_Correcting; else - m_CoolerStatus = Camera_CoolerStatus_RampingToSetPoint; + m_CoolertqStatus = Camera_CoolerStatus_RampingToSetPoint; } } else - m_CoolerStatus = Camera_CoolerStatus_Off; + m_CoolertqStatus = Camera_CoolerStatus_Off; - return m_CoolerStatus; + return m_CoolertqStatus; } Camera_CoolerMode CCameraIO::read_CoolerMode() @@ -1319,7 +1319,7 @@ void CCameraIO::Flush( short Rows ) while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_FrameDone ) != 0 ) break; if ( clock() > StopTime ) break; // Timed out diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h index d6a61e1c..62f50421 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.h +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h @@ -104,8 +104,8 @@ const long Reg_TempData = 9; // Register 10 const unsigned short RegBitShift_TempData = 0; // Bit 0 const unsigned short RegBitMask_TempData = 0xFF; // 8 bits -const long RegISA_Status = 0x006; // Register 11 in firmware -const long Reg_Status = 10; // Register 11 +const long RegISA_tqStatus = 0x006; // Register 11 in firmware +const long Reg_tqStatus = 10; // Register 11 const unsigned short RegBit_Exposing = 0x1; // Bit 0 const unsigned short RegBit_LineDone = 0x2; // Bit 1 const unsigned short RegBit_CacheReadOK = 0x4; // Bit 2 @@ -139,7 +139,7 @@ const long RegPCI_BICCounter = 0x01C; // Register 8 in PCI fir const long RegPCI_BICCounterRead = 0x03C; const long RegPCI_ImageData = 0x000; // Register 9 in PCI firmware const long RegPCI_TempData = 0x004; // Register 10 in PCI firmware -const long RegPCI_Status = 0x00C; // Register 11 in firmware +const long RegPCI_tqStatus = 0x00C; // Register 11 in firmware const long RegPCI_CommandReadback = 0x010; // Register 12 in PCI firmware @@ -161,7 +161,7 @@ public: //////////////////////////////////////////////////////////// // Camera Settings - Camera_Status read_Status(); // Current camera state + Camera_tqStatus read_tqStatus(); // Current camera state // <0: error codes // 0: idle // 1: flushing @@ -223,7 +223,7 @@ public: double read_CoolerSetPoint(); // Returns/sets setpoint temperature in degrees void write_CoolerSetPoint( double val ); // Celcius. - Camera_CoolerStatus read_CoolerStatus(); // Returns current cooler status + Camera_CoolertqStatus read_CoolertqStatus(); // Returns current cooler status Camera_CoolerMode read_CoolerMode(); // Returns/sets current cooler operation mode. void write_CoolerMode( Camera_CoolerMode val ); @@ -238,7 +238,7 @@ public: // Exposure Settings // The following variables are latched in Expose method, until next Reset or GetImage - short m_BinX, m_BinY; // Horizontal and vertical binning. + short m_BinX, m_BinY; //Qt::Horizontal and vertical binning. short m_StartX, m_StartY; // Zero based subframe start position in unbinned pixels. short m_NumX, m_NumY; // Subframe size in binned pixels. @@ -249,7 +249,7 @@ public: short m_Columns, m_Rows; // Total columns/rows on CCD (physical). short m_ImgColumns, m_ImgRows; // Unbinned columns/rows in imaging area short m_SkipC, m_SkipR; // Deleted data columns/rows not to be displayed or saved - short m_HFlush, m_VFlush; // Horizontal/Vertical flush binning. + short m_HFlush, m_VFlush; //Qt::Horizontal/Vertical flush binning. short m_BIC, m_BIR; // Before Image Column/Row count (dark non-imaging pixels). //////////////////////////////////////////////////////////// @@ -271,8 +271,8 @@ public: // Mask user requested set of IRQS // void MaskIrqs(); - // Restore default IRQ mask -// void UnmaskIrqs(); + // Restore default IRQ tqmask +// void UntqmaskIrqs(); // Starts flushing the camera (which should be the normal idle state) // If Rows is non-negative, only the specified number of rows are flushed, @@ -300,7 +300,7 @@ public: // The Duration parameter is the exposure time in seconds. The Light parameter controls // the status of the shutter during the exposure, Light = True opens the shutter, Light - // = False closes the shutter. Returns immediately after invocation, poll the CameraStatus + // = False closes the shutter. Returns immediately after invocation, poll the CameratqStatus // property to determine the start time of a triggered exposure and the end of an exposure. bool Expose( double Duration, bool Light ); @@ -314,7 +314,7 @@ public: // Drift scan methods // Begins clocking and digitization of a single line of data begining with a vertical clock - // sequence and ending with a buffer full of line data. Poll the CameraStatus property to + // sequence and ending with a buffer full of line data. Poll the CameratqStatus property to // determine when the data is ready for download. bool DigitizeLine(); @@ -346,7 +346,7 @@ public: short m_FilterStepPos; // Current filter position in our internal array bool m_Shutter; // Last known shutter state - Camera_Status m_Status; // Last known camera status + Camera_tqStatus m_tqStatus; // Last known camera status Camera_Interface m_Interface; // String acronyms may be used in INI file. // 0 or ISA: Industry Standard Architecture bus @@ -356,8 +356,8 @@ public: Camera_SensorType m_SensorType; // 0 or CCD: Charge Coupled Device // 1 or CMOS: Complementary Metal-Oxide-Silicon - Camera_CoolerStatus m_CoolerStatus; // Last known cooler status. - unsigned int m_IRQMask; // Set of IRQs masked on user request // 0: Off + Camera_CoolertqStatus m_CoolertqStatus; // Last known cooler status. + unsigned int m_IRTQMask; // Set of IRQs tqmasked on user request // 0: Off // 1: Ramping to set point // 2: Correcting // 3: Ramping to ambient @@ -367,12 +367,12 @@ public: // 7: At set point // Latched public variables used during Exposure..GetImage sequence - short m_ExposureBinX, m_ExposureBinY; // Horizontal and vertical binning. + short m_ExposureBinX, m_ExposureBinY; //Qt::Horizontal and vertical binning. short m_ExposureStartX, m_ExposureStartY; // Subframe start position in unbinned pixels. short m_ExposureNumX, m_ExposureNumY; // Subframe size in binned pixels. short m_ExposureColumns, m_ExposureRows; // Total columns/rows on CCD (physical). short m_ExposureSkipC, m_ExposureSkipR; // Deleted data columns/rows not to be displayed or saved to disk. - short m_ExposureHFlush, m_ExposureVFlush; // Horizontal/Vertical flush binning. + short m_ExposureHFlush, m_ExposureVFlush; //Qt::Horizontal/Vertical flush binning. short m_ExposureBIC, m_ExposureBIR; // Before Image Column/Row count (dark non-imaging pixels). unsigned short m_ExposureAIC; // Calculated After Image Column count (dark non-imaging pixels). unsigned short m_ExposureRemainingLines; // Number of lines to be clocked out by GetImage diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp index 16a6bb72..bbff2080 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp @@ -145,8 +145,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: realreg = RegISA_TempData; break; - case Reg_Status: - realreg = RegISA_Status; + case Reg_tqStatus: + realreg = RegISA_tqStatus; break; case Reg_CommandReadback: realreg = RegISA_CommandReadback; @@ -212,7 +212,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -301,7 +301,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp index a83a594e..15c139dd 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp @@ -199,8 +199,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: RegNumber = RegPCI_TempData; break; - case Reg_Status: - RegNumber = RegPCI_Status; + case Reg_tqStatus: + RegNumber = RegPCI_tqStatus; break; case Reg_CommandReadback: RegNumber = RegPCI_CommandReadback; @@ -266,7 +266,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -355,7 +355,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp index 7025d9ce..bb143e55 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp @@ -147,8 +147,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: realreg = RegISA_TempData; break; - case Reg_Status: - realreg = RegISA_Status; + case Reg_tqStatus: + realreg = RegISA_tqStatus; break; case Reg_CommandReadback: realreg = RegISA_CommandReadback; @@ -216,7 +216,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -307,7 +307,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp index 3e6cc43e..ba9ce96d 100644 --- a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp @@ -65,8 +65,8 @@ long CCameraIO_PCI::Read(unsigned short reg, unsigned short& val) case Reg_TempData: RegNumber = RegPCI_TempData; break; - case Reg_Status: - RegNumber = RegPCI_Status; + case Reg_tqStatus: + RegNumber = RegPCI_tqStatus; break; case Reg_CommandReadback: RegNumber = RegPCI_CommandReadback; @@ -268,7 +268,7 @@ long CCameraIO_PCI::ReadLine( long SkipPixels, long Pixels, unsigned short* pLin while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out diff --git a/kstars/kstars/indi/apogee/Camera_Example.cpp b/kstars/kstars/indi/apogee/Camera_Example.cpp index f1f64121..52a95f43 100644 --- a/kstars/kstars/indi/apogee/Camera_Example.cpp +++ b/kstars/kstars/indi/apogee/Camera_Example.cpp @@ -295,9 +295,9 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) } ///////////////////////////////////////////////////////////////////////////////// - // Necessary geometry settings + // Necessary tqgeometry settings - if (CfgGet (inifp, "geometry", "rows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "rows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_Rows = val; @@ -310,7 +310,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) return CCD_OPEN_CFGDATA; // rows MUST be defined } - if (CfgGet (inifp, "geometry", "columns", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "columns", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_Columns = val; @@ -490,31 +490,31 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) ///////////////////////////////////////////////////////////////////////////////// // Geometry - if (CfgGet (inifp, "geometry", "bic", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "bic", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXCOLUMNS ) cam->m_BIC = val; } - if (CfgGet (inifp, "geometry", "bir", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "bir", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXROWS ) cam->m_BIR = val; } - if (CfgGet (inifp, "geometry", "skipc", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "skipc", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXCOLUMNS ) cam->m_SkipC = val; } - if (CfgGet (inifp, "geometry", "skipr", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "skipr", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXROWS ) cam->m_SkipR = val; } - if (CfgGet (inifp, "geometry", "imgcols", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "imgcols", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_ImgColumns = val; @@ -522,7 +522,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC; - if (CfgGet (inifp, "geometry", "imgrows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "imgrows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_ImgRows = val; @@ -530,13 +530,13 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR; - if (CfgGet (inifp, "geometry", "hflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "hflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXHBIN ) cam->m_HFlush = val; } - if (CfgGet (inifp, "geometry", "vflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "vflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXVBIN ) cam->m_VFlush = val; diff --git a/kstars/kstars/indi/apogee/Makefile.am b/kstars/kstars/indi/apogee/Makefile.am index 3d62dadc..a49927d4 100644 --- a/kstars/kstars/indi/apogee/Makefile.am +++ b/kstars/kstars/indi/apogee/Makefile.am @@ -1,4 +1,6 @@ -INCLUDES = +# set the include path for X, qt and KDE +INCLUDES= $(all_includes) + METASOURCES = AUTO if HAVE_LIBUSB diff --git a/kstars/kstars/indi/apogee_ppi.cpp b/kstars/kstars/indi/apogee_ppi.cpp index 9898018f..6eb7063c 100644 --- a/kstars/kstars/indi/apogee_ppi.cpp +++ b/kstars/kstars/indi/apogee_ppi.cpp @@ -393,7 +393,7 @@ void ApogeeCam::ISNewNumber (const char */*dev*/, const char *name, double value void ApogeeCam::ISPoll() { static int mtc=5; - int readStatus=0; + int readtqStatus=0; double ccdTemp; if (!isCCDConnected()) @@ -407,16 +407,16 @@ void ApogeeCam::ISPoll() case IPS_BUSY: - readStatus = cam->read_Status(); - if (readStatus < 0) + readtqStatus = cam->read_tqStatus(); + if (readtqStatus < 0) { - IDLog("Error in exposure! Read status: %d\n", readStatus); + IDLog("Error in exposure! Read status: %d\n", readtqStatus); ExposeTimeNP.s = IPS_ALERT; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readStatus); + IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readtqStatus); return; } - else if (readStatus == Camera_Status_ImageReady) + else if (readtqStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; @@ -891,7 +891,7 @@ bool ApogeeCam::initCamera() { LilXML *XMLParser = newLilXML(); XMLEle *root = NULL, *camera = NULL, *ele = NULL; - XMLEle *system = NULL, *geometry = NULL, *temp = NULL, *ccd = NULL; + XMLEle *system = NULL, *tqgeometry = NULL, *temp = NULL, *ccd = NULL; XMLAtt *ap; FILE *spFile = NULL; char errmsg[1024]; @@ -948,7 +948,7 @@ bool ApogeeCam::initCamera() // Let's get the subsections now system = findXMLEle(camera, "System"); - geometry = findXMLEle(camera, "Geometry"); + tqgeometry = findXMLEle(camera, "Geometry"); temp = findXMLEle(camera, "Temp"); ccd = findXMLEle(camera, "CCD"); @@ -960,7 +960,7 @@ bool ApogeeCam::initCamera() return false; } - if (geometry == NULL) + if (tqgeometry == NULL) { IDLog("Error: Unable to find Geometry element in camera.\n"); IDMessage(mydev, "Error: Unable to find Geometry element in camera."); @@ -1000,7 +1000,7 @@ bool ApogeeCam::initCamera() bAddr = hextoi(valuXMLAtt(findXMLAtt(system, "Base"))) & 0xFFF; // Rows - ap = findXMLAtt(geometry, "Rows"); + ap = findXMLAtt(tqgeometry, "Rows"); if (!ap) { IDLog("Error: Unable to find attribute Rows.\n"); @@ -1012,7 +1012,7 @@ bool ApogeeCam::initCamera() cam->m_Rows = hextoi(valuXMLAtt(ap)); // Columns - ap = findXMLAtt(geometry, "Columns"); + ap = findXMLAtt(tqgeometry, "Columns"); if (!ap) { IDLog("Error: Unable to find attribute Columns.\n"); @@ -1210,7 +1210,7 @@ bool ApogeeCam::initCamera() } // BIC - ele = findXMLEle(geometry, "BIC"); + ele = findXMLEle(tqgeometry, "BIC"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1219,7 +1219,7 @@ bool ApogeeCam::initCamera() } // BIR - ele = findXMLEle(geometry, "BIR"); + ele = findXMLEle(tqgeometry, "BIR"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1228,7 +1228,7 @@ bool ApogeeCam::initCamera() } // SKIPC - ele = findXMLEle(geometry, "SKIPC"); + ele = findXMLEle(tqgeometry, "SKIPC"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1237,7 +1237,7 @@ bool ApogeeCam::initCamera() } // SKIPR - ele = findXMLEle(geometry, "SKIPR"); + ele = findXMLEle(tqgeometry, "SKIPR"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1246,7 +1246,7 @@ bool ApogeeCam::initCamera() } // IMG COlS - ele = findXMLEle(geometry, "ImgCols"); + ele = findXMLEle(tqgeometry, "ImgCols"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1257,7 +1257,7 @@ bool ApogeeCam::initCamera() cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC; // IMG ROWS - ele = findXMLEle(geometry, "ImgRows"); + ele = findXMLEle(tqgeometry, "ImgRows"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1268,7 +1268,7 @@ bool ApogeeCam::initCamera() cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR; // Hor Flush - ele = findXMLEle(geometry, "HFlush"); + ele = findXMLEle(tqgeometry, "HFlush"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1277,7 +1277,7 @@ bool ApogeeCam::initCamera() } // Ver Flush - ele = findXMLEle(geometry, "VFlush"); + ele = findXMLEle(tqgeometry, "VFlush"); if (ele) { val = hextoi(pcdataXMLEle(ele)); diff --git a/kstars/kstars/indi/base64.c b/kstars/kstars/indi/base64.c index 28424512..e83db546 100644 --- a/kstars/kstars/indi/base64.c +++ b/kstars/kstars/indi/base64.c @@ -30,7 +30,7 @@ #include "base64.h" static const char base64digits[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; #define BAD (-1) static const char base64val[] = { diff --git a/kstars/kstars/indi/celestrongps.cpp b/kstars/kstars/indi/celestrongps.cpp index a187aaf8..e25c95ac 100644 --- a/kstars/kstars/indi/celestrongps.cpp +++ b/kstars/kstars/indi/celestrongps.cpp @@ -65,7 +65,7 @@ static INumber eq[] = { }; //TODO decide appropiate TIME_OUT static INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; /* Fundamental group */ @@ -125,7 +125,7 @@ CelestronGPS::CelestronGPS() JD = 0; - // Children call parent routines, this is the default + // Children call tqparent routines, this is the default IDLog("initilizaing from Celeston GPS device...\n"); } @@ -316,7 +316,7 @@ void CelestronGPS::ISNewNumber (const char *dev, const char *name, double values JD = UTtoJD(tp); IDLog("We recevined JNOW RA %f - DEC %f\n", newRA, newDEC);; - /*apparentCoord( (double) J2000, JD, &newRA, &newDEC); + /*aptqparentCoord( (double) J2000, JD, &newRA, &newDEC); IDLog("Processed to RA %f - DEC %f\n", newRA, newDEC);*/ //eqNum.np[0].value = values[0]; @@ -637,7 +637,7 @@ void CelestronGPS::ISPoll() currentRA = targetRA; currentDEC = targetDEC; - /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; eqNum.np[1].value = currentDEC; @@ -693,7 +693,7 @@ void CelestronGPS::ISPoll() currentRA = GetRA(); currentDEC = GetDec(); - /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; diff --git a/kstars/kstars/indi/fitsrw.c b/kstars/kstars/indi/fitsrw.c index b21622bf..69b934b2 100644 --- a/kstars/kstars/indi/fitsrw.c +++ b/kstars/kstars/indi/fitsrw.c @@ -1676,7 +1676,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, {double offs, scale; double datadiff, pixdiff; unsigned char pixbuffer[4096], *pix, *cdata; - unsigned char creplace; + unsigned char ctqreplace; int transcount = 0; long tdata, tmin, tmax; int maxelem; @@ -1706,7 +1706,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, if (tmax < 0) tmax = 0; else if (tmax > 255) tmax = 255; cdata = (unsigned char *)buf; - creplace = (unsigned char)trans->replacement; + ctqreplace = (unsigned char)trans->replacement; switch (hdulist->bitpix) { @@ -1727,7 +1727,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { bp8 = (FITS_BITPIX8)*(pix++); if (bp8 == bp8blank) /* Is it a blank pixel ? */ - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else /* Do transform */ { tdata = (long)(bp8 * scale + offs); @@ -1770,7 +1770,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX16 (pix, bp16); if (bp16 == bp16blank) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { tdata = (long)(bp16 * scale + offs); @@ -1815,7 +1815,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX32 (pix, bp32); if (bp32 == bp32blank) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { tdata = (long)(bp32 * scale + offs); @@ -1856,7 +1856,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_32 (pix)) /* An IEEE special value ? */ - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else /* Do transform */ { FITS_GETBITPIXM32 (pix, bpm32); @@ -1884,7 +1884,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_64 (pix)) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { FITS_GETBITPIXM64 (pix, bpm64); diff --git a/kstars/kstars/indi/fli/libfli.c b/kstars/kstars/indi/fli/libfli.c index 68df7945..f089403c 100644 --- a/kstars/kstars/indi/fli/libfli.c +++ b/kstars/kstars/indi/fli/libfli.c @@ -489,7 +489,7 @@ LIBFLIAPI FLIGetVisibleArea(flidev_t dev, long* ul_x, long* ul_y, @see FLIExposeFrame @see FLICancelExposure - @see FLIGetExposureStatus + @see FLIGetExposuretqStatus */ LIBFLIAPI FLISetExposureTime(flidev_t dev, long exptime) { @@ -554,7 +554,7 @@ LIBFLIAPI FLISetImageArea(flidev_t dev, long ul_x, long ul_y, @param dev Camera to set horizontal bin factor of. - @param hbin Horizontal bin factor. + @param hbinQt::Horizontal bin factor. @return Zero on success. @return Non-zero on failure. @@ -577,7 +577,7 @@ LIBFLIAPI FLISetHBin(flidev_t dev, long hbin) @param dev Camera to set vertical bin factor of. - @param vbin Vertical bin factor. + @param vbinQt::Vertical bin factor. @return Zero on success. @return Non-zero on failure. @@ -626,7 +626,7 @@ LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype) @return Non-zero on failure. @see FLIExposeFrame - @see FLIGetExposureStatus + @see FLIGetExposuretqStatus @see FLISetExposureTime */ LIBFLIAPI FLICancelExposure(flidev_t dev) @@ -652,7 +652,7 @@ LIBFLIAPI FLICancelExposure(flidev_t dev) @see FLICancelExposure @see FLISetExposureTime */ -LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft) +LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft) { CHKDEVICE(dev); @@ -752,7 +752,7 @@ LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width) @see FLISetBitDepth @see FLIGrabFrame @see FLICancelExposure - @see FLIGetExposureStatus + @see FLIGetExposuretqStatus */ LIBFLIAPI FLIExposeFrame(flidev_t dev) { diff --git a/kstars/kstars/indi/fli/libfli.h b/kstars/kstars/indi/fli/libfli.h index 351a9e8e..ca6a7200 100644 --- a/kstars/kstars/indi/fli/libfli.h +++ b/kstars/kstars/indi/fli/libfli.h @@ -176,7 +176,7 @@ LIBFLIAPI FLISetHBin(flidev_t dev, long hbin); LIBFLIAPI FLISetVBin(flidev_t dev, long vbin); LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype); LIBFLIAPI FLICancelExposure(flidev_t dev); -LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft); +LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft); LIBFLIAPI FLISetTemperature(flidev_t dev, double temperature); LIBFLIAPI FLIGetTemperature(flidev_t dev, double *temperature); LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width); diff --git a/kstars/kstars/indi/fli_ccd.c b/kstars/kstars/indi/fli_ccd.c index 4fa9a95a..1cd195cd 100644 --- a/kstars/kstars/indi/fli_ccd.c +++ b/kstars/kstars/indi/fli_ccd.c @@ -76,8 +76,8 @@ extern int errno; #define MAX_CCD_TEMP 45 /* Max CCD temperature */ #define MIN_CCD_TEMP -55 /* Min CCD temperature */ -#define MAX_X_BIN 16. /* Max Horizontal binning */ -#define MAX_Y_BIN 16. /* Max Vertical binning */ +#define MAX_X_BIN 16. /* MaxQt::Horizontal binning */ +#define MAX_Y_BIN 16. /* MaxQt::Vertical binning */ #define MAX_PIXELS 4096 /* Max number of pixels in one dimension */ #define POLLMS 1000 /* Polling time (ms) */ #define TEMP_THRESHOLD .25 /* Differential temperature threshold (C)*/ @@ -610,13 +610,13 @@ void ISPoll(void *p) break; case IPS_BUSY: - if ( (err = FLIGetExposureStatus(fli_dev, &timeleft))) + if ( (err = FLIGetExposuretqStatus(fli_dev, &timeleft))) { ExposeTimeNP.s = IPS_IDLE; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "FLIGetExposureStatus() failed. %s.", strerror((int)-err)); - IDLog("FLIGetExposureStatus() failed. %s.\n", strerror((int)-err)); + IDSetNumber(&ExposeTimeNP, "FLIGetExposuretqStatus() failed. %s.", strerror((int)-err)); + IDLog("FLIGetExposuretqStatus() failed. %s.\n", strerror((int)-err)); break; } diff --git a/kstars/kstars/indi/indiapi.h b/kstars/kstars/indi/indiapi.h index 324b7824..d2ffd6fe 100644 --- a/kstars/kstars/indi/indiapi.h +++ b/kstars/kstars/indi/indiapi.h @@ -136,7 +136,7 @@ typedef struct { char label[MAXINDILABEL]; /** malloced text string */ char *text; - /** pointer to parent */ + /** pointer to tqparent */ struct _ITextVectorProperty *tvp; /** handy place to hang helper info */ void *aux0; @@ -182,7 +182,7 @@ typedef struct { double min, max; /** range, ignore if min == max */ double step; /** step size, ignore if step == 0 */ double value; /** current value */ - struct _INumberVectorProperty *nvp; /** pointer to parent */ + struct _INumberVectorProperty *nvp; /** pointer to tqparent */ void *aux0, *aux1; /** handy place to hang helper info */ } INumber; @@ -235,7 +235,7 @@ typedef struct { char name[MAXINDINAME]; /** index name */ char label[MAXINDILABEL]; /** this switch's label */ ISState s; /** this switch's state */ - struct _ISwitchVectorProperty *svp; /** pointer to parent */ + struct _ISwitchVectorProperty *svp; /** pointer to tqparent */ void *aux; /** handy place to hang helper info */ } ISwitch; @@ -276,7 +276,7 @@ typedef struct { char name[MAXINDINAME]; /** index name */ char label[MAXINDILABEL]; /** this lights's label */ IPState s; /** this lights's state */ - struct _ILightVectorProperty *lvp; /** pointer to parent */ + struct _ILightVectorProperty *lvp; /** pointer to tqparent */ void *aux; /** handy place to hang helper info */ } ILight; @@ -320,7 +320,7 @@ typedef struct { /* one BLOB descriptor */ int bloblen; /** n uncompressed bytes */ int size; - /** pointer to parent */ + /** pointer to tqparent */ struct _IBLOBVectorProperty *bvp; /** handy place to hang helper info */ void *aux0, *aux1, *aux2; diff --git a/kstars/kstars/indi/indicom.c b/kstars/kstars/indi/indicom.c index 15b02c8e..6b648f99 100644 --- a/kstars/kstars/indi/indicom.c +++ b/kstars/kstars/indi/indicom.c @@ -63,7 +63,7 @@ void updateAstroValues( double jd ); void nutate(double *RA, double *Dec); void aberrate(double *RA, double *Dec); void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec); -void apparentCoord(double jd0, double jdf, double *RA, double *Dec); +void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec); void getSexComponents(double value, int *d, int *m, int *s); double K = ( 20.49552 / 3600. ); @@ -370,7 +370,7 @@ void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec) *RA = ( *RA + 360.0 ); } -void apparentCoord(double jd0, double jdf, double *RA, double *Dec) +void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec) { *RA = *RA * 15.0; diff --git a/kstars/kstars/indi/indicom.h b/kstars/kstars/indi/indicom.h index 726c7dcd..6f59a63d 100644 --- a/kstars/kstars/indi/indicom.h +++ b/kstars/kstars/indi/indicom.h @@ -169,13 +169,13 @@ void aberrate(double *RA, double *Dec); */ void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec); -/** \brief Calculate the apparent coordiantes for RA and Dec from any epoch to any epoch. +/** \brief Calculate the aptqparent coordiantes for RA and Dec from any epoch to any epoch. \param jd0 starting epoch. \param jdf final epoch. \param RA a pointer to a double containing the Right ascension in hours. The function stores the processed Right ascension back in this variable. \param Dec a pointer to a double containing the delination in degrees. The function stores the processed delination back in this variable. */ -void apparentCoord(double jd0, double jdf, double *RA, double *Dec); +void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec); /*@}*/ diff --git a/kstars/kstars/indi/indiserver.c b/kstars/kstars/indi/indiserver.c index ad4d2ffd..2f73ca5d 100644 --- a/kstars/kstars/indi/indiserver.c +++ b/kstars/kstars/indi/indiserver.c @@ -316,7 +316,7 @@ startDvr (DvrInfo *dp) /* go -- should never return */ execlp (dp->name, dp->name, NULL); fprintf (stderr, "Driver %s: %s\n", dp->name, strerror(errno)); - _exit (1); /* parent will notice EOF shortly */ + _exit (1); /* tqparent will notice EOF shortly */ } /* don't need child's side of pipes */ @@ -710,7 +710,7 @@ send2Clients (ClInfo *notme, XMLEle *root, char *dev) pthread_mutex_unlock (&client_m); } -/* free Msg mp and everything it contains */ +/* free Msg mp and everything it tqcontains */ static void freeMsg (Msg *mp) { diff --git a/kstars/kstars/indi/lilxml.c b/kstars/kstars/indi/lilxml.c index c8344b5e..4d52aaf2 100644 --- a/kstars/kstars/indi/lilxml.c +++ b/kstars/kstars/indi/lilxml.c @@ -78,7 +78,7 @@ struct _LilXML { /* internal representation of a (possibly nested) XML element */ struct _xml_ele { char *tag; /* element tag */ - struct _xml_ele *pe; /* parent element, or NULL if root */ + struct _xml_ele *pe; /* tqparent element, or NULL if root */ XMLAtt **at; /* list of attributes */ int nat; /* number of attributes */ int ait; /* used to iterate over at[] */ @@ -130,7 +130,7 @@ delLilXML (LilXML *lp) freemem (lp); } -/* delete ep and all its children */ +/* delete ep and all its tqchildren */ void delXMLEle (XMLEle *ep) { @@ -294,16 +294,16 @@ nextXMLAtt (XMLEle *ep, int init) return (ep->at[ait]); } -/* return parent of given XMLEle */ +/* return tqparent of given XMLEle */ XMLEle * -parentXMLEle (XMLEle *ep) +tqparentXMLEle (XMLEle *ep) { return (ep->pe); } -/* return parent element of given XMLAtt */ +/* return tqparent element of given XMLAtt */ XMLEle * -parentXMLAtt (XMLAtt *ap) +tqparentXMLAtt (XMLAtt *ap) { return (ap->ce); } @@ -632,7 +632,7 @@ pushXMLEle(LilXML *lp) resetEndTag(lp); } -/* point ce to parent of current ce. +/* point ce to tqparent of current ce. * endtag no longer valid. */ static void diff --git a/kstars/kstars/indi/lilxml.h b/kstars/kstars/indi/lilxml.h index 98bfdd2b..1b638f5b 100644 --- a/kstars/kstars/indi/lilxml.h +++ b/kstars/kstars/indi/lilxml.h @@ -130,15 +130,15 @@ extern XMLEle *nextXMLEle (XMLEle *ep, int first); extern XMLAtt *nextXMLAtt (XMLEle *ep, int first); /* tree functions */ -/** \brief Return the parent of an XML element. - \return a pointer to the XML element parent. +/** \brief Return the tqparent of an XML element. + \return a pointer to the XML element tqparent. */ -extern XMLEle *parentXMLEle (XMLEle *ep); +extern XMLEle *tqparentXMLEle (XMLEle *ep); -/** \brief Return the parent of an XML attribute. - \return a pointer to the XML element parent. +/** \brief Return the tqparent of an XML attribute. + \return a pointer to the XML element tqparent. */ -extern XMLEle *parentXMLAtt (XMLAtt *ap); +extern XMLEle *tqparentXMLAtt (XMLAtt *ap); /* access functions */ /** \brief Return the tag of an XML element. @@ -171,13 +171,13 @@ extern char *valuXMLAtt (XMLAtt *ap); */ extern int pcdatalenXMLEle (XMLEle *ep); -/** \brief Return the number of nested XML elements in a parent XML element. +/** \brief Return the number of nested XML elements in a tqparent XML element. \param ep a pointer to an XML element. \return the number of nested XML elements. */ extern int nXMLEle (XMLEle *ep); -/** \brief Return the number of XML attributes in a parent XML element. +/** \brief Return the number of XML attributes in a tqparent XML element. \param ep a pointer to an XML element. \return the number of XML attributes within the XML element. */ diff --git a/kstars/kstars/indi/lx200_16.cpp b/kstars/kstars/indi/lx200_16.cpp index fe37df18..e9e95534 100644 --- a/kstars/kstars/indi/lx200_16.cpp +++ b/kstars/kstars/indi/lx200_16.cpp @@ -101,7 +101,7 @@ void LX200_16::ISGetProperties (const char *dev) if (dev && strcmp (thisDevice, dev)) return; - // process parent first + // process tqparent first LX200Autostar::ISGetProperties(dev); IDDefNumber (&horNum, NULL); @@ -304,7 +304,7 @@ void LX200_16::handleAltAzSlew() case IPS_BUSY: - if ( (err = getHomeSearchStatus(&searchResult)) < 0) + if ( (err = getHomeSearchtqStatus(&searchResult)) < 0) { handleError(&HomeSearchSw, err, "Home search"); return; diff --git a/kstars/kstars/indi/lx200autostar.cpp b/kstars/kstars/indi/lx200autostar.cpp index 79c3d575..4a397eff 100644 --- a/kstars/kstars/indi/lx200autostar.cpp +++ b/kstars/kstars/indi/lx200autostar.cpp @@ -148,7 +148,7 @@ void LX200Autostar::ISNewNumber (const char *dev, const char *name, double value IDSetText(&VersionInfo, NULL); - // process parent + // process tqparent LX200Generic::getBasicData(); } diff --git a/kstars/kstars/indi/lx200basic.cpp b/kstars/kstars/indi/lx200basic.cpp index a812caa6..1d41e652 100644 --- a/kstars/kstars/indi/lx200basic.cpp +++ b/kstars/kstars/indi/lx200basic.cpp @@ -165,7 +165,7 @@ void LX200Basic::initProperties() fillNumber(&EqN[0], "RA", "RA H:M:S", "%10.6m", 0., 24., 0., 0.); fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.); - fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); + fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); } diff --git a/kstars/kstars/indi/lx200classic.cpp b/kstars/kstars/indi/lx200classic.cpp index 5788bd16..cd074209 100644 --- a/kstars/kstars/indi/lx200classic.cpp +++ b/kstars/kstars/indi/lx200classic.cpp @@ -327,7 +327,7 @@ void LX200Classic::ISNewNumber (const char *dev, const char *name, double values void LX200Classic::getBasicData() { - // process parent first + // process tqparent first LX200Generic::getBasicData(); } diff --git a/kstars/kstars/indi/lx200driver.c b/kstars/kstars/indi/lx200driver.c index 9c521cfe..bd85ba88 100644 --- a/kstars/kstars/indi/lx200driver.c +++ b/kstars/kstars/indi/lx200driver.c @@ -78,8 +78,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search Status */ -int getHomeSearchStatus(int *status); +/* Get Home Search tqStatus */ +int getHomeSearchtqStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -99,7 +99,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int setAlignmentMode(unsigned int alignMode); +int tqsetAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ @@ -203,7 +203,7 @@ int testTelescope() int testAP() { int i=0; - char currentDate[64]; + char tqcurrentDate[64]; fprintf(stderr, "Testing telescope's connection...\n"); @@ -211,7 +211,7 @@ int testAP() / We're going to request the calander date */ for (i=0; i < 2; i++) { - if (!getCalenderDate(currentDate)) + if (!getCalenderDate(tqcurrentDate)) return 0; usleep(50000); @@ -534,7 +534,7 @@ int getNumberOfBars(int *value) return 0; } -int getHomeSearchStatus(int *status) +int getHomeSearchtqStatus(int *status) { char tempString[16]; @@ -726,9 +726,9 @@ int setCommandXYZ(int x, int y, int z, const char *cmd) return (setStandardProcedure(tempString)); } -int setAlignmentMode(unsigned int alignMode) +int tqsetAlignmentMode(unsigned int alignMode) { - fprintf(stderr , "Set alignment mode %d\n", alignMode); + fprintf(stderr , "Set tqalignment mode %d\n", alignMode); switch (alignMode) { diff --git a/kstars/kstars/indi/lx200driver.h b/kstars/kstars/indi/lx200driver.h index 06b8017f..529dfa02 100644 --- a/kstars/kstars/indi/lx200driver.h +++ b/kstars/kstars/indi/lx200driver.h @@ -157,8 +157,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search Status */ -int getHomeSearchStatus(int *status); +/* Get Home Search tqStatus */ +int getHomeSearchtqStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -178,7 +178,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int setAlignmentMode(unsigned int alignMode); +int tqsetAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp index b4f6d792..d498ba62 100644 --- a/kstars/kstars/indi/lx200generic.cpp +++ b/kstars/kstars/indi/lx200generic.cpp @@ -41,7 +41,8 @@ #if !(TIMEZONE_IS_INT) -static int daylight = 0; +//static int daylight = 0; +int daylight = 0; #endif static inline double timezoneOffset() @@ -117,7 +118,7 @@ INumber eq[] = { //TODO decide appropiate TIME_OUT // N.B. No Static identifier as it is needed for external linkage INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; /* Fundamental group */ @@ -327,7 +328,7 @@ LX200Generic::LX200Generic() IDLog("Julian Day is %g\n", JD); - // Children call parent routines, this is the default + // Children call tqparent routines, this is the default IDLog("initilizaing from generic LX200 device...\n"); IDLog("INDI Version: 2004-02-17\n"); @@ -561,7 +562,7 @@ void LX200Generic::ISNewNumber (const char *dev, const char *name, double values IDLog("We received J2000 RA %g - DEC %g\n", newRA, newDEC); IDLog("We received J2000 RA %s - DEC %s\n", RAStr, DecStr); - /*apparentCoord( (double) J2000, JD, &newRA, &newDEC); + /*aptqparentCoord( (double) J2000, JD, &newRA, &newDEC); fs_sexa(RAStr, newRA, 2, 3600); fs_sexa(DecStr, newDEC, 2, 3600); @@ -906,9 +907,9 @@ void LX200Generic::ISNewSwitch (const char *dev, const char *name, ISState *stat IUUpdateSwitches(&AlignmentSw, states, names, n); index = getOnSwitch(&AlignmentSw); - if ( ( err = setAlignmentMode(index) < 0) ) + if ( ( err = tqsetAlignmentMode(index) < 0) ) { - handleError(&AlignmentSw, err, "Setting alignment"); + handleError(&AlignmentSw, err, "Setting tqalignment"); return; } @@ -1405,7 +1406,7 @@ void LX200Generic::ISPoll() case IPS_BUSY: getLX200RA(¤tRA); getLX200DEC(¤tDEC); - /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; eqNum.np[1].value = currentDEC; @@ -1789,7 +1790,7 @@ void LX200Generic::getAlignment() signed char align = ACK(); if (align < 0) { - IDSetSwitch (&AlignmentSw, "Failed to get telescope alignment."); + IDSetSwitch (&AlignmentSw, "Failed to get telescope tqalignment."); return; } diff --git a/kstars/kstars/indi/lx200gps.cpp b/kstars/kstars/indi/lx200gps.cpp index 451a7269..158cd14a 100644 --- a/kstars/kstars/indi/lx200gps.cpp +++ b/kstars/kstars/indi/lx200gps.cpp @@ -42,7 +42,7 @@ static ISwitch AzRaBackSlashS[] = {{ "Activate", "", ISS_OFF, 0, 0}}; static ISwitch OTAUpdateS[] = {{ "Update", "", ISS_OFF, 0, 0}}; static ISwitchVectorProperty GPSPowerSw = { mydev, "GPS Power", "", GPSGroup, IP_RW, ISR_1OFMANY, 0 , IPS_IDLE, GPSPowerS, NARRAY(GPSPowerS), "", 0}; -static ISwitchVectorProperty GPSStatusSw = { mydev, "GPS Status", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSStatusS, NARRAY(GPSStatusS), "", 0}; +static ISwitchVectorProperty GPSStatusSw = { mydev, "GPS tqStatus", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSStatusS, NARRAY(GPSStatusS), "", 0}; static ISwitchVectorProperty GPSUpdateSw = { mydev, "GPS System", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSUpdateS, NARRAY(GPSUpdateS), "", 0}; static ISwitchVectorProperty AltDecPecSw = { mydev, "Alt/Dec PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AltDecPecS, NARRAY(AltDecPecS), "", 0}; static ISwitchVectorProperty AzRaPecSw = { mydev, "Az/Ra PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AzRaPecS, NARRAY(AzRaPecS), "", 0}; @@ -83,7 +83,7 @@ void LX200GPS::ISGetProperties (const char *dev) if (dev && strcmp (thisDevice, dev)) return; -// process parent first +// process tqparent first LX200_16::ISGetProperties(dev); IDDefSwitch (&GPSPowerSw, NULL); @@ -139,7 +139,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], return; } - /* GPS Status Update */ + /* GPS tqStatus Update */ if (!strcmp(name,GPSStatusSw.name)) { if (checkPower(&GPSStatusSw)) @@ -334,7 +334,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], //getOTATemp(&OTATemp.np[0].value); //IDSetNumber(&OTATemp, NULL); - // process parent + // process tqparent LX200_16::getBasicData(); } diff --git a/kstars/kstars/indi/sbigccd.cpp b/kstars/kstars/indi/sbigccd.cpp index fb35cf59..9eef1a42 100644 --- a/kstars/kstars/indi/sbigccd.cpp +++ b/kstars/kstars/indi/sbigccd.cpp @@ -326,7 +326,7 @@ void SBIGCam::ISStaticPoll(void *p) void SBIGCam::ISPoll() { static int mtc=5; - int readStatus=0; + int readtqStatus=0; double ccdTemp (0); switch (ExposeTimeNP.s) @@ -340,8 +340,8 @@ void SBIGCam::ISPoll() // JM: Here we check the status of the camera (whether it's still capturing an image or has finished that) // ISPoll is called once per second. e.g. below for how we do this for Apogee Cameras /* - readStatus = cam->read_Status(); - if (readStatus < 0) + readtqStatus = cam->read_tqStatus(); + if (readtqStatus < 0) { IDLog("Error in exposure!\n"); ExposeTimeNP.s = IPS_IDLE; @@ -349,7 +349,7 @@ void SBIGCam::ISPoll() IDSetNumber(&ExposeTimeNP, "Error in exposure procedure."); return; } - else if (readStatus == Camera_Status_ImageReady) + else if (readtqStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; diff --git a/kstars/kstars/indi/skycommander.c b/kstars/kstars/indi/skycommander.c index 261b6808..6bf23437 100644 --- a/kstars/kstars/indi/skycommander.c +++ b/kstars/kstars/indi/skycommander.c @@ -54,7 +54,7 @@ INumber eq[] = { {"DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0., 0, 0, 0}, }; INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE, + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; diff --git a/kstars/kstars/indi/temmadriver.h b/kstars/kstars/indi/temmadriver.h index 79926c3f..8bd2ccc1 100644 --- a/kstars/kstars/indi/temmadriver.h +++ b/kstars/kstars/indi/temmadriver.h @@ -172,14 +172,14 @@ static ITextVectorProperty Port = { IP_RW, 0, IPS_OK, PortT, NARRAY(PortT), "", 0}; /*******************************/ -/* EQUATORIAL_COORD RW property */ +/* ETQUATORIAL_COORD RW property */ /*******************************/ static INumber eq[] = { {"RA" ,"RA H:M:S" , "%10.6m", 0, 24, 0, 0, 0, 0, 0}, {"DEC", "Dec D:M:S", "%10.6m", -90, 90, 0, 0, 0, 0, 0} }; static INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", MAIN_GROUP , IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; /*******************************/ diff --git a/kstars/kstars/indi/v4lphilips.cpp b/kstars/kstars/indi/v4lphilips.cpp index cc15d43d..f759e097 100644 --- a/kstars/kstars/indi/v4lphilips.cpp +++ b/kstars/kstars/indi/v4lphilips.cpp @@ -46,7 +46,7 @@ void V4L_Philips::initCamBase() void V4L_Philips::initProperties(const char *dev) { - // Call parent + // Call tqparent V4L_Driver::initProperties(dev); fillSwitch(&BackLightS[0], "ON", "", ISS_OFF); @@ -375,7 +375,7 @@ void V4L_Philips::ISNewSwitch (const char *dev, const char *name, ISState *state } #endif - // Call parent + // Call tqparent V4L_Driver::ISNewSwitch(dev, name, states, names, n); @@ -481,7 +481,7 @@ void V4L_Philips::ISNewNumber (const char *dev, const char *name, double values[ #endif - // Call parent + // Call tqparent V4L_Driver::ISNewNumber(dev, name, values, names, n); } diff --git a/kstars/kstars/indi/webcam/Makefile.am b/kstars/kstars/indi/webcam/Makefile.am index 565859da..3b73d055 100644 --- a/kstars/kstars/indi/webcam/Makefile.am +++ b/kstars/kstars/indi/webcam/Makefile.am @@ -1,3 +1,6 @@ +# set the include path for X, qt and KDE +INCLUDES= $(all_includes) + if HAVE_V4L2 libwebcam_linux = libwebcam_v4l2_linux.la else diff --git a/kstars/kstars/indi/webcam/ccvt_c2.c b/kstars/kstars/indi/webcam/ccvt_c2.c index 52ed276d..1fb7bcbf 100644 --- a/kstars/kstars/indi/webcam/ccvt_c2.c +++ b/kstars/kstars/indi/webcam/ccvt_c2.c @@ -8,7 +8,7 @@ #include "ccvt_types.h" /* by suitable definition of PIXTYPE, can do yuv to rgb or bgr, with or -without word alignment */ +without word tqalignment */ /* This doesn't exactly earn a prize in a programming beauty contest. */ diff --git a/kstars/kstars/indi/webcam/port.cpp b/kstars/kstars/indi/webcam/port.cpp index fce53a18..971cd9ad 100644 --- a/kstars/kstars/indi/webcam/port.cpp +++ b/kstars/kstars/indi/webcam/port.cpp @@ -20,9 +20,9 @@ // I/O ports wrapper code // This file might need tweaking if you're trying to port my code to other // x86 Unix platforms. Code is already available for Linux, FreeBSD, and -// QNX; see the Makefile. +// TQNX; see the Makefile. // -// QNX code by: Anders Arpteg +// TQNX code by: Anders Arpteg // FreeBSD code by: Patrick Reynolds and Charles // Henrich @@ -43,7 +43,7 @@ #else #include #endif /* arm */ -#elif defined(QNX) +#elif defined(TQNX) #include #elif defined(__FreeBSD__) #include diff --git a/kstars/kstars/indi/webcam/port.h b/kstars/kstars/indi/webcam/port.h index c5896858..2e398019 100644 --- a/kstars/kstars/indi/webcam/port.h +++ b/kstars/kstars/indi/webcam/port.h @@ -20,9 +20,9 @@ // I/O ports wrapper definitions and prototypes // This file might need tweaking if you're trying to port my code to other // x86 Unix platforms. Code is already available for Linux, FreeBSD, and -// QNX; see the Makefile. +// TQNX; see the Makefile. // -// QNX code by: Anders Arpteg +// TQNX code by: Anders Arpteg // FreeBSD code by: Patrick Reynolds and Charles // Henrich // Inlining implemented by: Philip Blundell @@ -38,7 +38,7 @@ #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) && !defined(__mips__) && !defined(__mc68000__) #include #endif /* !arm */ -#elif defined(QNX) +#elif defined(TQNX) #include #elif defined(__FreeBSD__) #include @@ -90,7 +90,7 @@ public: inline void write_control(int data) { outb(control_reg = data, port2); } inline void setbit_control(int data) { outb(control_reg |= data, port2); } inline void clearbit_control(int data) { outb(control_reg &= ~data, port2); } -#else // Solaris, QNX, and *BSD use (port, data) instead +#else // Solaris, TQNX, and *BSD use (port, data) instead inline void write_data(int data) { outb(port, data); } inline void write_control(int data) { outb(port2, control_reg = data); } inline void setbit_control(int data) { outb(port2, control_reg |= data); } diff --git a/kstars/kstars/indi/webcam/pwc-ioctl.h b/kstars/kstars/indi/webcam/pwc-ioctl.h index 9b650298..e161acdb 100644 --- a/kstars/kstars/indi/webcam/pwc-ioctl.h +++ b/kstars/kstars/indi/webcam/pwc-ioctl.h @@ -43,7 +43,7 @@ /* The frame rate is encoded in the video_window.flags parameter using the upper 16 bits, since some flags are defined nowadays. The following - defines provide a mask and shift to filter out this value. + defines provide a tqmask and shift to filter out this value. In 'Snapshot' mode the camera freezes its automatic exposure and colour balance controls. @@ -121,9 +121,9 @@ struct pwc_leds the preferred mode is not available. */ /* Set preferred compression quality (0 = uncompressed, 3 = highest compression) */ -#define VIDIOCPWCSCQUAL _IOW('v', 195, int) +#define VIDIOCPWCSCTQUAL _IOW('v', 195, int) /* Get preferred compression quality */ -#define VIDIOCPWCGCQUAL _IOR('v', 195, int) +#define VIDIOCPWCGCTQUAL _IOR('v', 195, int) /* This is a probe function; since so many devices are supported, it diff --git a/kstars/kstars/indi/webcam/v4l1_pwc.cpp b/kstars/kstars/indi/webcam/v4l1_pwc.cpp index 9f644885..f87d9c82 100644 --- a/kstars/kstars/indi/webcam/v4l1_pwc.cpp +++ b/kstars/kstars/indi/webcam/v4l1_pwc.cpp @@ -259,13 +259,13 @@ int V4L1_PWC::setExposure(int val, char *errmsg) void V4L1_PWC::setCompression(int val) { - ioctl(fd, VIDIOCPWCSCQUAL, &val); + ioctl(fd, VIDIOCPWCSCTQUAL, &val); } int V4L1_PWC::getCompression() { int gain; - ioctl(fd, VIDIOCPWCGCQUAL , &gain); + ioctl(fd, VIDIOCPWCGCTQUAL , &gain); if (gain < 0) gain*=-1; return gain; } diff --git a/kstars/kstars/indi/webcam/v4l1_pwc.h b/kstars/kstars/indi/webcam/v4l1_pwc.h index fd2e2032..3790daa2 100644 --- a/kstars/kstars/indi/webcam/v4l1_pwc.h +++ b/kstars/kstars/indi/webcam/v4l1_pwc.h @@ -34,7 +34,7 @@ class V4L1_PWC : public V4L1_Base int connectCam(const char * devpath, char *errmsg); - /* Philips related, from QAstrocam */ + /* Philips related, from TQAstrocam */ int saveSettings(char *errmsg); void restoreSettings(); void restoreFactorySettings(); diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp index 26ec3d51..a4ba8d72 100644 --- a/kstars/kstars/indi/webcam/v4l2_base.cpp +++ b/kstars/kstars/indi/webcam/v4l2_base.cpp @@ -168,7 +168,7 @@ int V4L2_Base::read_frame(char *errmsg) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -179,7 +179,7 @@ int V4L2_Base::read_frame(char *errmsg) /* fall through */ default: - return errno_exit ("VIDIOC_DQBUF", errmsg); + return errno_exit ("VIDIOC_DTQBUF", errmsg); } } @@ -206,8 +206,8 @@ int V4L2_Base::read_frame(char *errmsg) break; } - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); if (dropFrame) { @@ -227,7 +227,7 @@ int V4L2_Base::read_frame(char *errmsg) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_USERPTR; - if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -238,7 +238,7 @@ int V4L2_Base::read_frame(char *errmsg) /* fall through */ default: - errno_exit ("VIDIOC_DQBUF", errmsg); + errno_exit ("VIDIOC_DTQBUF", errmsg); } } @@ -251,8 +251,8 @@ int V4L2_Base::read_frame(char *errmsg) //process_image ((void *) buf.m.userptr); - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + errno_exit ("VIDIOC_TQBUF", errmsg); break; } @@ -309,8 +309,8 @@ int V4L2_Base::start_capturing(char * errmsg) buf.memory = V4L2_MEMORY_MMAP; buf.index = i; - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); } @@ -336,8 +336,8 @@ int V4L2_Base::start_capturing(char * errmsg) buf.m.userptr = (unsigned long) buffers[i].start; buf.length = buffers[i].length; - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); } @@ -414,7 +414,7 @@ int V4L2_Base::init_mmap(char *errmsg) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) { + if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (EINVAL == errno) { fprintf (stderr, "%s does not support " "memory mapping\n", dev_name); @@ -422,7 +422,7 @@ int V4L2_Base::init_mmap(char *errmsg) "memory mapping\n", dev_name); return -1; } else { - return errno_exit ("VIDIOC_REQBUFS", errmsg); + return errno_exit ("VIDIOC_RETQBUFS", errmsg); } } @@ -453,8 +453,8 @@ int V4L2_Base::init_mmap(char *errmsg) buf.memory = V4L2_MEMORY_MMAP; buf.index = n_buffers; - if (-1 == xioctl (fd, VIDIOC_QUERYBUF, &buf)) - return errno_exit ("VIDIOC_QUERYBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQUERYBUF, &buf)) + return errno_exit ("VIDIOC_TQUERYBUF", errmsg); buffers[n_buffers].length = buf.length; buffers[n_buffers].start = @@ -482,13 +482,13 @@ void V4L2_Base::init_userp(unsigned int buffer_size) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_USERPTR; - if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) { + if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (EINVAL == errno) { fprintf (stderr, "%s does not support " "user pointer i/o\n", dev_name); exit (EXIT_FAILURE); } else { - errno_exit ("VIDIOC_REQBUFS", errmsg); + errno_exit ("VIDIOC_RETQBUFS", errmsg); } } @@ -514,7 +514,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height { unsigned int min; - if (-1 == xioctl (fd, VIDIOC_QUERYCAP, &cap)) + if (-1 == xioctl (fd, VIDIOC_TQUERYCAP, &cap)) { if (EINVAL == errno) { fprintf (stderr, "%s is no V4L2 device\n", @@ -522,7 +522,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height snprintf(errmsg, ERRMSGSIZ, "%s is no V4L2 device\n", dev_name); return -1; } else { - return errno_exit ("VIDIOC_QUERYCAP", errmsg); + return errno_exit ("VIDIOC_TQUERYCAP", errmsg); } } @@ -953,7 +953,7 @@ void V4L2_Base::enumerate_ctrl (void) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { cerr << "Control " << queryctrl.name << endl; @@ -969,14 +969,14 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) continue; - errno_exit("VIDIOC_QUERYCTRL", errmsg); + errno_exit("VIDIOC_TQUERYCTRL", errmsg); return; } } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { cerr << "Private Control " << queryctrl.name << endl; @@ -989,7 +989,7 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) break; - errno_exit ("VIDIOC_QUERYCTRL", errmsg); + errno_exit ("VIDIOC_TQUERYCTRL", errmsg); return; } @@ -1007,12 +1007,12 @@ void V4L2_Base::enumerate_menu (void) for (querymenu.index = queryctrl.minimum; querymenu.index <= queryctrl.maximum; querymenu.index++) { - if (0 == xioctl (fd, VIDIOC_QUERYMENU, &querymenu)) + if (0 == xioctl (fd, VIDIOC_TQUERYMENU, &querymenu)) { cerr << " " << querymenu.name << endl; } else { - errno_exit("VIDIOC_QUERYMENU", errmsg); + errno_exit("VIDIOC_TQUERYMENU", errmsg); return; } } @@ -1027,10 +1027,10 @@ int V4L2_Base::query_ctrl(unsigned int ctrl_id, double & ctrl_min, double & ctr queryctrl.id = ctrl_id; - if (-1 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (-1 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (errno != EINVAL) - return errno_exit ("VIDIOC_QUERYCTRL", errmsg); + return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); else { @@ -1074,7 +1074,7 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { @@ -1113,13 +1113,13 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) } } else if (errno != EINVAL) - return errno_exit ("VIDIOC_QUERYCTRL", errmsg); + return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { diff --git a/kstars/kstars/indi/webcam/videodev.h b/kstars/kstars/indi/webcam/videodev.h index a5b0aec7..a7929058 100644 --- a/kstars/kstars/indi/webcam/videodev.h +++ b/kstars/kstars/indi/webcam/videodev.h @@ -302,9 +302,9 @@ struct video_code #define VID_HARDWARE_BT848 1 -#define VID_HARDWARE_QCAM_BW 2 +#define VID_HARDWARE_TQCAM_BW 2 #define VID_HARDWARE_PMS 3 -#define VID_HARDWARE_QCAM_C 4 +#define VID_HARDWARE_TQCAM_C 4 #define VID_HARDWARE_PSEUDO 5 #define VID_HARDWARE_SAA5249 6 #define VID_HARDWARE_AZTECH 7 diff --git a/kstars/kstars/indi/webcam/videodev2.h b/kstars/kstars/indi/webcam/videodev2.h index e3dab3a6..b6a05dbd 100644 --- a/kstars/kstars/indi/webcam/videodev2.h +++ b/kstars/kstars/indi/webcam/videodev2.h @@ -388,7 +388,7 @@ struct v4l2_buffer /* Flags for 'flags' field */ #define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ +#define V4L2_BUF_FLAG_TQUEUED 0x0002 /* Buffer is queued for processing */ #define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ #define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ #define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ @@ -448,7 +448,7 @@ struct v4l2_captureparm __u32 reserved[4]; }; /* Flags for 'capability' and 'capturemode' fields */ -#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ +#define V4L2_MODE_HIGHTQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ struct v4l2_outputparm @@ -624,7 +624,7 @@ struct v4l2_control __s32 value; }; -/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ +/* Used in the VIDIOC_TQUERYCTRL ioctl for querying controls */ struct v4l2_queryctrl { __u32 id; @@ -638,7 +638,7 @@ struct v4l2_queryctrl __u32 reserved[2]; }; -/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ +/* Used in the VIDIOC_TQUERYMENU ioctl for querying menu items */ struct v4l2_querymenu { __u32 id; @@ -829,7 +829,7 @@ struct v4l2_streamparm * I O C T L C O D E S F O R V I D E O D E V I C E S * */ -#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) +#define VIDIOC_TQUERYCAP _IOR ('V', 0, struct v4l2_capability) #define VIDIOC_RESERVED _IO ('V', 1) #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) @@ -838,13 +838,13 @@ struct v4l2_streamparm #define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression) #define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression) #endif -#define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) -#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) +#define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) +#define VIDIOC_TQUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) #define VIDIOC_OVERLAY _IOW ('V', 14, int) -#define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer) -#define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer) +#define VIDIOC_TQBUF _IOWR ('V', 15, struct v4l2_buffer) +#define VIDIOC_DTQBUF _IOWR ('V', 17, struct v4l2_buffer) #define VIDIOC_STREAMON _IOW ('V', 18, int) #define VIDIOC_STREAMOFF _IOW ('V', 19, int) #define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm) @@ -859,8 +859,8 @@ struct v4l2_streamparm #define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) #define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) #define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) -#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) -#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) +#define VIDIOC_TQUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) +#define VIDIOC_TQUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) #define VIDIOC_G_INPUT _IOR ('V', 38, int) #define VIDIOC_S_INPUT _IOWR ('V', 39, int) #define VIDIOC_G_OUTPUT _IOR ('V', 46, int) @@ -877,7 +877,7 @@ struct v4l2_streamparm #define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) #define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) #define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) -#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) +#define VIDIOC_TQUERYSTD _IOR ('V', 63, v4l2_std_id) #define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) #define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) #define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui index c5edd124..713a1970 100644 --- a/kstars/kstars/indiconf.ui +++ b/kstars/kstars/indiconf.ui @@ -1,10 +1,10 @@ INDIConf - + INDIConf - + 0 0 @@ -22,7 +22,7 @@ unnamed - + generalGroup @@ -33,7 +33,7 @@ unnamed - + fitsLabel @@ -41,9 +41,9 @@ Default FITS directory: - + - layout4 + tqlayout4 @@ -66,13 +66,13 @@ 0 - + 28 28 - + 28 28 @@ -84,7 +84,7 @@ - + fitsAutoDisplayCheck @@ -95,7 +95,7 @@ true - + telescopeLabel @@ -111,7 +111,7 @@ telPort_IN - + videoLabel @@ -129,7 +129,7 @@ - + Layout1 @@ -153,14 +153,14 @@ Expanding - + 20 20 - + buttonOk @@ -174,7 +174,7 @@ true - + buttonCancel @@ -187,7 +187,7 @@ - + displayGroup @@ -198,7 +198,7 @@ unnamed - + crosshairCheck @@ -212,7 +212,7 @@ Display the telescope position on the sky map - + messagesCheck @@ -238,14 +238,14 @@ Preferred - + 200 21 - + autoGroup @@ -256,7 +256,7 @@ unnamed - + timeCheck @@ -270,7 +270,7 @@ Update telescope clock upon connection - + GeoCheck @@ -286,7 +286,7 @@ - + autoGroup_2 @@ -294,21 +294,21 @@ Filter Wheel - Assign color values for your filter wheel slots + Assign color values for your filter wheel Q_SLOTS unnamed - + - layout3 + tqlayout3 unnamed - + textLabel1 @@ -316,7 +316,7 @@ Slot: - + textLabel2 @@ -326,15 +326,15 @@ - + - layout4 + tqlayout4 unnamed - + filterCombo @@ -372,7 +372,7 @@ Preferred - + 61 20 @@ -405,7 +405,7 @@ buttonOk buttonCancel - + klineedit.h kpushbutton.h diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index e7a36efc..02c6f8f1 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -8,7 +8,7 @@ version 2 of the License, or (at your option) any later version. JM Changelog: - 2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/Qt + 2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/TQt 2003-05-01 Added tab for devices and a group feature 2003-05-02 Added scrolling area. Most things are rewritten 2003-05-05 Device/Group seperation @@ -81,18 +81,18 @@ /* INDI standard property used across all clients to enable interoperability. */ const char * indi_std[NINDI_STD] = - {"CONNECTION", "DEVICE_PORT", "TIME", "SDTIME", "GEOGRAPHIC_COORD", "EQUATORIAL_COORD", "EQUATORIAL_EOD_COORD", "HORIZONTAL_COORD", "ABORT_MOTION", "ON_COORD_SET", "SOLAR_SYSTEM", "MOVEMENT", "PARK", "CCD_EXPOSE_DURATION", "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCDPREVIEW_STREAM", "CCDPREVIEW_CTRL", "VIDEO_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT" }; + {"CONNECTION", "DEVICE_PORT", "TIME", "SDTIME", "GEOGRAPHIC_COORD", "ETQUATORIAL_COORD", "ETQUATORIAL_EOD_COORD", "HORIZONTAL_COORD", "ABORT_MOTION", "ON_COORD_SET", "SOLAR_SYSTEM", "MOVEMENT", "PARK", "CCD_EXPOSE_DURATION", "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCDPREVIEW_STREAM", "CCDPREVIEW_CTRL", "VIDEO_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT" }; /******************************************************************* ** INDI Device: The work-horse. Responsible for handling its ** child properties and managing signal and changes. *******************************************************************/ -INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inName, TQString inLabel) +INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *tqparentManager, TQString inName, TQString inLabel) { name = inName; label = inLabel; - parent = menuParent; - parentMgr = parentManager; + tqparent = menuParent; + tqparentMgr = tqparentManager; gl.setAutoDelete(true); @@ -105,7 +105,7 @@ INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inNa dataBuffer = (unsigned char *) malloc (1); - stdDev = new INDIStdDevice(this, parent->ksw); + stdDev = new INDIStdDevice(this, tqparent->ksw); curGroup = NULL; @@ -183,7 +183,7 @@ int INDI_D::setAnyCmd (XMLEle *root, char errmsg[]) return (-1); } - parentMgr->checkMsg (root, this); + tqparentMgr->checkMsg (root, this); return (setValue (pp, root, errmsg)); } @@ -344,7 +344,7 @@ int INDI_D::setTextValue (INDI_P *pp, XMLEle *root, char errmsg[]) } /* set the given BUTTONS or LIGHTS property from the given element. - * root should have some or children. + * root should have some or tqchildren. * return 0 if ok else -1 with reason in errmsg */ int INDI_D::setLabelState (INDI_P *pp, XMLEle *root, char errmsg[]) @@ -521,7 +521,7 @@ int INDI_D::processBlob(INDI_E *blobEL, XMLEle *ep, char errmsg[]) return (-1); } - iscomp = (dataFormat.find(".z") != -1); + iscomp = (dataFormat.tqfind(".z") != -1); dataFormat.remove(".z"); @@ -605,7 +605,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[]) return NULL; } - /* Remove Vertical spacer from group layout, this is done everytime + /* RemoveQt::Vertical spacer from group tqlayout, this is done everytime * a new property arrives. The spacer is then appended to the end of the * properties */ pg->propertyLayout->removeItem(pg->VerticalSpacer); @@ -634,7 +634,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[]) pp->timeout = ap ? atof(valuXMLAtt(ap)) : 0; /* log any messages */ - parentMgr->checkMsg (root, this); + tqparentMgr->checkMsg (root, this); pp->addGUI(root); @@ -679,7 +679,7 @@ INDI_G * INDI_D::findGroup (TQString grouptag, int create, char errmsg[]) } -/* find "perm" attribute in root, crack and set *pp. +/* tqfind "perm" attribute in root, crack and set *pp. * return 0 if ok else -1 with excuse in errmsg[] */ @@ -775,7 +775,7 @@ int INDI_D::buildTextGUI(XMLEle *root, char errmsg[]) if (pp == NULL) return (-1); - /* get the permission, it will determine layout issues */ + /* get the permission, it will determine tqlayout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); @@ -811,7 +811,7 @@ int INDI_D::buildNumberGUI (XMLEle *root, char *errmsg) if (pp == NULL) return (-1); - /* get the permission, it will determine layout issues */ + /* get the permission, it will determine tqlayout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); @@ -879,7 +879,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[]) return (err); } - /* otherwise, build 1-4 button layout */ + /* otherwise, build 1-4 button tqlayout */ pp->guitype = PG_BUTTONS; err = pp->buildSwitchesGUI(root, errmsg); @@ -896,7 +896,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[]) } else if (!strcmp (valuXMLAtt(ap), "AnyOfMany")) { - /* 1-4 checkboxes layout */ + /* 1-4 checkboxes tqlayout */ pp->guitype = PG_RADIO; err = pp->buildSwitchesGUI(root, errmsg); @@ -955,7 +955,7 @@ int INDI_D::buildBLOBGUI (XMLEle *root, char errmsg[]) if (!pp) return (-1); - /* get the permission, it will determine layout issues */ + /* get the permission, it will determine tqlayout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); diff --git a/kstars/kstars/indidevice.h b/kstars/kstars/indidevice.h index b9d7315d..1ebcefa2 100644 --- a/kstars/kstars/indidevice.h +++ b/kstars/kstars/indidevice.h @@ -70,15 +70,16 @@ class TQVBox; class INDI_D : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - INDI_D(INDIMenu *parentMenu, DeviceManager *parentManager, TQString inName, TQString inLabel); + INDI_D(INDIMenu *tqparentMenu, DeviceManager *tqparentManager, TQString inName, TQString inLabel); ~INDI_D(); TQString name; /* device name */ - QString label; /* device label */ - QVBox *deviceVBox; /* device tab frame */ + TQString label; /* device label */ + TQVBox *deviceVBox; /* device tab frame */ TQTabWidget *groupContainer; /* Groups within the device */ - QTextEdit *msgST_w; /* scrolled text for messages */ + TQTextEdit *msgST_w; /* scrolled text for messages */ unsigned char *dataBuffer; /* Generic buffer */ //TQScrollView *sv; /* Scroll view */ //TQVBoxLayout *mainLayout; @@ -95,8 +96,8 @@ class INDI_D : public KDialogBase INDI_G *curGroup; bool INDIStdSupport; - INDIMenu *parent; - DeviceManager *parentMgr; + INDIMenu *tqparent; + DeviceManager *tqparentMgr; enum DTypes { DATA_FITS, DATA_STREAM, DATA_OTHER, DATA_CCDPREVIEW }; diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 8c2e0db6..6ae5c5da 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -48,7 +48,7 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) +INDIDriver::INDIDriver(TQWidget *tqparent) : devManager( tqparent ) { @@ -56,7 +56,7 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) lastGroup = NULL; lastDevice = NULL; - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; //FormLayout = makeVBoxMainWidget(); @@ -102,11 +102,11 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) TQObject::connect(clientListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHostStatus(int))); +TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHosttqStatus(int))); TQObject::connect(localListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDeviceStatus(int))); +TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDevicetqStatus(int))); TQObject::connect(ksw->getINDIMenu(), TQT_SIGNAL(driverDisconnected(int)), this, TQT_SLOT(shutdownHost(int))); @@ -146,7 +146,7 @@ for (uint i=0; i < ksw->data()->INDIHostsList.count(); i++) { if (devices[i]->mgrID == mgrID) { - affectedItem = localListView->findItem(devices[i]->label, 0); + affectedItem = localListView->tqfindItem(devices[i]->label, 0); if (!affectedItem) return; affectedItem->setPixmap(1, stopPix); affectedItem->setPixmap(2, NULL); @@ -183,22 +183,22 @@ void INDIDriver::LocalprocessRightButton( TQListViewItem *item, const TQPoint &p void INDIDriver::activateRunService() { - processDeviceStatus(0); + processDevicetqStatus(0); } void INDIDriver::activateStopService() { - processDeviceStatus(1); + processDevicetqStatus(1); } void INDIDriver::activateHostConnection() { - processHostStatus(0); + processHosttqStatus(0); } void INDIDriver::activateHostDisconnection() { - processHostStatus(1); + processHosttqStatus(1); } void INDIDriver::updateLocalButtons() @@ -244,7 +244,7 @@ for (uint i=0; i < ksw->data()->INDIHostsList.count(); i++) } -void INDIDriver::processDeviceStatus(int id) +void INDIDriver::processDevicetqStatus(int id) { if (localListView->selectedItem() == NULL) return; @@ -280,7 +280,7 @@ void INDIDriver::processDeviceStatus(int id) } localListView->selectedItem()->setPixmap(1, runningPix); - localListView->selectedItem()->setText(4, TQString("%1").arg(devices[i]->indiPort)); + localListView->selectedItem()->setText(4, TQString("%1").tqarg(devices[i]->indiPort)); runServiceB->setEnabled(false); stopServiceB->setEnabled(true); @@ -301,7 +301,7 @@ void INDIDriver::processDeviceStatus(int id) } } -void INDIDriver::processHostStatus(int id) +void INDIDriver::processHosttqStatus(int id) { int mgrID; bool toConnect = (id == 0); @@ -405,7 +405,7 @@ bool INDIDriver::runDevice(IDevice *dev) dev->proc = new KProcess; *dev->proc << "indiserver"; - *dev->proc << "-v" << "-r" << "0" << "-p" << TQString("%1").arg(dev->indiPort) << dev->driver; + *dev->proc << "-v" << "-r" << "0" << "-p" << TQString("%1").tqarg(dev->indiPort) << dev->driver; // Check Mode dev->mode = localR->isChecked() ? IDevice::M_LOCAL : IDevice::M_SERVER; @@ -471,7 +471,7 @@ void INDIDriver::saveDevicesToDisk() { if (devices[i]->deviceType == KSTARS_TELESCOPE) { - outstream << TQString("").arg(devices[i]->label).arg(devices[i]->focal_length > 0 ? devices[i]->focal_length : -1).arg(devices[i]->aperture > 0 ? devices[i]->aperture : -1) << endl; + outstream << TQString("").tqarg(devices[i]->label).tqarg(devices[i]->focal_length > 0 ? devices[i]->focal_length : -1).tqarg(devices[i]->aperture > 0 ? devices[i]->aperture : -1) << endl; outstream << " " << devices[i]->driver << "" << endl; outstream << " " << devices[i]->version << "" << endl; @@ -486,7 +486,7 @@ void INDIDriver::saveDevicesToDisk() { if (devices[i]->deviceType == KSTARS_CCD) { - outstream << TQString("").arg(devices[i]->label) << endl; + outstream << TQString("").tqarg(devices[i]->label) << endl; outstream << " " << devices[i]->driver << "" << endl; outstream << " " << devices[i]->version << "" << endl; outstream << "" << endl; @@ -500,7 +500,7 @@ void INDIDriver::saveDevicesToDisk() { if (devices[i]->deviceType == KSTARS_FILTER) { - outstream << TQString("").arg(devices[i]->label) << endl; + outstream << TQString("").tqarg(devices[i]->label) << endl; outstream << " " << devices[i]->driver << "" << endl; outstream << " " << devices[i]->version << "" << endl; outstream << "" << endl; @@ -514,7 +514,7 @@ void INDIDriver::saveDevicesToDisk() { if (devices[i]->deviceType == KSTARS_VIDEO) { - outstream << TQString("").arg(devices[i]->label) << endl; + outstream << TQString("").tqarg(devices[i]->label) << endl; outstream << " " << devices[i]->driver << "" << endl; outstream << " " << devices[i]->version << "" << endl; outstream << "" << endl; @@ -546,7 +546,7 @@ int INDIDriver::getINDIPort() lastPort+=5; - KExtendedSocket ks(TQString::null, lastPort, KExtendedSocket::passiveSocket | KExtendedSocket::noResolve); + KExtendedSocket ks(TQString(), lastPort, KExtendedSocket::passiveSocket | KExtendedSocket::noResolve); for (uint i=0 ; i < 10; i++) { @@ -640,19 +640,19 @@ bool INDIDriver::buildDeviceGroup(XMLEle *root, char errmsg[]) groupName = valuXMLAtt(ap); - if (groupName.find("Telescopes") != -1) + if (groupName.tqfind("Telescopes") != -1) groupType = KSTARS_TELESCOPE; - else if (groupName.find("CCDs") != -1) + else if (groupName.tqfind("CCDs") != -1) groupType = KSTARS_CCD; - else if (groupName.find("Filter") != -1) + else if (groupName.tqfind("Filter") != -1) groupType = KSTARS_FILTER; - else if (groupName.find("Video") != -1) + else if (groupName.tqfind("Video") != -1) groupType = KSTARS_VIDEO; - else if (groupName.find("Focusers") != -1) + else if (groupName.tqfind("Focusers") != -1) groupType = KSTARS_FOCUSER; - else if (groupName.find("Domes") != -1) + else if (groupName.tqfind("Domes") != -1) groupType = KSTARS_DOME; - else if (groupName.find("GPS") != -1) + else if (groupName.tqfind("GPS") != -1) groupType = KSTARS_GPS; @@ -781,7 +781,7 @@ void INDIDriver::addINDIHost() if (hostItem->name == ksw->data()->INDIHostsList.at(i)->name && hostItem->portnumber == ksw->data()->INDIHostsList.at(i)->portnumber) { - KMessageBox::error(0, i18n("Host: %1 Port: %2 already exists.").arg(hostItem->name).arg(hostItem->portnumber)); + KMessageBox::error(0, i18n("Host: %1 Port: %2 already exists.").tqarg(hostItem->name).tqarg(hostItem->portnumber)); return; } @@ -829,7 +829,7 @@ void INDIDriver::modifyINDIHost() currentItem->setText(1, hostConf.nameIN->text()); currentItem->setText(2, hostConf.portnumber->text()); - ksw->data()->INDIHostsList.replace(clientListView->itemIndex(currentItem), hostItem); + ksw->data()->INDIHostsList.tqreplace(clientListView->itemIndex(currentItem), hostItem); saveHosts(); } @@ -853,7 +853,7 @@ void INDIDriver::removeINDIHost() return; } - if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 client?").arg(clientListView->currentItem()->text(1)), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) + if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 client?").tqarg(clientListView->currentItem()->text(1)), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) return; ksw->data()->INDIHostsList.remove(i); diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index 3511112e..cdb3ec17 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -40,9 +40,10 @@ struct INDIHostsInfo int mgrID; }; -class IDevice : public QObject +class IDevice : public TQObject { Q_OBJECT + TQ_OBJECT public: IDevice(TQString inLabel, TQString inDriver, TQString inVersion); @@ -79,10 +80,11 @@ class INDIDriver : public devManager { Q_OBJECT + TQ_OBJECT public: - INDIDriver(TQWidget * parent = 0); + INDIDriver(TQWidget * tqparent = 0); ~INDIDriver(); KListView* deviceContainer; @@ -130,8 +132,8 @@ public slots: void updateMenuActions(); void ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ); void LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ); - void processDeviceStatus(int); - void processHostStatus(int); + void processDevicetqStatus(int); + void processHosttqStatus(int); void addINDIHost(); void modifyINDIHost(); void removeINDIHost(); diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index 0ae460f7..d3eacae9 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -37,7 +37,7 @@ #include /* search element for attribute. - * return XMLAtt if find, else NULL with helpful info in errmsg. + * return XMLAtt if tqfind, else NULL with helpful info in errmsg. */ XMLAtt * findAtt (XMLEle *ep, const char *name, char errmsg[]) { @@ -50,7 +50,7 @@ XMLAtt * findAtt (XMLEle *ep, const char *name, char errmsg[]) } /* search element for given child. pp is just to build a better errmsg. - * return XMLEle if find, else NULL with helpful info in errmsg. + * return XMLEle if tqfind, else NULL with helpful info in errmsg. */ XMLEle * findEle (XMLEle *ep, INDI_P *pp, const char *child, char errmsg[]) { @@ -66,12 +66,12 @@ XMLEle * findEle (XMLEle *ep, INDI_P *pp, const char *child, char errmsg[]) /******************************************************************* ** INDI Element *******************************************************************/ -INDI_E::INDI_E(INDI_P *parentProperty, TQString inName, TQString inLabel) +INDI_E::INDI_E(INDI_P *tqparentProperty, TQString inName, TQString inLabel) { name = inName; label = inLabel; - pp = parentProperty; + pp = tqparentProperty; EHBox = new TQHBoxLayout(0, 0, KDialog::spacingHint()); label_w = NULL; @@ -110,7 +110,7 @@ label_w->setMaximumWidth(ELEMENT_LABEL_WIDTH); label_w->setFrameShape( KSqueezedTextLabel::Box ); label_w->setPaletteBackgroundColor( TQColor( 224, 232, 238 ) ); label_w->setTextFormat( TQLabel::RichText ); -label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); +label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); if (label.length() > MAX_LABEL_LENGTH) { @@ -249,19 +249,19 @@ void INDI_E::drawLt() switch (state) { case PS_IDLE: - led_w->setColor(Qt::gray); + led_w->setColor(TQt::gray); break; case PS_OK: - led_w->setColor(Qt::green); + led_w->setColor(TQt::green); break; case PS_BUSY: - led_w->setColor(Qt::yellow); + led_w->setColor(TQt::yellow); break; case PS_ALERT: - led_w->setColor(Qt::red); + led_w->setColor(TQt::red); break; default: @@ -295,9 +295,9 @@ connect(slider_w, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderChanged(int //kdDebug() << "For element " << label << " we have step of " << step << endl; if (length == ELEMENT_FULL_WIDTH) - spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); else - spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); spin_w->setMinimumWidth( (int) (length * 0.45) ); slider_w->setMinimumWidth( (int) (length * 0.55) ); @@ -359,7 +359,7 @@ void INDI_E::setMax (double inMax) void INDI_E::setupElementWrite(int length) { write_w = new KLineEdit( pp->pg->propertyContainer); - write_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() )); + write_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() )); write_w->setMinimumWidth( length ); write_w->setMaximumWidth( length); @@ -373,11 +373,11 @@ void INDI_E::setupElementRead(int length) read_w = new KLineEdit( pp->pg->propertyContainer ); read_w->setMinimumWidth( length ); - read_w->setFocusPolicy( KLineEdit::NoFocus ); + read_w->setFocusPolicy( TQ_NoFocus ); read_w->setFrameShape( KLineEdit::GroupBoxPanel ); read_w->setFrameShadow( KLineEdit::Plain ); read_w->setCursorPosition( 0 ); - read_w->setAlignment( int( KLineEdit::AlignHCenter ) ); + read_w->tqsetAlignment( int( KLineEdit::AlignHCenter ) ); read_w->setReadOnly( TRUE ); read_w->setText(text); @@ -388,7 +388,7 @@ void INDI_E::setupElementRead(int length) void INDI_E::setupBrowseButton() { browse_w = new KPushButton("...", pp->pg->propertyContainer); - browse_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) ); + browse_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) ); browse_w->setMinimumWidth( MIN_SET_WIDTH ); browse_w->setMaximumWidth( MAX_SET_WIDTH ); diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h index d7c18e15..a7f10f08 100644 --- a/kstars/kstars/indielement.h +++ b/kstars/kstars/indielement.h @@ -21,7 +21,7 @@ #define INDIVERSION 1.5 /* we support this or less */ -/* GUI layout */ +/* GUI tqlayout */ #define PROPERTY_LABEL_WIDTH 80 #define ELEMENT_LABEL_WIDTH 175 #define ELEMENT_READ_WIDTH 175 @@ -49,7 +49,7 @@ typedef enum {PG_NONE = 0, PG_TEXT, PG_NUMERIC, PG_BUTTONS, /* INDI std properties */ /* N.B. Need to modify corresponding entry in indidevice.cpp when changed */ enum stdProperties { CONNECTION, DEVICE_PORT, TIME, SDTIME, GEOGRAPHIC_COORD, /* General */ - EQUATORIAL_COORD, EQUATORIAL_EOD_COORD, HORIZONTAL_COORD, /* Telescope */ + ETQUATORIAL_COORD, ETQUATORIAL_EOD_COORD, HORIZONTAL_COORD, /* Telescope */ ABORT_MOTION, ON_COORD_SET, SOLAR_SYSTEM, MOVEMENT, PARK, /* Telescope */ CCD_EXPOSE_DURATION, CCD_TEMPERATURE, CCD_FRAME, /* CCD */ CCD_FRAME_TYPE, CCD_BINNING, CCD_INFO, CCDPREVIEW_STREAM, /* CCD */ @@ -86,18 +86,19 @@ XMLAtt * findAtt (XMLEle *ep , const char *name , char errmsg[]); XMLEle * findEle (XMLEle *ep , INDI_P *pp, const char *child, char errmsg[]); /* INDI Element */ -class INDI_E : public QObject +class INDI_E : public TQObject { Q_OBJECT + TQ_OBJECT public: - INDI_E(INDI_P *parentProperty, TQString inName, TQString inLabel); + INDI_E(INDI_P *tqparentProperty, TQString inName, TQString inLabel); ~INDI_E(); TQString name; /* name */ TQString label; /* label is the name by default, unless specefied */ PState state; /* control on/off t/f etc */ - INDI_P *pp; /* parent property */ + INDI_P *pp; /* tqparent property */ - TQHBoxLayout *EHBox; /* Horizontal layout */ + TQHBoxLayout *EHBox; /*Qt::Horizontal tqlayout */ /* GUI widgets, only malloced when needed */ KSqueezedTextLabel *label_w; // label @@ -105,11 +106,11 @@ class INDI_E : public QObject KLineEdit *write_w; // write field KLed *led_w; // light led KDoubleSpinBox *spin_w; // spinbox - QSlider *slider_w; // Slider + TQSlider *slider_w; // Slider KPushButton *push_w; // push button KPushButton *browse_w; // browse button TQCheckBox *check_w; // check box - TQSpacerItem *hSpacer; // Horizontal spacer + TQSpacerItem *hSpacer; //Qt::Horizontal spacer double min, max, step; // params for scale double value; // current value diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index 5c4cddae..53b9dd3b 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -23,8 +23,8 @@ #include "Options.h" -INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlags fl) -: INDIConf(parent,name, modal,fl) +INDIFITSConf::INDIFITSConf(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: INDIConf(tqparent,name, modal,fl) { KIconLoader *icons = KGlobal::iconLoader(); diff --git a/kstars/kstars/indifitsconf.h b/kstars/kstars/indifitsconf.h index 600fcb12..598c5ec9 100644 --- a/kstars/kstars/indifitsconf.h +++ b/kstars/kstars/indifitsconf.h @@ -15,9 +15,10 @@ class INDIFITSConf : public INDIConf { Q_OBJECT + TQ_OBJECT public: - INDIFITSConf(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + INDIFITSConf(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~INDIFITSConf(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/indigroup.cpp b/kstars/kstars/indigroup.cpp index 0dcbb8b9..61d79061 100644 --- a/kstars/kstars/indigroup.cpp +++ b/kstars/kstars/indigroup.cpp @@ -28,18 +28,18 @@ ** belong to a group, whether they have one or not but how the group ** is displayed differs *******************************************************************/ -INDI_G::INDI_G(INDI_D *parentDevice, TQString inName) +INDI_G::INDI_G(INDI_D *tqparentDevice, TQString inName) { - dp = parentDevice; + dp = tqparentDevice; name = inName; pl.setAutoDelete(true); - // FIXME what's the parent exactly? + // FIXME what's the tqparent exactly? // You can do this eaither way: // 1. Propertycontainer is a TQFrame, then you make TQVBoxLayout for it (check form1.cpp) - // 2. Keep it as TQVBox and let it handle its children. + // 2. Keep it as TQVBox and let it handle its tqchildren. // Depends on which one works best. propertyContainer = new TQFrame(dp->groupContainer); propertyLayout = new TQVBoxLayout(propertyContainer, 20, KDialog::spacingHint() ); @@ -62,7 +62,7 @@ void INDI_G::addProperty(INDI_P *pp) dp->registerProperty(pp); propertyLayout->addLayout(pp->PHBox); - propertyLayout->addItem(VerticalSpacer); + propertyLayout->addItem(VerticalSpacer); pl.append(pp); } diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h index 097e6a10..22a7d2ca 100644 --- a/kstars/kstars/indigroup.h +++ b/kstars/kstars/indigroup.h @@ -28,14 +28,14 @@ class TQVBoxLayout; class INDI_G { public: - INDI_G(INDI_D *parentDevice, TQString inName); + INDI_G(INDI_D *tqparentDevice, TQString inName); ~INDI_G(); TQString name; /* Group name */ INDI_D *dp; /* Parent device */ TQFrame *propertyContainer; /* Properties container */ - TQVBoxLayout *propertyLayout; /* Properties layout */ - TQSpacerItem *VerticalSpacer; /* Vertical spacer */ + TQVBoxLayout *propertyLayout; /* Properties tqlayout */ + TQSpacerItem *VerticalSpacer; /*Qt::Vertical spacer */ TQPtrList pl; /* malloced list of pointers to properties */ diff --git a/kstars/kstars/indihostconf.ui b/kstars/kstars/indihostconf.ui index f8b6c743..b2258c4c 100644 --- a/kstars/kstars/indihostconf.ui +++ b/kstars/kstars/indihostconf.ui @@ -1,10 +1,10 @@ INDIHostConf - + INDIHostConf - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout7 + tqlayout7 unnamed - + - layout6 + tqlayout6 unnamed - + textLabel1_3 @@ -43,7 +43,7 @@ Name: - + textLabel1 @@ -51,7 +51,7 @@ Host: - + textLabel1_2 @@ -61,25 +61,25 @@ - + - layout5 + tqlayout5 unnamed - + nameIN - + hostname - + portnumber @@ -98,14 +98,14 @@ Expanding - + 30 35 - + Layout1 @@ -129,14 +129,14 @@ Expanding - + 20 20 - + buttonOk @@ -150,7 +150,7 @@ true - + buttonCancel @@ -186,5 +186,5 @@ buttonOk buttonCancel - + diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index 99181b0b..a3b0be1e 100644 --- a/kstars/kstars/indimenu.cpp +++ b/kstars/kstars/indimenu.cpp @@ -8,7 +8,7 @@ version 2 of the License, or (at your option) any later version. JM Changelog: - 2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/Qt + 2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/TQt 2003-05-01 Added tab for devices and a group feature 2003-05-02 Added scrolling area. Most things are rewritten 2003-05-05 Adding INDI Conf @@ -59,10 +59,10 @@ ** INDI Menu: Handles communication to server and fetching basic XML ** data. *******************************************************************/ -INDIMenu::INDIMenu(TQWidget *parent, const char *name ) : KDialogBase(KDialogBase::Tabbed, i18n("INDI Control Panel"), 0, KDialogBase::Default, parent, name, false) +INDIMenu::INDIMenu(TQWidget *tqparent, const char *name ) : KDialogBase(KDialogBase::Tabbed, i18n("INDI Control Panel"), 0, KDialogBase::Default, tqparent, name, false) { - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; mgrCounter = 0; @@ -82,7 +82,7 @@ INDIMenu::~INDIMenu() ** Traverse the drivers list, check for updated drivers and take ** appropriate action *********************************************************************/ -void INDIMenu::updateStatus() +void INDIMenu::updatetqStatus() { INDIDriver *drivers = ksw->getINDIDriver(); @@ -122,7 +122,7 @@ DeviceManager *dev; if (drivers->devices[i]->state && drivers->devices[i]->managed == false && drivers->devices[i]->mode == IDevice::M_LOCAL) { dev = new DeviceManager(this, mgrCounter); - if (dev->indiConnect("localhost", TQString("%1").arg(drivers->devices[i]->indiPort))) + if (dev->indiConnect("localhost", TQString("%1").tqarg(drivers->devices[i]->indiPort))) { drivers->devices[i]->mgrID = mgrCounter; drivers->devices[i]->managed = true; @@ -222,11 +222,11 @@ void INDIMenu::setCustomLabel(TQString deviceName) for (unsigned int i=0; i < mgr.count(); i++) for (unsigned int j=0; j < mgr.at(i)->indi_dev.count(); j++) - if (mgr.at(i)->indi_dev.at(j)->label.find(deviceName) >= 0) + if (mgr.at(i)->indi_dev.at(j)->label.tqfind(deviceName) >= 0) nset++; if (nset) - currentLabel = deviceName + TQString(" %1").arg(nset+1); + currentLabel = deviceName + TQString(" %1").tqarg(nset+1); else currentLabel = deviceName; diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h index 344d087e..81a99a79 100644 --- a/kstars/kstars/indimenu.h +++ b/kstars/kstars/indimenu.h @@ -48,25 +48,26 @@ class DeviceManager; class INDIMenu : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - INDIMenu(TQWidget * parent = 0 , const char *name = 0); + INDIMenu(TQWidget * tqparent = 0 , const char *name = 0); ~INDIMenu(); /***************************************************************** * GUI stuff ******************************************************************/ - QVBoxLayout *mainLayout; - QTabWidget *deviceContainer; + TQVBoxLayout *mainLayout; + TQTabWidget *deviceContainer; TQTextEdit *msgST_w; - QWidget *tab; + TQWidget *tab; TQPushButton *clear; - QString currentLabel; + TQString currentLabel; KStars *ksw; TQPtrList mgr; - void updateStatus(); + void updatetqStatus(); //bool removeDevice(TQString devName); void removeDeviceMgr(int mgrID); void setCustomLabel(TQString deviceName); diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 058e154c..e47a83e6 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -49,17 +49,17 @@ /******************************************************************* ** INDI Property: contains widgets, labels, and their status *******************************************************************/ -INDI_P::INDI_P(INDI_G *parentGroup, TQString inName) +INDI_P::INDI_P(INDI_G *tqparentGroup, TQString inName) { name = inName; - pg = parentGroup; + pg = tqparentGroup; el.setAutoDelete(true); stdID = -1; - indistd = new INDIStdProperty(this, pg->dp->parent->ksw, pg->dp->stdDev); + indistd = new INDIStdProperty(this, pg->dp->tqparent->ksw, pg->dp->stdDev); PHBox = new TQHBoxLayout(0, 0, KDialogBase::spacingHint()); PVBox = new TQVBoxLayout(0, 0, KDialogBase::spacingHint()); @@ -120,21 +120,21 @@ void INDI_P::drawLt(PState lstate) switch (lstate) { case PS_IDLE: - light->setColor(Qt::gray); + light->setColor(TQt::gray); break; case PS_OK: - light->setColor(Qt::green); + light->setColor(TQt::green); emit okState(); disconnect( this, TQT_SIGNAL(okState()), 0, 0 ); break; case PS_BUSY: - light->setColor(Qt::yellow); + light->setColor(TQt::yellow); break; case PS_ALERT: - light->setColor(Qt::red); + light->setColor(TQt::red); break; default: @@ -178,7 +178,7 @@ void INDI_P::newText() f_scansexa(lp->text.ascii(), &(lp->targetValue)); if ((lp->targetValue > lp->max || lp->targetValue < lp->min)) { - KMessageBox::error(0, i18n("Invalid range for element %1. Valid range is from %2 to %3").arg(lp->label).arg(lp->min).arg(lp->max)); + KMessageBox::error(0, i18n("Invalid range for element %1. Valid range is from %2 to %3").tqarg(lp->label).tqarg(lp->min).tqarg(lp->max)); return; } } @@ -193,9 +193,9 @@ void INDI_P::newText() indistd->newText(); if (guitype == PG_TEXT) - pg->dp->parentMgr->sendNewText(this); + pg->dp->tqparentMgr->sendNewText(this); else if (guitype == PG_NUMERIC) - pg->dp->parentMgr->sendNewNumber(this); + pg->dp->tqparentMgr->sendNewNumber(this); } @@ -209,18 +209,18 @@ void INDI_P::convertSwitch(int id) if (assosiatedPopup == NULL) return; - mLabel = assosiatedPopup->text(id).replace("&", ""); + mLabel = assosiatedPopup->text(id).tqreplace("&", ""); //kdDebug() << "Name: " << name << " ID: " << id << endl; /* Special case is CCD_EXPOSE_DURATION, not a switch */ - if (stdID == CCD_EXPOSE_DURATION && mLabel.find(label) != -1) + if (stdID == CCD_EXPOSE_DURATION && mLabel.tqfind(label) != -1) { newText(); return; } /* Another special case, center telescope */ - if (mLabel.find("Crosshair") != -1) + if (mLabel.tqfind("Crosshair") != -1) { if (!indistd->stdDev->dp->isOn()) return; if (indistd->stdDev->telescopeSkyObject == NULL) return; @@ -308,7 +308,7 @@ void INDI_P::newSwitch(int id) if (indistd->newSwitch(id, lp)) return; - pg->dp->parentMgr->sendNewSwitch (this, id); + pg->dp->tqparentMgr->sendNewSwitch (this, id); } @@ -339,12 +339,12 @@ void INDI_P::newBlob() fp.setName(filename); - if ( (pos = filename.findRev(".")) != -1) + if ( (pos = filename.tqfindRev(".")) != -1) format = filename.mid (pos, filename.length()); if (!fp.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("Cannot open file %1 for reading").arg(filename)); + KMessageBox::error(0, i18n("Cannot open file %1 for reading").tqarg(filename)); valid = false; continue; } @@ -354,7 +354,7 @@ void INDI_P::newBlob() data_file = new char[fp.size()]; if (data_file == NULL) { - KMessageBox::error(0, i18n("Not enough memory to load %1").arg(filename)); + KMessageBox::error(0, i18n("Not enough memory to load %1").tqarg(filename)); fp.close(); valid = false; continue; @@ -366,7 +366,7 @@ void INDI_P::newBlob() data64 = new unsigned char[4*fp.size()/3+4]; if (data64 == NULL) { - KMessageBox::error(0, i18n("Not enough memory to convert file %1 to base64").arg(filename)); + KMessageBox::error(0, i18n("Not enough memory to convert file %1 to base64").tqarg(filename)); fp.close(); valid = false; continue; @@ -379,10 +379,10 @@ void INDI_P::newBlob() if (sending == false) { sending = true; - pg->dp->parentMgr->startBlob (pg->dp->name, name, TQString(timestamp())); + pg->dp->tqparentMgr->startBlob (pg->dp->name, name, TQString(timestamp())); } - pg->dp->parentMgr->sendOneBlob(el.at(i)->name, data64_size, format, data64); + pg->dp->tqparentMgr->sendOneBlob(el.at(i)->name, data64_size, format, data64); fp.close(); delete (data64); @@ -393,7 +393,7 @@ void INDI_P::newBlob() if (!sending && !valid) return; else if (sending) - pg->dp->parentMgr->finishBlob(); + pg->dp->tqparentMgr->finishBlob(); if (valid) state = PS_BUSY; @@ -438,19 +438,19 @@ void INDI_P::addGUI (XMLEle *root) else label_w = new TQLabel(label, pg->propertyContainer); - label_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) ); + label_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) ); label_w->setFrameShape( TQLabel::GroupBoxPanel ); label_w->setMinimumWidth(PROPERTY_LABEL_WIDTH); label_w->setMaximumWidth(PROPERTY_LABEL_WIDTH); label_w->setTextFormat( TQLabel::RichText ); - label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); + label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); PHBox->addWidget(label_w); light->show(); label_w->show(); - /* #3 Add the Vertical layout thay may contain several elements */ + /* #3 Add theQt::Vertical tqlayout thay may contain several elements */ PHBox->addLayout(PVBox); } @@ -600,7 +600,7 @@ int INDI_P::buildNumberGUI (XMLEle *root, char errmsg[]) void INDI_P::setupSetButton(TQString caption) { set_w = new TQPushButton(caption, pg->propertyContainer); - set_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) ); + set_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) ); set_w->setMinimumWidth( MIN_SET_WIDTH ); set_w->setMaximumWidth( MAX_SET_WIDTH ); diff --git a/kstars/kstars/indiproperty.h b/kstars/kstars/indiproperty.h index 493a10ba..7e98af14 100644 --- a/kstars/kstars/indiproperty.h +++ b/kstars/kstars/indiproperty.h @@ -31,17 +31,18 @@ class TQButtonGroup; /* INDI property */ -class INDI_P : public QObject +class INDI_P : public TQObject { Q_OBJECT + TQ_OBJECT public: - INDI_P(INDI_G *parentGroup, TQString inName); + INDI_P(INDI_G *tqparentGroup, TQString inName); ~INDI_P(); - QString name; /* property name */ + TQString name; /* property name */ TQString label; /* property label */ - INDI_G *pg; /* parent group */ + INDI_G *pg; /* tqparent group */ KPopupMenu *assosiatedPopup; /* assosiated popup menu, if any */ INDIStdProperty *indistd; /* Assosciated std routines class */ double timeout; /* timeout, seconds */ @@ -56,9 +57,9 @@ class INDI_P : public QObject TQLabel *label_w; /* Label widget */ TQPushButton *set_w; /* set button */ - TQSpacerItem *HorSpacer; /* Horizontal spacer */ - TQHBoxLayout *PHBox; /* Horizontal container */ - TQVBoxLayout *PVBox; /* Vertical container */ + TQSpacerItem *HorSpacer; /*Qt::Horizontal spacer */ + TQHBoxLayout *PHBox; /*Qt::Horizontal container */ + TQVBoxLayout *PVBox; /*Qt::Vertical container */ TQButtonGroup *groupB; /* group button for radio and check boxes (Elements) */ KComboBox *om_w; /* Combo box for menu */ @@ -71,8 +72,8 @@ class INDI_P : public QObject /* First step in adding a new GUI element */ void addGUI(XMLEle *root); - /* Set Property's parent group */ - void setGroup(INDI_G *parentGroup) { pg = parentGroup; } + /* Set Property's tqparent group */ + void setGroup(INDI_G *tqparentGroup) { pg = tqparentGroup; } /* Find an element within the property */ INDI_E * findElement(TQString elementName); diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp index b21f46b5..4ad0c4d6 100644 --- a/kstars/kstars/indistd.cpp +++ b/kstars/kstars/indistd.cpp @@ -63,7 +63,7 @@ dp = associatedDevice; ksw = kswPtr; initDevCounter = 0; - seqCount = 0; + setqCount = 0; batchMode = false; ISOMode = false; @@ -158,7 +158,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d strncpy(tempFileStr, filename, 256); if ( batchMode && !ISOMode) - snprintf(filename, sizeof(filename), "%s/%s_%02d.fits", tempFileStr, seqPrefix.ascii(), seqCount); + snprintf(filename, sizeof(filename), "%s/%s_%02d.fits", tempFileStr, seqPrefix.ascii(), setqCount); else if (!batchMode && !Options::indiFITSDisplay()) { strftime (ts, sizeof(ts), "%Y-%m-%dT%H:%M:%S", tp); @@ -167,10 +167,10 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d else { strftime (ts, sizeof(ts), "%Y-%m-%dT%H:%M:%S", tp); - snprintf(filename, sizeof(filename), "%s/%s_%02d_%s.fits", tempFileStr, seqPrefix.ascii(), seqCount, ts); + snprintf(filename, sizeof(filename), "%s/%s_%02d_%s.fits", tempFileStr, seqPrefix.ascii(), setqCount, ts); } - seqCount++; + setqCount++; } else { @@ -192,12 +192,12 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d // We're done if we have DATA_OTHER if (dataType == DATA_OTHER) { - ksw->statusBar()->changeItem( i18n("Data file saved to %1").arg(filename), 0); + ksw->statusBar()->changeItem( i18n("Data file saved to %1").tqarg(filename), 0); return; } else if (dataType == DATA_FITS && (batchMode || !Options::indiFITSDisplay())) { - ksw->statusBar()->changeItem( i18n("FITS file saved to %1").arg(filename), 0); + ksw->statusBar()->changeItem( i18n("FITS file saved to %1").tqarg(filename), 0); emit FITSReceived(dp->label); return; } @@ -301,8 +301,8 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d CCDPreviewWindow->setCCDInfo(fwhm, mu); break; - case EQUATORIAL_COORD: - case EQUATORIAL_EOD_COORD: + case ETQUATORIAL_COORD: + case ETQUATORIAL_EOD_COORD: if (!dp->isOn()) break; el = pp->findElement("RA"); if (!el) return; @@ -375,7 +375,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d if (streamWindow) { //sNotifier->disconnect(); - //dp->parentMgr->sNotifier->disconnect(); + //dp->tqparentMgr->sNotifier->disconnect(); streamWindow->enableStream(false); streamWindow->close(); @@ -445,9 +445,9 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d { seqPrefix = newPrefix; - seqLister->setNameFilter(TQString("%1_*.fits").arg(seqPrefix)); + seqLister->setNameFilter(TQString("%1_*.fits").tqarg(seqPrefix)); - seqCount = 0; + setqCount = 0; if (ISOMode) return; @@ -472,7 +472,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d tempName = it.current()->name(); // find the prefix first - if (tempName.find(seqPrefix) == -1) + if (tempName.tqfind(seqPrefix) == -1) continue; strncpy(tempPrefix, tempName.ascii(), 64); @@ -486,8 +486,8 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d newFileIndex = strtol(t, NULL, 10); - if (newFileIndex >= seqCount) - seqCount = newFileIndex + 1; + if (newFileIndex >= setqCount) + setqCount = newFileIndex + 1; } delete [] (tempPrefix); @@ -509,9 +509,9 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d TQTime newTime( ksw->data()->ut().time()); ExtDate newDate( ksw->data()->ut().date()); - lp->write_w->setText(TQString("%1-%2-%3T%4:%5:%6").arg(newDate.year()).arg(newDate.month()) - .arg(newDate.day()).arg(newTime.hour()) - .arg(newTime.minute()).arg(newTime.second())); + lp->write_w->setText(TQString("%1-%2-%3T%4:%5:%6").tqarg(newDate.year()).tqarg(newDate.month()) + .tqarg(newDate.day()).tqarg(newTime.hour()) + .tqarg(newTime.minute()).tqarg(newTime.second())); pp->newText(); pp = dp->findProp("SDTIME"); @@ -543,8 +543,8 @@ void INDIStdDevice::updateLocation() longEle = pp->findElement("LONG"); if (!longEle) return; - longEle->write_w->setText(TQString("%1:%2:%3").arg(tempLong.degree()).arg(tempLong.arcmin()).arg(tempLong.arcsec())); - latEle->write_w->setText(TQString("%1:%2:%3").arg(geo->lat()->degree()).arg(geo->lat()->arcmin()).arg(geo->lat()->arcsec())); + longEle->write_w->setText(TQString("%1:%2:%3").tqarg(tempLong.degree()).tqarg(tempLong.arcmin()).tqarg(tempLong.arcsec())); + latEle->write_w->setText(TQString("%1:%2:%3").tqarg(geo->lat()->degree()).tqarg(geo->lat()->arcmin()).tqarg(geo->lat()->arcsec())); pp->newText(); } @@ -566,7 +566,7 @@ void INDIStdDevice::updateLocation() { for (unsigned int i=0; i < drivers->devices.size(); i++) { - if (drivers->devices[i]->mgrID == dp->parentMgr->mgrID) + if (drivers->devices[i]->mgrID == dp->tqparentMgr->mgrID) { if (drivers->devices[i]->deviceType == KSTARS_TELESCOPE) { @@ -619,7 +619,7 @@ void INDIStdDevice::initDeviceOptions() } if ( Options::indiMessages() ) - ksw->statusBar()->changeItem( i18n("%1 is online.").arg(dp->name), 0); + ksw->statusBar()->changeItem( i18n("%1 is online.").tqarg(dp->name), 0); ksw->map()->forceUpdateNow(); } @@ -633,7 +633,7 @@ void INDIStdDevice::initDeviceOptions() initDevCounter--; if ( initDevCounter == 0 && Options::indiMessages() ) - ksw->statusBar()->changeItem( i18n("%1 is online and ready.").arg(dp->name), 0); + ksw->statusBar()->changeItem( i18n("%1 is online and ready.").tqarg(dp->name), 0); } @@ -742,11 +742,11 @@ void INDIStdDevice::timerDone() return; } - prop = dp->findProp("EQUATORIAL_EOD_COORD"); + prop = dp->findProp("ETQUATORIAL_EOD_COORD"); if (prop == NULL) { - prop = dp->findProp("EQUATORIAL_COORD"); + prop = dp->findProp("ETQUATORIAL_COORD"); if (prop) useJ2000 = true; } @@ -767,7 +767,7 @@ void INDIStdDevice::timerDone() if (useJ2000) { sp.set(currentObject->ra(), currentObject->dec()); - sp.apparentCoord( ksw->data()->ut().djd() , (long double) J2000); + sp.aptqparentCoord( ksw->data()->ut().djd() , (long double) J2000); } // We need to get from JNow (Skypoint) to J2000 @@ -779,12 +779,12 @@ void INDIStdDevice::timerDone() DecEle = prop->findElement("DEC"); if (!DecEle) return; - RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()) - .arg(sp.ra()->minute()) - .arg(sp.ra()->second())); - DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()) - .arg(sp.dec()->arcmin()) - .arg(sp.dec()->arcsec())); + RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()) + .tqarg(sp.ra()->minute()) + .tqarg(sp.ra()->second())); + DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()) + .tqarg(sp.dec()->arcmin()) + .tqarg(sp.dec()->arcsec())); prop->newText(); } @@ -821,7 +821,7 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN { for (unsigned int i=0; i < drivers->devices.size(); i++) { - if (drivers->devices[i]->mgrID == stdDev->dp->parentMgr->mgrID) + if (drivers->devices[i]->mgrID == stdDev->dp->tqparentMgr->mgrID) { if (drivers->devices[i]->deviceType == KSTARS_TELESCOPE) { @@ -849,7 +849,7 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN INDI_E *RAEle(NULL), *DecEle(NULL), *AzEle(NULL), *AltEle(NULL), *nameEle(NULL); INDI_P * prop; SkyPoint sp; - int selectedCoord=0; /* 0 for Equatorial, 1 for Horizontal */ + int selectedCoord=0; /* 0 for Equatorial, 1 forQt::Horizontal */ bool useJ2000 (false); switch (pp->stdID) @@ -862,10 +862,10 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN if (stdDev->devTimer->isActive()) stdDev->devTimer->stop(); - prop = pp->pg->dp->findProp("EQUATORIAL_EOD_COORD"); + prop = pp->pg->dp->findProp("ETQUATORIAL_EOD_COORD"); if (prop == NULL) { - prop = pp->pg->dp->findProp("EQUATORIAL_COORD"); + prop = pp->pg->dp->findProp("ETQUATORIAL_COORD"); if (prop == NULL) { prop = pp->pg->dp->findProp("HORIZONTAL_COORD"); @@ -889,7 +889,7 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN if (!DecEle) return false; break; - // Horizontal + //Qt::Horizontal case 1: if (prop->perm == PP_RO) return false; AzEle = prop->findElement("AZ"); @@ -926,10 +926,10 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN sp.set (ksw->map()->clickedPoint()->ra(), ksw->map()->clickedPoint()->dec()); if (useJ2000) - sp.apparentCoord(ksw->data()->ut().djd(), (long double) J2000); + sp.aptqparentCoord(ksw->data()->ut().djd(), (long double) J2000); - RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second())); - DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec())); + RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second())); + DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec())); break; @@ -945,8 +945,8 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN sp.setAlt(*ksw->map()->clickedPoint()->alt()); } - AzEle->write_w->setText(TQString("%1:%2:%3").arg(sp.az()->degree()).arg(sp.az()->arcmin()).arg(sp.az()->arcsec())); - AltEle->write_w->setText(TQString("%1:%2:%3").arg(sp.alt()->degree()).arg(sp.alt()->arcmin()).arg(sp.alt()->arcsec())); + AzEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.az()->degree()).tqarg(sp.az()->arcmin()).tqarg(sp.az()->arcsec())); + AltEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.alt()->degree()).tqarg(sp.alt()->arcmin()).tqarg(sp.alt()->arcsec())); break; } @@ -1026,9 +1026,9 @@ void INDIStdProperty::newTime() ExtDate newDate( timedialog.selectedDate() ); timeEle->write_w->setText(TQString("%1-%2-%3T%4:%5:%6") - .arg(newDate.year()).arg(newDate.month()) - .arg(newDate.day()).arg(newTime.hour()) - .arg(newTime.minute()).arg(newTime.second())); + .tqarg(newDate.year()).tqarg(newDate.month()) + .tqarg(newDate.day()).tqarg(newTime.hour()) + .tqarg(newTime.minute()).tqarg(newTime.second())); pp->newText(); } else return; diff --git a/kstars/kstars/indistd.h b/kstars/kstars/indistd.h index 407ac02b..3ff79c2f 100644 --- a/kstars/kstars/indistd.h +++ b/kstars/kstars/indistd.h @@ -30,9 +30,10 @@ /* This class implmements standard properties on the device level*/ - class INDIStdDevice : public QObject + class INDIStdDevice : public TQObject { Q_OBJECT + TQ_OBJECT public: INDIStdDevice(INDI_D *associatedDevice, KStars * kswPtr); ~INDIStdDevice(); @@ -70,11 +71,11 @@ int dataType; int initDevCounter; - QString dataExt; + TQString dataExt; LilXML *parser; - QString seqPrefix; - int seqCount; + TQString seqPrefix; + int setqCount; bool batchMode; bool ISOMode; KDirLister *seqLister; @@ -94,9 +95,10 @@ }; /* This class implmements standard properties */ - class INDIStdProperty : public QObject + class INDIStdProperty : public TQObject { Q_OBJECT + TQ_OBJECT public: INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, INDIStdDevice *stdDevPtr); ~INDIStdProperty(); diff --git a/kstars/kstars/infobox.cpp b/kstars/kstars/infobox.cpp index b2f64bcd..781500bd 100644 --- a/kstars/kstars/infobox.cpp +++ b/kstars/kstars/infobox.cpp @@ -124,7 +124,7 @@ void InfoBox::draw( TQPainter &p, TQColor BGColor, unsigned int BGMode ) { TQRect r; int w,h; - r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), Qt::AlignCenter, text1() ); + r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), TQt::AlignCenter, text1() ); ShadedTextWidth = r.width(); ShadedTextHeight = r.height(); @@ -132,13 +132,13 @@ void InfoBox::draw( TQPainter &p, TQColor BGColor, unsigned int BGMode ) { h = ShadedTextHeight; if ( !text2().isEmpty() ) { - r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), Qt::AlignCenter, text2() ); + r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), TQt::AlignCenter, text2() ); if ( r.width() > w ) w = r.width(); h += r.height(); } if ( !text3().isEmpty() ) { - r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), Qt::AlignCenter, text3() ); + r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), TQt::AlignCenter, text3() ); if ( r.width() > w ) w = r.width(); h += r.height(); } diff --git a/kstars/kstars/infobox.h b/kstars/kstars/infobox.h index e9953404..bd943a2b 100644 --- a/kstars/kstars/infobox.h +++ b/kstars/kstars/infobox.h @@ -37,9 +37,10 @@ class TQPainter; class InfoBox : public TQObject { Q_OBJECT + TQ_OBJECT public: /**default constructor. Creates an infobox with empty text string - *and default geometry + *and default tqgeometry */ InfoBox(); @@ -169,7 +170,7 @@ public: /**@return the third line of text*/ TQString text3() const { return Text3; } - /**@return the geometry of the box*/ + /**@return the tqgeometry of the box*/ TQRect rect() const; /**@return TRUE if the box is anchored to the right window edge*/ @@ -184,10 +185,10 @@ public: /**Set the box to be anchored to the bottom window edge*/ void setAnchorBottom( const bool ab ); - /**@return the box's anchor flag bitmask.*/ + /**@return the box's anchor flag bittqmask.*/ int anchorFlag() const { return AnchorFlag; } - /**Set the box's anchor flag bitmask*/ + /**Set the box's anchor flag bittqmask*/ void setAnchorFlag( const int af ) { AnchorFlag = af; } enum AnchorType { diff --git a/kstars/kstars/infoboxes.cpp b/kstars/kstars/infoboxes.cpp index dff865e4..fdd95517 100644 --- a/kstars/kstars/infoboxes.cpp +++ b/kstars/kstars/infoboxes.cpp @@ -126,17 +126,17 @@ void InfoBoxes::drawBoxes( TQPainter &p, TQColor FGColor, TQColor grabColor, } bool InfoBoxes::grabBox( TQMouseEvent *e ) { - if ( GeoBox->rect().contains( e->pos() ) ) { + if ( GeoBox->rect().tqcontains( e->pos() ) ) { GrabbedBox = 1; GrabPos.setX( e->x() - GeoBox->x() ); GrabPos.setY( e->y() - GeoBox->y() ); return true; - } else if ( TimeBox->rect().contains( e->pos() ) ) { + } else if ( TimeBox->rect().tqcontains( e->pos() ) ) { GrabbedBox = 2; GrabPos.setX( e->x() - TimeBox->x() ); GrabPos.setY( e->y() - TimeBox->y() ); return true; - } else if ( FocusBox->rect().contains( e->pos() ) ) { + } else if ( FocusBox->rect().tqcontains( e->pos() ) ) { GrabbedBox = 3; GrabPos.setX( e->x() - FocusBox->x() ); GrabPos.setY( e->y() - FocusBox->y() ); @@ -180,7 +180,7 @@ bool InfoBoxes::dragBox( TQMouseEvent *e ) { } bool InfoBoxes::shadeBox( TQMouseEvent *e ) { - if ( GeoBox->rect().contains( e->pos() ) ) { + if ( GeoBox->rect().tqcontains( e->pos() ) ) { GeoBox->toggleShade(); if ( GeoBox->rect().bottom() > height() ) GeoBox->move( GeoBox->x(), height() - GeoBox->height() ); if ( GeoBox->rect().right() > width() ) GeoBox->move( width() - GeoBox->width(), GeoBox->y() ); @@ -189,7 +189,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) { fixCollisions( TimeBox ); fixCollisions( FocusBox ); return true; - } else if ( TimeBox->rect().contains( e->pos() ) ) { + } else if ( TimeBox->rect().tqcontains( e->pos() ) ) { TimeBox->toggleShade(); if ( TimeBox->rect().bottom() > height() ) TimeBox->move( TimeBox->x(), height() - TimeBox->height() ); if ( TimeBox->rect().right() > width() ) TimeBox->move( width() - TimeBox->width(), TimeBox->y() ); @@ -198,7 +198,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) { fixCollisions( GeoBox ); fixCollisions( FocusBox ); return true; - } else if ( FocusBox->rect().contains( e->pos() ) ) { + } else if ( FocusBox->rect().tqcontains( e->pos() ) ) { FocusBox->toggleShade(); if ( FocusBox->rect().bottom() > height() ) FocusBox->move( FocusBox->x(), height() - FocusBox->height() ); if ( FocusBox->rect().right() > width() ) FocusBox->move( width() - FocusBox->width(), FocusBox->y() ); @@ -248,7 +248,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { if ( Box2.width() ) Box2.setCoords( Box2.left()+1, Box2.top()+1, Box2.right()-1, Box2.bottom()-1 ); //First, make sure target box is within area rect. - if ( ! area.contains( t ) ) { + if ( ! area.tqcontains( t ) ) { /* if ( t.x() < area.x() ) target->move( area.x(), t.y() ); if ( t.y() < area.y() ) target->move( t.x(), area.y() ); if ( t.right() > area.right() ){ target->move( area.right() - t.width(), t.y() ); } @@ -280,25 +280,25 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { leftRect.moveTopLeft( TQPoint( t.x() - dLeft, t.y() ) ); } //If leftRect is outside area, set dLeft to a nonsense large value - if ( !area.contains( leftRect ) ) { dLeft = 100000; } + if ( !area.tqcontains( leftRect ) ) { dLeft = 100000; } //repeat for right, up and down directions. while ( rightRect.intersects( Box1 ) || rightRect.intersects( Box2 ) ) { ++dRight; rightRect.moveTopLeft( TQPoint( t.x() + dRight, t.y() ) ); } - if ( !area.contains( rightRect ) ) { dRight = 100000; } + if ( !area.tqcontains( rightRect ) ) { dRight = 100000; } while ( upRect.intersects( Box1 ) || upRect.intersects( Box2 ) ) { ++dUp; upRect.moveTopLeft( TQPoint( t.x(), t.y() - dUp ) ); } - if ( !area.contains( upRect ) ) { dUp = 100000; } + if ( !area.tqcontains( upRect ) ) { dUp = 100000; } while ( downRect.intersects( Box1 ) || downRect.intersects( Box2 ) ) { ++dDown; downRect.moveTopLeft( TQPoint( t.x(), t.y() + dDown ) ); } - if ( !area.contains( downRect ) ) { dDown = 100000; } + if ( !area.tqcontains( downRect ) ) { dDown = 100000; } //find the smallest displacement, and move the target box there. @@ -331,7 +331,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { //Final check to see if we're still inside area (we may not be if target //is bigger than area) - if ( area.contains( target->rect() ) ) return true; + if ( area.tqcontains( target->rect() ) ) return true; else return false; } @@ -351,7 +351,7 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime <, //Don't use KLocale::formatNumber() for Julian Day because we don't want //thousands-place separators TQString JDString = TQString::number( ut.djd(), 'f', 2 ); - JDString.replace( ".", KGlobal::locale()->decimalSymbol() ); + JDString.tqreplace( ".", KGlobal::locale()->decimalSymbol() ); TimeBox->setText3( i18n( "Sidereal Time", "ST: " ) + STString + i18n( "Julian Day", "JD: " ) + JDString ); diff --git a/kstars/kstars/infoboxes.h b/kstars/kstars/infoboxes.h index 25ec2d23..4cea39fd 100644 --- a/kstars/kstars/infoboxes.h +++ b/kstars/kstars/infoboxes.h @@ -45,6 +45,7 @@ class KStarsDateTime; class InfoBoxes : public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor. Create three infoboxes and place them in the skymap. *@param w The width of the region in which the boxes can be drawn @@ -65,7 +66,7 @@ public: *"grabbed" by the user *@param colorBG The background color for infoboxes * - *@todo Use Qt::white as default color instead of TQColor("white"), + *@todo Use TQt::white as default color instead of TQColor("white"), * for default values of colorText, colorGrab and colorBG, * since that's considerably faster. */ diff --git a/kstars/kstars/kscomet.cpp b/kstars/kstars/kscomet.cpp index 94ed1762..e36463d2 100644 --- a/kstars/kstars/kscomet.cpp +++ b/kstars/kstars/kscomet.cpp @@ -49,9 +49,9 @@ KSComet::KSComet( KStarsData *_kd, TQString _s, TQString imfile, P = 365.2568984 * pow(a, 1.5); //period in days //If the name contains a "/", make this name2 and make name a truncated version without the leading "P/" or "C/" - if ( name().contains( "/" ) ) { + if ( name().tqcontains( "/" ) ) { setLongName( name() ); - setName( name().mid( name().find("/") + 1 ) ); + setName( name().mid( name().tqfind("/") + 1 ) ); } } diff --git a/kstars/kstars/ksfilereader.h b/kstars/kstars/ksfilereader.h index c320e8b5..13fdd1a2 100644 --- a/kstars/kstars/ksfilereader.h +++ b/kstars/kstars/ksfilereader.h @@ -34,6 +34,7 @@ class TQString; class KSFileReader : public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor. Read an entire file into a TQStringList object. *@p file the file to be read diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index e416388e..aec4185e 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -37,10 +37,10 @@ #include "objectnamelist.h" #include "skymap.h" -KSNewStuff::KSNewStuff( TQWidget *parent ) : - TQObject(), KNewStuff( "kstars", parent ), NGCUpdated( false ) +KSNewStuff::KSNewStuff( TQWidget *tqparent ) : + TQObject(), KNewStuff( "kstars", tqparent ), NGCUpdated( false ) { - ks = (KStars*)parent; + ks = (KStars*)tqparent; kdw = new KDirWatch( this ); kdw->addDir( KGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) ); } @@ -62,7 +62,7 @@ bool KSNewStuff::install( const TQString &fileName ) archiveDir->copyTo(destDir); archive.close(); - kapp->processEvents(10000); + kapp->tqprocessEvents(10000); //read the new data into the program //this return might be the result of checking if everything is installed ok @@ -75,11 +75,11 @@ void KSNewStuff::updateData( const TQString &path ) { qd.setFilter( TQDir::Files ); //Show the Wait cursor - ks->setCursor(TQCursor(Qt::WaitCursor)); + ks->setCursor(TQCursor(TQt::WaitCursor)); //Handle the Steinicke NGC/IC catalog - if ( !NGCUpdated && qd[0].contains( "ngcic" ) ) { + if ( !NGCUpdated && qd[0].tqcontains( "ngcic" ) ) { //Build a progress dialog to show during data installation. KProgressDialog prog( 0, "newstuffprogdialog", i18n( "Please Wait" ), i18n( "Installing Steinicke NGC/IC catalog..." ), false /*modal*/ ); @@ -87,7 +87,7 @@ void KSNewStuff::updateData( const TQString &path ) { prog.setMinimumDuration( 0 /*millisec*/ ); prog.progressBar()->setTotalSteps( 0 ); //show generic progress activity prog.show(); - kapp->processEvents(1000); + kapp->tqprocessEvents(1000); //First, remove the existing NGC/IC objects from the ObjectNameList. for ( DeepSkyObject *o = ks->data()->deepSkyList.first(); o; o = ks->data()->deepSkyList.next() ) { @@ -163,10 +163,10 @@ void KSNewStuff::updateData( const TQString &path ) { } //Restore arrow cursor - ks->setCursor(TQCursor(Qt::ArrowCursor)); + ks->setCursor(TQCursor(TQt::ArrowCursor)); } -void KSNewStuff::slotProcessEvents() { kapp->processEvents( 500 ); } +void KSNewStuff::slotProcessEvents() { kapp->tqprocessEvents( 500 ); } #include "ksnewstuff.moc" diff --git a/kstars/kstars/ksnewstuff.h b/kstars/kstars/ksnewstuff.h index fc653e55..a6e4cd49 100644 --- a/kstars/kstars/ksnewstuff.h +++ b/kstars/kstars/ksnewstuff.h @@ -32,8 +32,6 @@ #include -#if KDE_IS_VERSION( 3, 2, 90 ) - #include #include #include @@ -46,12 +44,13 @@ class KStars; class KSNewStuff : public TQObject, public KNewStuff { Q_OBJECT + TQ_OBJECT public: /** *Constructor - *@p parent pointer to the parent widget + *@p tqparent pointer to the tqparent widget */ - KSNewStuff( TQWidget *parent = 0 ); + KSNewStuff( TQWidget *tqparent = 0 ); /** *Install new application data @@ -90,5 +89,4 @@ class KSNewStuff : public TQObject, public KNewStuff bool NGCUpdated; }; -#endif // KDE >= 3.2.90 #endif // KSNEWSTUFF_H diff --git a/kstars/kstars/ksplanet.h b/kstars/kstars/ksplanet.h index c30e40e7..9076795d 100644 --- a/kstars/kstars/ksplanet.h +++ b/kstars/kstars/ksplanet.h @@ -103,7 +103,7 @@ protected: typedef TQPtrVector OBArray[6]; -/**OrbitDataColl contains three groups of six QPtrVectors. Each TQPtrVector is a +/**OrbitDataColl contains three groups of six TQPtrVectors. Each TQPtrVector is a *list of OrbitData objects, representing a single sum used in computing *the planet's position. A set of six of these vectors comprises the large *"meta-sum" which yields the planet's Longitude, Latitude, or Distance value. @@ -121,7 +121,7 @@ protected: }; -/**OrbitDataManager places the OrbitDataColl objects for all planets in a QDict +/**OrbitDataManager places the OrbitDataColl objects for all planets in a TQDict *indexed by the planets' names. It also loads the positional data of each planet *from disk. *@author Mark Hollomon diff --git a/kstars/kstars/ksplanetbase.cpp b/kstars/kstars/ksplanetbase.cpp index 469c5307..9550342d 100644 --- a/kstars/kstars/ksplanetbase.cpp +++ b/kstars/kstars/ksplanetbase.cpp @@ -95,7 +95,7 @@ bool KSPlanetBase::isMajorPlanet() const { } void KSPlanetBase::localizeCoords( const KSNumbers *num, const dms *lat, const dms *LST ) { - //convert geocentric coordinates to local apparent coordinates (topocentric coordinates) + //convert geocentric coordinates to local aptqparent coordinates (topocentric coordinates) dms HA, HA2; //Hour Angle, before and after correction double rsinp, rcosp, u, sinHA, cosHA, sinDec, cosDec, D; double cosHA2; diff --git a/kstars/kstars/ksplanetbase.h b/kstars/kstars/ksplanetbase.h index d703f980..97296c61 100644 --- a/kstars/kstars/ksplanetbase.h +++ b/kstars/kstars/ksplanetbase.h @@ -72,7 +72,7 @@ class KSPlanetBase : public SkyObject { public: /**Constructor. Calls SkyObject constructor with type=2 (planet), - *coordinates=0.0, mag=0.0, primary name s, and all other QStrings empty. + *coordinates=0.0, mag=0.0, primary name s, and all other TQStrings empty. @param kd Some kind of data *@param s Name of planet *@param image_file filename of the planet's image @@ -263,7 +263,7 @@ public: */ void clearTrail() { Trail.clear(); } -/**@short update Horizontal coords of the trail +/**@short updateQt::Horizontal coords of the trail */ void updateTrail( dms *LST, const dms *lat ); @@ -281,7 +281,7 @@ public: /**Show Solar System object popup menu. Overloaded from virtual *SkyObject::showPopupMenu() *@param pmenu pointer to the KSPopupMenu object - *@param pos QPojnt holding the x,y coordinates for the menu + *@param pos TQPojnt holding the x,y coordinates for the menu */ virtual void showPopupMenu( KSPopupMenu *pmenu, TQPoint pos ) { pmenu->createPlanetMenu( this ); pmenu->popup( pos ); } @@ -317,7 +317,7 @@ protected: private: /**@short correct the position for the fact that the location is not at the center of the Earth, *but a position on its surface. This causes a small parallactic shift in a solar system - *body's apparent position. The effect is most significant for the Moon. + *body's aptqparent position. The effect is most significant for the Moon. *This function is private, and should only be called from the public findPosition() function. *@param num pointer to a ksnumbers object for the target date/time *@param lat pointer to the geographic latitude of the location. diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp index 5f1a7829..97fd16f5 100644 --- a/kstars/kstars/kspopupmenu.cpp +++ b/kstars/kstars/kspopupmenu.cpp @@ -32,10 +32,10 @@ #include "indigroup.h" #include "indiproperty.h" -KSPopupMenu::KSPopupMenu( TQWidget *parent, const char *name ) - : KPopupMenu( parent, name ) +KSPopupMenu::KSPopupMenu( TQWidget *tqparent, const char *name ) + : KPopupMenu( tqparent, name ) { - ksw = ( KStars* )parent; + ksw = ( KStars* )tqparent; } KSPopupMenu::~KSPopupMenu() @@ -43,7 +43,7 @@ KSPopupMenu::~KSPopupMenu() } void KSPopupMenu::createEmptyMenu( SkyObject *nullObj ) { - initPopupMenu( nullObj, i18n( "Empty sky" ), TQString::null, TQString::null, true, true, false, false, false, true, false ); + initPopupMenu( nullObj, i18n( "Empty sky" ), TQString(), TQString(), true, true, false, false, false, true, false ); insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS() ) ); insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS2() ) ); @@ -51,7 +51,7 @@ void KSPopupMenu::createEmptyMenu( SkyObject *nullObj ) { void KSPopupMenu::createStarMenu( StarObject *star ) { //Add name, rise/set time, center/track, and detail-window items - initPopupMenu( star, star->translatedLongName(), i18n( "Spectral type: %1" ).arg(star->sptype()), + initPopupMenu( star, star->translatedLongName(), i18n( "Spectral type: %1" ).tqarg(star->sptype()), i18n( "star" ) ); //If the star is named, add custom items to popup menu based on object's ImageList and InfoList @@ -237,7 +237,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr if ( s1 == i18n( "star" ) || s1 == i18n( "Empty sky" ) ) showLabel = false; pmTitle = new TQLabel( s1, this ); - pmTitle->setAlignment( AlignCenter ); + pmTitle->tqsetAlignment( AlignCenter ); TQPalette pal( pmTitle->palette() ); pal.setColor( TQPalette::Normal, TQColorGroup::Background, pal.color( TQPalette::Normal, TQColorGroup::Base ) ); pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, pal.color( TQPalette::Normal, TQColorGroup::Text ) ); @@ -246,38 +246,38 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr if ( ! s2.isEmpty() ) { pmTitle2 = new TQLabel( s2, this ); - pmTitle2->setAlignment( AlignCenter ); + pmTitle2->tqsetAlignment( AlignCenter ); pmTitle2->setPalette( pal ); insertItem( pmTitle2 ); } if ( ! s3.isEmpty() ) { pmType = new TQLabel( s3, this ); - pmType->setAlignment( AlignCenter ); + pmType->tqsetAlignment( AlignCenter ); pmType->setPalette( pal ); insertItem( pmType ); } TQString c = obj->constellation( ksw->data()->csegmentList, ksw->data()->cnameList ); pmConstellation = new TQLabel( c, this ); - pmConstellation->setAlignment( AlignCenter ); + pmConstellation->tqsetAlignment( AlignCenter ); pmConstellation->setPalette( pal ); insertItem( pmConstellation ); //Insert Rise/Set/Transit labels if ( showRiseSet && obj ) { pmRiseTime = new TQLabel( i18n( "Rise time: 00:00" ), this ); - pmRiseTime->setAlignment( AlignCenter ); + pmRiseTime->tqsetAlignment( AlignCenter ); pmRiseTime->setPalette( pal ); TQFont rsFont = pmRiseTime->font(); rsFont.setPointSize( rsFont.pointSize() - 2 ); pmRiseTime->setFont( rsFont ); pmSetTime = new TQLabel( i18n( "the time at which an object falls below the horizon", "Set time:" ) + " 00:00", this ); - pmSetTime->setAlignment( AlignCenter ); + pmSetTime->tqsetAlignment( AlignCenter ); pmSetTime->setPalette( pal ); pmSetTime->setFont( rsFont ); pmTransitTime = new TQLabel( i18n( "Transit time: 00:00" ), this ); - pmTransitTime->setAlignment( AlignCenter ); + pmTransitTime->tqsetAlignment( AlignCenter ); pmTransitTime->setPalette( pal ); pmTransitTime->setFont( rsFont ); insertSeparator(); @@ -320,7 +320,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr } if ( showObsList && obj ) { - if ( ksw->observingList()->contains( obj ) ) + if ( ksw->observingList()->tqcontains( obj ) ) insertItem( i18n("Remove From List"), ksw->observingList(), TQT_SLOT( slotRemoveObject() ) ); else insertItem( i18n("Add to List"), ksw->observingList(), TQT_SLOT( slotAddObject() ) ); @@ -349,7 +349,7 @@ void KSPopupMenu::setRiseSetLabels( SkyObject *obj ) { if ( rtime.isValid() ) { //We can round to the nearest minute by simply adding 30 seconds to the time. - rt = i18n( "Rise time: %1" ).arg( rtime.addSecs(30).toString( "hh:mm" ) ); + rt = i18n( "Rise time: %1" ).tqarg( rtime.addSecs(30).toString( "hh:mm" ) ); } else if ( obj->alt()->Degrees() > 0 ) { rt = i18n( "No rise time: Circumpolar" ); @@ -365,7 +365,7 @@ void KSPopupMenu::setRiseSetLabels( SkyObject *obj ) { if ( stime.isValid() ) { //We can round to the nearest minute by simply adding 30 seconds to the time. - st = i18n( "the time at which an object falls below the horizon", "Set time: %1" ).arg( stime.addSecs(30).toString( "hh:mm" ) ); + st = i18n( "the time at which an object falls below the horizon", "Set time: %1" ).tqarg( stime.addSecs(30).toString( "hh:mm" ) ); } else if ( obj->alt()->Degrees() > 0 ) { st = i18n( "No set time: Circumpolar" ); @@ -379,7 +379,7 @@ void KSPopupMenu::setRiseSetLabels( SkyObject *obj ) { if ( ttime.isValid() ) { //We can round to the nearest minute by simply adding 30 seconds to the time. - tt = i18n( "Transit time: %1" ).arg( ttime.addSecs(30).toString( "hh:mm" ) ); + tt = i18n( "Transit time: %1" ).tqarg( ttime.addSecs(30).toString( "hh:mm" ) ); } else { tt = "--:--"; } diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h index 78f7c1e3..a6ef1a20 100644 --- a/kstars/kstars/kspopupmenu.h +++ b/kstars/kstars/kspopupmenu.h @@ -39,9 +39,10 @@ class TQLabel; class KSPopupMenu : public KPopupMenu { Q_OBJECT + TQ_OBJECT public: /**Default constructor*/ - KSPopupMenu( TQWidget *parent = 0, const char *name = 0 ); + KSPopupMenu( TQWidget *tqparent = 0, const char *name = 0 ); /**Destructor (empty)*/ ~KSPopupMenu(); diff --git a/kstars/kstars/kssun.cpp b/kstars/kstars/kssun.cpp index 5df14c59..fc9b312d 100644 --- a/kstars/kstars/kssun.cpp +++ b/kstars/kstars/kssun.cpp @@ -125,7 +125,7 @@ bool KSSun::findGeocentricPosition( const KSNumbers *num, const KSPlanetBase *Ea nutate(num); aberrate(num); - // We obtain the apparent geocentric ecliptic coordinates. That is, after + // We obtain the aptqparent geocentric ecliptic coordinates. That is, after // nutation and aberration have been applied. EquatorialToEcliptic( num->obliquity() ); diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp index b18f65fe..6cde713d 100644 --- a/kstars/kstars/kstars.cpp +++ b/kstars/kstars/kstars.cpp @@ -103,7 +103,7 @@ KStars::~KStars() Options::setFocusRA( skymap->focus()->ra()->Hours() ); Options::setFocusDec( skymap->focus()->dec()->Degrees() ); - //Store Window geometry in Options object + //Store Window tqgeometry in Options object Options::setWindowWidth( width() ); Options::setWindowHeight( height() ); @@ -184,9 +184,9 @@ void KStars::applyConfig() { //color scheme pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() ); if ( Options::darkAppColors() ) { - TQApplication::setPalette( DarkPalette, true ); + TQApplication::tqsetPalette( DarkPalette, true ); } else { - TQApplication::setPalette( OriginalPalette, true ); + TQApplication::tqsetPalette( OriginalPalette, true ); } //Infoboxes, toolbars, statusbars diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index 73c10127..c5f213a2 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -68,6 +68,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface { Q_OBJECT + TQ_OBJECT public: /** *@short Constructor. @@ -381,7 +382,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface public slots: /** - *Update time-dependent data and (possibly) repaint the sky map. + *Update time-dependent data and (possibly) tqrepaint the sky map. *@p automaticDSTchange change DST status automatically? */ void updateTime( const bool automaticDSTchange = true ); @@ -624,7 +625,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface void initFOV(); /** - *Initialize Status bar. + *Initialize tqStatus bar. */ void initStatusBar(); @@ -668,7 +669,7 @@ class KStars::privatedata { KStarsData *kstarsData; /**Constructor */ - privatedata(KStars *parent) : ks(parent), splash(0), kstarsData(0) {} + privatedata(KStars *tqparent) : ks(tqparent), splash(0), kstarsData(0) {} /**Destructor */ ~privatedata(); diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index c370d55e..67807992 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -93,23 +93,23 @@ void KStars::slotViewToolBar() { - if ( sender()->name() == TQString( "show_stars" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_stars" ) ) { Options::setShowStars( !Options::showStars() ); - } else if ( sender()->name() == TQString( "show_deepsky" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_deepsky" ) ) { Options::setShowDeepSky( ! Options::showDeepSky() ); - } else if ( sender()->name() == TQString( "show_planets" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_planets" ) ) { Options::setShowPlanets( ! Options::showPlanets() ); - } else if ( sender()->name() == TQString( "show_clines" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_clines" ) ) { Options::setShowCLines( !Options::showCLines() ); - } else if ( sender()->name() == TQString( "show_cnames" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_cnames" ) ) { Options::setShowCNames( !Options::showCNames() ); - } else if ( sender()->name() == TQString( "show_cbounds" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_cbounds" ) ) { Options::setShowCBounds( !Options::showCBounds() ); - } else if ( sender()->name() == TQString( "show_mw" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_mw" ) ) { Options::setShowMilkyWay( !Options::showMilkyWay() ); - } else if ( sender()->name() == TQString( "show_grid" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_grid" ) ) { Options::setShowGrid( !Options::showGrid() ); - } else if ( sender()->name() == TQString( "show_horizon" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_horizon" ) ) { Options::setShowGround( !Options::showGround() ); } @@ -154,7 +154,7 @@ void KStars::slotWizard() { // Make sure Numbers, Moon, planets, and sky objects are updated immediately data()->setFullTimeUpdate(); - // If the sky is in Horizontal mode and not tracking, reset focus such that + // If the sky is inQt::Horizontal mode and not tracking, reset focus such that // Alt/Az remain constant. if ( data()->useDefaultOptions ) { SkyPoint newPoint; @@ -198,7 +198,7 @@ void KStars::slotWUT() { //FIXME GLOSSARY // void KStars::slotGlossary(){ -// GlossaryDialog *dlg = new GlossaryDialog( true, this, "glossary" ); +// GlossaryDialog *dlg = new GlossaryDialog( true, TQT_TQOBJECT(this), "glossary" ); // TQString glossaryfile =data()->stdDirs->findResource( "data", "kstars/glossary.xml" ); // KURL u = glossaryfile; // Glossary *g = Glossary::readFromXML( u ); @@ -227,7 +227,7 @@ void KStars::slotImageSequence() if (indiseq == NULL) indiseq = new imagesequence(this); - if (indiseq->updateStatus()) + if (indiseq->updatetqStatus()) indiseq->show(); } @@ -248,7 +248,7 @@ void KStars::slotINDIPanel() { if (indimenu == NULL) indimenu = new INDIMenu(this); - indimenu->updateStatus(); + indimenu->updatetqStatus(); } void KStars::slotINDIDriver() { @@ -331,7 +331,7 @@ void KStars::slotGeoLocator() { // Make sure Numbers, Moon, planets, and sky objects are updated immediately data()->setFullTimeUpdate(); - // If the sky is in Horizontal mode and not tracking, reset focus such that + // If the sky is inQt::Horizontal mode and not tracking, reset focus such that // Alt/Az remain constant. if ( ! Options::isTracking() && Options::useAltAz() ) { map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() ); @@ -356,8 +356,8 @@ void KStars::slotViewOps() { KConfigDialog* dialog = new KConfigDialog( this, "settings", Options::self() ); - connect( dialog, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApplySettings() ) ); - connect( dialog, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApplySettings() ) ); + connect( dialog, TQT_SIGNAL( applyClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); + connect( dialog, TQT_SIGNAL( okClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); OpsCatalog *opcatalog = new OpsCatalog( this, "catalogs" ); OpsGuides *opguides = new OpsGuides( this, "guides" ); @@ -450,9 +450,9 @@ void KStars::slotExportImage() { //Warn user if file exists! if (TQFile::exists(fileURL.path())) { - int r=KMessageBox::warningContinueCancel(static_cast(parent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg(fileURL.fileName()), + "Overwrite it?" ).tqarg(fileURL.fileName()), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); @@ -501,7 +501,7 @@ void KStars::slotRunScript() { if ( tmpfile.name() == fname ) { //upload to remote location if ( ! KIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( fileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( fileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } @@ -528,14 +528,14 @@ void KStars::slotRunScript() { } if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1" ).arg( f.name() ); + TQString message = i18n( "Could not open file %1" ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); return; } // Before we run the script, make sure that it's safe. Each line must either begin with "#" // or begin with "dcop $KSTARS". Otherwise, the line must be equal to one of the following: - // "KSTARS=`dcopfind -a 'kstars*'`"; "MAIN=KStarsInterface"; or "CLOCK=clock#1" + // "KSTARS=`dcoptqfind -a 'kstars*'`"; "MAIN=KStarsInterface"; or "CLOCK=clock#1" TQTextStream istream(&f); TQString line; bool fileOK( true ); @@ -543,7 +543,7 @@ void KStars::slotRunScript() { while ( ! istream.eof() ) { line = istream.readLine(); if ( line.left(1) != "#" && line.left(12) != "dcop $KSTARS" - && line.stripWhiteSpace() != "KSTARS=`dcopfind -a 'kstars*'`" + && line.stripWhiteSpace() != "KSTARS=`dcoptqfind -a 'kstars*'`" && line.stripWhiteSpace() != "MAIN=KStarsInterface" && line.stripWhiteSpace() != "CLOCK=clock#1" ) { fileOK = false; @@ -563,13 +563,13 @@ void KStars::slotRunScript() { //FIXME STRINGS FREEZE //Add statusbar message that script is running - //ks->statusBar()->changeItem( i18n( "Running script: %1" ).arg( fileURL.fileName() ), 0 ); + //ks->statusBar()->changeItem( i18n( "Running script: %1" ).tqarg( fileURL.fileName() ), 0 ); KProcess p; p << f.name(); p.start( KProcess::DontCare ); - while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes. } } @@ -595,7 +595,7 @@ void KStars::slotPrint() { //Set Time to CPU clock void KStars::slotSetTimeToNow() { - data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::currentDateTime() ) ); + data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ) ); if ( Options::useAltAz() ) { map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() ); @@ -623,7 +623,7 @@ void KStars::slotToggleTimer() { //Focus void KStars::slotPointFocus() { - TQString sentFrom( sender()->name() ); + TQString sentFrom( TQT_TQOBJECT(const_cast(sender()))->name() ); if ( sentFrom == "zenith" ) map()->invokeKey( KKey( "Z" ).keyCodeQt() ); @@ -813,17 +813,17 @@ void KStars::slotCoordSys() { //Settings Menu: void KStars::slotColorScheme() { //use mid(3) to exclude the leading "cs_" prefix from the action name - TQString filename = TQString( sender()->name() ).mid(3) + ".colors"; + TQString filename = TQString( TQT_TQOBJECT(const_cast(sender()))->name() ).mid(3) + ".colors"; loadColorScheme( filename ); } void KStars::slotTargetSymbol() { - TQString symbolName( sender()->name() ); + TQString symbolName( TQT_TQOBJECT(const_cast(sender()))->name() ); FOV f( symbolName ); //read data from fov.dat Options::setFOVName( f.name() ); Options::setFOVSize( f.size() ); - Options::setFOVShape( f.shape() ); + Options::setFOVShape( f.tqshape() ); Options::setFOVColor( f.color() ); data()->fovSymbol.setName( Options::fOVName() ); data()->fovSymbol.setSize( Options::fOVSize() ); @@ -856,7 +856,7 @@ void KStars::slotFOVEdit() { for ( FOV *fov = fovdlg.FOVList.first(); fov; fov = fovdlg.FOVList.next() ) ostream << fov->name() << ":" << fov->size() - << ":" << TQString("%1").arg( fov->shape() ) << ":" << fov->color() << endl; + << ":" << TQString("%1").tqarg( fov->tqshape() ) << ":" << fov->color() << endl; f.close(); } @@ -873,18 +873,18 @@ void KStars::slotFOVEdit() { if ( fields.count() == 4 ) { TQString nm = fields[0].stripWhiteSpace(); - KToggleAction *kta = new KToggleAction( nm, 0, this, TQT_SLOT( slotTargetSymbol() ), + KToggleAction *kta = new KToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); fovActionMenu->insert( kta ); } } } else { - kdDebug() << i18n( "Could not open file: %1" ).arg( f.name() ) << endl; + kdDebug() << i18n( "Could not open file: %1" ).tqarg( f.name() ) << endl; } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, this, + fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); //set FOV to whatever was highlighted in FOV dialog @@ -914,11 +914,11 @@ void KStars::slotTipOfDay() { // Toggle to and from full screen mode void KStars::slotFullScreen() { - if ( topLevelWidget()->isFullScreen() ) { - topLevelWidget()->showNormal(); + if ( tqtopLevelWidget()->isFullScreen() ) { + tqtopLevelWidget()->showNormal(); } else { - topLevelWidget()->showFullScreen(); + tqtopLevelWidget()->showFullScreen(); } } @@ -955,24 +955,24 @@ void KStars::slotClearAllTrails() { //toggle display of GUI Items on/off void KStars::slotShowGUIItem( bool show ) { //Toolbars - if ( sender()->name() == TQString( "show_mainToolBar" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_mainToolBar" ) ) { Options::setShowMainToolBar( show ); if ( show ) toolBar( "mainToolBar" )->show(); else toolBar( "mainToolBar" )->hide(); } - if ( sender()->name() == TQString( "show_viewToolBar" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_viewToolBar" ) ) { Options::setShowViewToolBar( show ); if ( show ) toolBar( "viewToolBar" )->show(); else toolBar( "viewToolBar" )->hide(); } - if ( sender()->name() == TQString( "show_statusBar" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_statusBar" ) ) { Options::setShowStatusBar( show ); if ( show ) statusBar()->show(); else statusBar()->hide(); } - if ( sender()->name() == TQString( "show_sbAzAlt" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_sbAzAlt" ) ) { Options::setShowAltAzField( show ); if ( show ) { //To preserve the order (AzAlt before RADec), we have to remove @@ -994,7 +994,7 @@ void KStars::slotShowGUIItem( bool show ) { } } - if ( sender()->name() == TQString( "show_sbRADec" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_sbRADec" ) ) { Options::setShowRADecField( show ); if ( show ) { TQString s = "000d 00m 00s, +00d 00\' 00\""; //only need this to set the width @@ -1008,24 +1008,24 @@ void KStars::slotShowGUIItem( bool show ) { //InfoBoxes: we only change options here; these are also connected to slots in //InfoBoxes that actually toggle the display. - if ( sender()->name() == TQString( "show_boxes" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_boxes" ) ) Options::setShowInfoBoxes( show ); - if ( sender()->name() == TQString( "show_time_box" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_time_box" ) ) Options::setShowTimeBox( show ); - if ( sender()->name() == TQString( "show_location_box" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_location_box" ) ) Options::setShowGeoBox( show ); - if ( sender()->name() == TQString( "show_focus_box" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_focus_box" ) ) Options::setShowFocusBox( show ); } void KStars::addColorMenuItem( TQString name, TQString actionName ) { colorActionMenu->insert( new KAction( name, 0, - this, TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); } void KStars::removeColorMenuItem( TQString actionName ) { kdDebug() << "removing " << actionName << endl; - colorActionMenu->remove( actionCollection()->action( actionName.local8Bit() ) ); + colorActionMenu->remove( actionCollection()->action( actionName.local8Bit().data() ) ); } void KStars::establishINDI() diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index 4d5ff70a..d12ddca1 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -88,7 +88,7 @@ KStarsData::KStarsData() : stdDirs(0), locale(0), //initialize FOV symbol fovSymbol = FOV(); - //set AutoDelete property for QPtrLists. Most are set TRUE, + //set AutoDelete property for TQPtrLists. Most are set TRUE, //but some 'meta-lists' need to be FALSE. starList.setAutoDelete( TRUE ); ADVtreeList.setAutoDelete( TRUE ); @@ -226,17 +226,17 @@ bool KStarsData::readADVTreeData(void) else { - Name = Line.mid(0, Line.find(":")); - Link = Line.mid(Line.find(":") + 1); + Name = Line.mid(0, Line.tqfind(":")); + Link = Line.mid(Line.tqfind(":") + 1); // Link is empty, using Interface instead if (Link.isEmpty()) { Link = Interface; subName = Name; - interfaceIndex = Link.find("KSINTERFACE"); + interfaceIndex = Link.tqfind("KSINTERFACE"); Link.remove(interfaceIndex, 11); - Link = Link.insert(interfaceIndex, subName.replace( TQRegExp(" "), "+")); + Link = Link.insert(interfaceIndex, subName.tqreplace( TQRegExp(" "), "+")); } @@ -433,7 +433,7 @@ bool KStarsData::readCLineData( void ) { } if ( ! starFound ) - kdWarning() << i18n( "No star named %1 found." ).arg(name) << endl; + kdWarning() << i18n( "No star named %1 found." ).tqarg(name) << endl; } } file.close(); @@ -584,7 +584,7 @@ bool KStarsData::readStarData( void ) { if (Options::magLimitDrawStar() > loadUntilMag) loadUntilMag = Options::magLimitDrawStar(); for (unsigned int i=1; ihasMoreLines()) { @@ -664,9 +664,9 @@ void KStarsData::processStar( TQString *line, bool reloadMode ) { //parse name(s) name = line->mid( 72 ).stripWhiteSpace(); //the rest of the line - if (name.contains( ':' )) { //genetive form exists - gname = name.mid( name.find(':')+1 ).stripWhiteSpace(); - name = name.mid( 0, name.find(':') ).stripWhiteSpace(); + if (name.tqcontains( ':' )) { //genetive form exists + gname = name.mid( name.tqfind(':')+1 ).stripWhiteSpace(); + name = name.mid( 0, name.tqfind(':') ).stripWhiteSpace(); } // HEV: look up star name in internationalization filesource @@ -788,7 +788,7 @@ bool KStarsData::readDeepSkyData( void ) { snum = TQString().sprintf( "%02d", i+1 ); fname = "ngcic" + snum + ".dat"; - emit progressText( i18n( "Loading NGC/IC Data (%1%)" ).arg( int(100.*float(i)/float(NNGCFILES)) ) ); + emit progressText( i18n( "Loading NGC/IC Data (%1%)" ).tqarg( int(100.*float(i)/float(NNGCFILES)) ) ); if ( KSUtils::openDataFile( file, fname ) ) { KSFileReader fileReader( file ); // close file is included @@ -939,7 +939,7 @@ bool KStarsData::openURLFile(TQString urlfile, TQFile & file) { file.setName( locateLocal( "appdata", urlfile ) ); if ( file.open( IO_ReadOnly ) ) { //local file found. Now, if global file has newer timestamp, then merge the two files. - //First load local file into QStringList + //First load local file into TQStringList bool newDataFound( false ); TQStringList urlData; TQTextStream lStream( &file ); @@ -964,14 +964,14 @@ bool KStarsData::openURLFile(TQString urlfile, TQFile & file) { TQString line = gStream.readLine(); //If global-file line begins with "XXX:" then this line should be removed from the local file. - if ( line.left( 4 ) == "XXX:" && urlData.contains( line.mid( 4 ) ) ) { - urlData.remove( urlData.find( line.mid( 4 ) ) ); + if ( line.left( 4 ) == "XXX:" && urlData.tqcontains( line.mid( 4 ) ) ) { + urlData.remove( urlData.tqfind( line.mid( 4 ) ) ); } else { //does local file contain the current global file line, up to second ':' ? bool linefound( false ); for ( unsigned int j=0; j< urlData.count(); ++j ) { - if ( urlData[j].contains( line.left( line.find( ':', line.find( ':' ) + 1 ) ) ) ) { + if ( urlData[j].tqcontains( line.left( line.tqfind( ':', line.tqfind( ':' ) + 1 ) ) ) ) { //replace line in urlData with its equivalent in the newer global file. urlData.remove( urlData.at(j) ); urlData.insert( urlData.at(j), line ); @@ -1047,21 +1047,21 @@ bool KStarsData::readUserLog(void) while (!buffer.isEmpty()) { int startIndex, endIndex; - startIndex = buffer.find("[KSLABEL:"); + startIndex = buffer.tqfind("[KSLABEL:"); sub = buffer.mid(startIndex); - endIndex = sub.find("[KSLogEnd]"); + endIndex = sub.tqfind("[KSLogEnd]"); // Read name after KSLABEL identifer - uint uiFirstNewline = sub.find("\n", startIndex + 9); - name = sub.mid(startIndex + 9, sub.findRev( "]", uiFirstNewline ) - (startIndex + 9) ); + uint uiFirstNewline = sub.tqfind("\n", startIndex + 9); + name = sub.mid(startIndex + 9, sub.tqfindRev( "]", uiFirstNewline ) - (startIndex + 9) ); // Read data and skip new line data = sub.mid( uiFirstNewline + 1, endIndex - (uiFirstNewline + 1)); buffer = buffer.mid(endIndex + 11); //Find the sky object named 'name'. - //Note that ObjectNameList::find() looks for the ascii representation + //Note that ObjectNameList::tqfind() looks for the ascii representation //of star genetive names, so stars are identified that way in the user log. - SkyObjectName *sonm = ObjNames.find(name); + SkyObjectName *sonm = ObjNames.tqfind(name); if (sonm == 0) { kdWarning() << k_funcinfo << name << " not found" << endl; } else { @@ -1084,12 +1084,12 @@ bool KStarsData::readURLData( TQString urlfile, int type, bool deepOnly ) { //ignore comment lines if ( line.left(1) != "#" ) { - TQString name = line.mid( 0, line.find(':') ); - TQString sub = line.mid( line.find(':')+1 ); - TQString title = sub.mid( 0, sub.find(':') ); - TQString url = sub.mid( sub.find(':')+1 ); + TQString name = line.mid( 0, line.tqfind(':') ); + TQString sub = line.mid( line.tqfind(':')+1 ); + TQString title = sub.mid( 0, sub.tqfind(':') ); + TQString url = sub.mid( sub.tqfind(':')+1 ); - SkyObjectName *sonm = ObjNames.find(name); + SkyObjectName *sonm = ObjNames.tqfind(name); if (sonm == 0) { kdWarning() << k_funcinfo << name << " not found" << endl; @@ -1142,7 +1142,7 @@ bool KStarsData::addCatalog( TQString filename ) { return true; } else - kdWarning() << k_funcinfo << i18n("Error adding catalog: %1").arg( filename ) << endl; + kdWarning() << k_funcinfo << i18n("Error adding catalog: %1").tqarg( filename ) << endl; return false; } @@ -1196,7 +1196,7 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs //Now, if one of the columns is the "Name" field, the name may contain spaces. //In this case, the name field will need to be surrounded by quotes. //Check for this, and adjust the d list accordingly - int iname = Columns.findIndex( "Nm" ); + int iname = Columns.tqfindIndex( "Nm" ); if ( iname >= 0 && d[iname].left(1) == "\"" ) { //multi-word name in quotes d[iname] = d[iname].mid(1); //remove leading quote //It's possible that the name is one word, but still in quotes @@ -1220,7 +1220,7 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs if ( d.count() == Columns.count() ) { processCustomDataLine( i, d, Columns, CatalogPrefix, objList, showerrs, errs ); } else { - if ( showerrs ) errs.append( i18n( "Line %1 does not contain %2 fields. Skipping it." ).arg( i ).arg( Columns.count() ) ); + if ( showerrs ) errs.append( i18n( "Line %1 does not contain %2 fields. Skipping it." ).tqarg( i ).tqarg( Columns.count() ) ); } } } @@ -1246,10 +1246,10 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs } else { //Error opening catalog file if ( showerrs ) - KMessageBox::sorry( 0, i18n( "Could not open custom data file: %1" ).arg( filename ), + KMessageBox::sorry( 0, i18n( "Could not open custom data file: %1" ).tqarg( filename ), i18n( "Error opening file" ) ); else - kdDebug() << i18n( "Could not open custom data file: %1" ).arg( filename ) << endl; + kdDebug() << i18n( "Could not open custom data file: %1" ).tqarg( filename ) << endl; } //Return the catalog @@ -1280,7 +1280,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! RA.setFromString( d[i], false ) ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse RA value: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1289,7 +1289,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! Dec.setFromString( d[i], true ) ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Dec value: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1301,14 +1301,14 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( iType == 2 || iType > 8 ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Invalid object type: %3" ) - .arg(lnum).arg(i).arg(d[i]) + + .tqarg(lnum).tqarg(i).tqarg(d[i]) + i18n( "Must be one of 0, 1, 3, 4, 5, 6, 7, 8." ) ); return false; } } else { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Object type: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1319,7 +1319,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! ok ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Magnitude: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1330,7 +1330,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! ok ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Major Axis: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1341,7 +1341,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! ok ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Minor Axis: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1352,7 +1352,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! ok ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Position Angle: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1388,57 +1388,57 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column TQString d( *it ); //current data line if ( d.left(1) != "#" ) break; //no longer in header! - int iname = d.find( "# Name: " ); - int iprefix = d.find( "# Prefix: " ); - int icolor = d.find( "# Color: " ); - int iepoch = d.find( "# Epoch: " ); + int iname = d.tqfind( "# Name: " ); + int iprefix = d.tqfind( "# Prefix: " ); + int icolor = d.tqfind( "# Color: " ); + int iepoch = d.tqfind( "# Epoch: " ); if ( iname == 0 ) { //line contains catalog name - iname = d.find(":")+2; + iname = d.tqfind(":")+2; if ( CatalogName.isEmpty() ) { CatalogName = d.mid( iname ); } else { //duplicate name in header if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Extra Name field in header: %1. Will be ignored" ).arg( d.mid(iname) ) ); + i18n( "Extra Name field in header: %1. Will be ignored" ).tqarg( d.mid(iname) ) ); } } else if ( iprefix == 0 ) { //line contains catalog prefix - iprefix = d.find(":")+2; + iprefix = d.tqfind(":")+2; if ( CatalogPrefix.isEmpty() ) { CatalogPrefix = d.mid( iprefix ); } else { //duplicate prefix in header if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Extra Prefix field in header: %1. Will be ignored" ).arg( d.mid(iprefix) ) ); + i18n( "Extra Prefix field in header: %1. Will be ignored" ).tqarg( d.mid(iprefix) ) ); } } else if ( icolor == 0 ) { //line contains catalog prefix - icolor = d.find(":")+2; + icolor = d.tqfind(":")+2; if ( CatalogColor.isEmpty() ) { CatalogColor = d.mid( icolor ); } else { //duplicate prefix in header if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Extra Color field in header: %1. Will be ignored" ).arg( d.mid(icolor) ) ); + i18n( "Extra Color field in header: %1. Will be ignored" ).tqarg( d.mid(icolor) ) ); } } else if ( iepoch == 0 ) { //line contains catalog epoch - iepoch = d.find(":")+2; + iepoch = d.tqfind(":")+2; if ( CatalogEpoch == 0. ) { bool ok( false ); CatalogEpoch = d.mid( iepoch ).toFloat( &ok ); if ( !ok ) { if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Could not convert Epoch to float: %1. Using 2000. instead" ).arg( d.mid(iepoch) ) ); + i18n( "Could not convert Epoch to float: %1. Using 2000. instead" ).tqarg( d.mid(iepoch) ) ); CatalogEpoch = 2000.; //adopt default value } } else { //duplicate epoch in header if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Extra Epoch field in header: %1. Will be ignored" ).arg( d.mid(iepoch) ) ); + i18n( "Extra Epoch field in header: %1. Will be ignored" ).tqarg( d.mid(iepoch) ) ); } } else if ( ! foundDataColumns ) { //don't try to parse data column descriptors if we already found them //Chomp off leading "#" character - d = d.replace( TQRegExp( "#" ), "" ); + d = d.tqreplace( TQRegExp( "#" ), "" ); TQStringList fields = TQStringList::split( " ", d ); //split on whitespace @@ -1452,26 +1452,26 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column for ( ; itf != itfEnd; itf++ ) { TQString s( *itf ); - if ( master.contains( s ) ) { + if ( master.tqcontains( s ) ) { //add the data field Columns.append( s ); // remove the field from the master list and inc the // count of "good" columns (unless field is "Ignore") if ( s != "Ig" ) { - master.remove( master.find( s ) ); + master.remove( master.tqfind( s ) ); ncol++; } - } else if ( fields.contains( s ) ) { //duplicate field + } else if ( fields.tqcontains( s ) ) { //duplicate field fields.append( "Ig" ); //skip this column if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Duplicate data field descriptor \"%1\" will be ignored" ).arg( s ) ); + i18n( "Duplicate data field descriptor \"%1\" will be ignored" ).tqarg( s ) ); } else { //Invalid field fields.append( "Ig" ); //skip this column if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Invalid data field descriptor \"%1\" will be ignored" ).arg( s ) ); + i18n( "Invalid data field descriptor \"%1\" will be ignored" ).tqarg( s ) ); } } @@ -1514,7 +1514,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column } //the it iterator now points to the first line past the header - iStart = lines.findIndex( TQString( *it ) ); + iStart = lines.tqfindIndex( TQString( *it ) ); return true; } } @@ -1646,10 +1646,10 @@ bool KStarsData::readTimeZoneRulebook( void ) { if ( line.left(1) != "#" && line.length() ) { //ignore commented and blank lines TQStringList fields = TQStringList::split( " ", line ); id = fields[0]; - TQTime stime = TQTime( fields[3].left( fields[3].find(':')).toInt() , - fields[3].mid( fields[3].find(':')+1, fields[3].length()).toInt() ); - TQTime rtime = TQTime( fields[6].left( fields[6].find(':')).toInt(), - fields[6].mid( fields[6].find(':')+1, fields[6].length()).toInt() ); + TQTime stime = TQTime( fields[3].left( fields[3].tqfind(':')).toInt() , + fields[3].mid( fields[3].tqfind(':')+1, fields[3].length()).toInt() ); + TQTime rtime = TQTime( fields[6].left( fields[6].tqfind(':')).toInt(), + fields[6].mid( fields[6].tqfind(':')+1, fields[6].length()).toInt() ); Rulebook[ id ] = TimeZoneRule( fields[1], fields[2], stime, fields[4], fields[5], rtime ); } @@ -1774,20 +1774,20 @@ void KStarsData::initError(TQString s, bool required = false) { message = i18n( "The file %1 could not be found. " "KStars cannot run properly without this file. " "To continue loading, place the file in one of the " - "following locations, then press Retry:\n\n" ).arg( s ) - + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).arg( s ) - + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).arg( s ) + "following locations, then press Retry:\n\n" ).tqarg( s ) + + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).tqarg( s ) + + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).tqarg( s ) + i18n( "Otherwise, press Cancel to shutdown." ); - caption = i18n( "Critical File Not Found: %1" ).arg( s ); + caption = i18n( "Critical File Not Found: %1" ).tqarg( s ); } else { message = i18n( "The file %1 could not be found. " "KStars can still run without this file. " "However, to avoid seeing this message in the future, you can " - "place the file in one of the following locations, then press Retry:\n\n" ).arg( s ) - + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).arg( s ) - + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).arg( s ) - + i18n( "Otherwise, press Cancel to continue loading without this file." ).arg( s ); - caption = i18n( "Non-Critical File Not Found: %1" ).arg( s ); + "place the file in one of the following locations, then press Retry:\n\n" ).tqarg( s ) + + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).tqarg( s ) + + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).tqarg( s ) + + i18n( "Otherwise, press Cancel to continue loading without this file." ).tqarg( s ); + caption = i18n( "Non-Critical File Not Found: %1" ).tqarg( s ); } if ( KMessageBox::warningContinueCancel( 0, message, caption, i18n( "Retry" ) ) == KMessageBox::Continue ) { @@ -1839,7 +1839,7 @@ void KStarsData::slotInitialize() { case 2: //Load stellar database// - emit progressText(i18n("Loading Star Data (%1%)" ).arg(0) ); + emit progressText(i18n("Loading Star Data (%1%)" ).tqarg(0) ); if ( !readStarData( ) ) initError( "hipNNN.dat", true ); if (!readVARData()) @@ -1850,7 +1850,7 @@ void KStarsData::slotInitialize() { case 3: //Load NGC/IC database and custom catalogs// - emit progressText( i18n("Loading NGC/IC Data (%1%)" ).arg(0) ); + emit progressText( i18n("Loading NGC/IC Data (%1%)" ).tqarg(0) ); if ( !readDeepSkyData( ) ) initError( "ngcicN.dat", true ); @@ -2236,7 +2236,7 @@ void KStarsData::setFullTimeUpdate() { } void KStarsData::setLocationFromOptions() { - TQMap::Iterator it = Rulebook.find( Options::dST() ); + TQMap::Iterator it = Rulebook.tqfind( Options::dST() ); setLocation( GeoLocation ( Options::longitude(), Options::latitude(), Options::cityName(), Options::provinceName(), Options::countryName(), Options::timeZone(), &(it.data()), 4, Options::elevation() ) ); @@ -2345,7 +2345,7 @@ bool KStarsData::executeScript( const TQString &scriptname, SkyMap *map ) { TQFile f( scriptname ); if ( !f.open( IO_ReadOnly) ) { - kdDebug() << i18n( "Could not open file %1" ).arg( f.name() ) << endl; + kdDebug() << i18n( "Could not open file %1" ).tqarg( f.name() ) << endl; return false; } @@ -2445,7 +2445,7 @@ bool KStarsData::executeScript( const TQString &scriptname, SkyMap *map ) { cmdCount++; } else { kdWarning() << i18n( "Could not set time: %1 / %2 / %3 ; %4:%5:%6" ) - .arg(day).arg(mth).arg(yr).arg(hr).arg(min).arg(sec) << endl; + .tqarg(day).tqarg(mth).tqarg(yr).tqarg(hr).tqarg(min).tqarg(sec) << endl; } } else if ( fn[0] == "changeViewOption" && fn.count() == 3 ) { bool bOk(false), nOk(false), dOk(false); @@ -2559,7 +2559,7 @@ bool KStarsData::executeScript( const TQString &scriptname, SkyMap *map ) { } if ( !cityFound ) - kdWarning() << i18n( "Could not set location named %1, %2, %3" ).arg(city).arg(province).arg(country) << endl; + kdWarning() << i18n( "Could not set location named %1, %2, %3" ).tqarg(city).tqarg(province).tqarg(country) << endl; } } } //end while diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h index 0a358a42..0ba7b40b 100644 --- a/kstars/kstars/kstarsdata.h +++ b/kstars/kstars/kstarsdata.h @@ -86,9 +86,10 @@ class CustomCatalog; *@version 1.0 */ -class KStarsData : public QObject +class KStarsData : public TQObject { Q_OBJECT + TQ_OBJECT public: //Friend classes can see the private data. friend class FindDialog; @@ -134,7 +135,7 @@ public: */ bool readTimeZoneRulebook( void ); - /**Parse one line from a locations database file. The line contains 10 or 11 fields + /**Parse one line from a locations database file. The line tqcontains 10 or 11 fields *separated by colons (":"). The fields are: *@li City Name [string] *@li Province Name (optional) [string] @@ -326,7 +327,7 @@ public: //TODO JM: ADV tree should use XML instead /**Read Advanced interface structure to be used later to construct the list view in *the advanced tab in the Detail Dialog. - *@li KSLABEL designates a top-level parent label + *@li KSLABEL designates a top-level tqparent label *@li KSINTERFACE designates a common URL interface for several objects *@li END designates the end of a sub tree structure *@short read Advanted interface structure. @@ -351,7 +352,7 @@ public: /**Read in URLs to be attached to a named object's right-click popup menu. At this *point, there is no way to attach URLs to unnamed objects. There are two *kinds of URLs, each with its own data file: image links and webpage links. In addition, - *there may be user-specific versions with custom URLs. Each line contains 3 fields + *there may be user-specific versions with custom URLs. Each line tqcontains 3 fields *separated by colons (":"). Note that the last field is the URL, and as such it will *generally contain a colon itself. Only the first two colons encountered are treated *as field separators. The fields are: @@ -449,7 +450,7 @@ public: KSPlanet *earth() { return PCat->earth(); } /**@short Find object by name. - *@param name Object name to find + *@param name Object name to tqfind *@return pointer to SkyObject matching this name */ SkyObject* objectNamed( const TQString &name ); @@ -576,7 +577,7 @@ public slots: void initialize(); /**@short send a message to the console*/ - void slotConsoleMessage( TQString s ) { std::cout << s.utf8() << std::endl; } + void slotConsoleMessage( TQString s ) { std::cout << s.utf8().data() << std::endl; } /**Update the Simulation Clock. Update positions of Planets. Update *Alt/Az coordinates of objects. Update precession. Update Focus position. diff --git a/kstars/kstars/kstarsdatetime.cpp b/kstars/kstars/kstarsdatetime.cpp index 6b406f44..b99a6173 100644 --- a/kstars/kstars/kstarsdatetime.cpp +++ b/kstars/kstars/kstarsdatetime.cpp @@ -55,10 +55,10 @@ KStarsDateTime::KStarsDateTime( long double _jd ) : ExtDateTime() { setDJD( _jd ); } -KStarsDateTime KStarsDateTime::currentDateTime() { - KStarsDateTime dt( ExtDate::currentDate(), TQTime::currentTime() ); +KStarsDateTime KStarsDateTime::tqcurrentDateTime() { + KStarsDateTime dt( ExtDate::tqcurrentDate(), TQTime::currentTime() ); if ( dt.time().hour()==0 && dt.time().minute()==0 ) // midnight or right after? - dt.setDate( ExtDate::currentDate() ); // fetch date again + dt.setDate( ExtDate::tqcurrentDate() ); // fetch date again return dt; } @@ -116,7 +116,7 @@ dms KStarsDateTime::GSTat0hUT() const { double t1 = 6.697374558 + 2400.051336*t + 0.000025862*t*t + 0.000000002*t*t*t; - // To obtain the apparent sidereal time, we have to correct the + // To obtain the aptqparent sidereal time, we have to correct the // mean greenwich sidereal time with nutation in longitude multiplied // by the cosine of the obliquity of the ecliptic. This correction // is called nutation in right ascention, and may amount to 0.3 secs. diff --git a/kstars/kstars/kstarsdatetime.h b/kstars/kstars/kstarsdatetime.h index a45e2495..f31d0955 100644 --- a/kstars/kstars/kstarsdatetime.h +++ b/kstars/kstars/kstarsdatetime.h @@ -134,7 +134,7 @@ public: *@return the date and time according to the CPU clock (note that this is not *necessarily UT) */ - static KStarsDateTime currentDateTime(); + static KStarsDateTime tqcurrentDateTime(); /** *@return the julian day as a long double, including the time as the fractional portion. diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp index b4a22ba9..9ff1e72c 100644 --- a/kstars/kstars/kstarsdcop.cpp +++ b/kstars/kstars/kstarsdcop.cpp @@ -157,7 +157,7 @@ void KStars::setGeoLocation( TQString city, TQString province, TQString country //make sure planets, etc. are updated immediately data()->setFullTimeUpdate(); - // If the sky is in Horizontal mode and not tracking, reset focus such that + // If the sky is inQt::Horizontal mode and not tracking, reset focus such that // Alt/Az remain constant. if ( ! Options::isTracking() && Options::useAltAz() ) { map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() ); @@ -191,7 +191,7 @@ void KStars::readConfig() { //Reset date, if one was stored if ( data()->StoredDate.isValid() ) { data()->changeDateTime( geo()->LTtoUT( data()->StoredDate ) ); - data()->StoredDate.setDJD( (long double)INVALID_DAY ); //invalidate StoredDate + data()->StoredDate.setDJD( (long double)INVALID_DAY ); //tqinvalidate StoredDate } map()->forceUpdate(); @@ -212,7 +212,7 @@ TQString KStars::getOption( const TQString &name ) { KConfigSkeletonItem *it = Options::self()->findItem( name ); if ( it ) return it->property().toString(); - else return TQString::null; + else return TQString(); } void KStars::changeViewOption( const TQString op, const TQString val ) { @@ -359,13 +359,13 @@ void KStars::loadColorScheme( const TQString _name ) { if ( ! ok ) { if ( !filename.isEmpty() ) { for( unsigned int i=0; icolorScheme()->load( filename ); } - if ( ! ok ) kdDebug() << i18n( "Unable to load color scheme named %1. Also tried %2." ).arg( name ).arg( filename ); + if ( ! ok ) kdDebug() << i18n( "Unable to load color scheme named %1. Also tried %2." ).tqarg( name ).tqarg( filename ); } if ( ok ) { @@ -376,12 +376,12 @@ void KStars::loadColorScheme( const TQString _name ) { if ( Options::darkAppColors() == false && filename == "night.colors" ) { Options::setDarkAppColors( true ); OriginalPalette = TQApplication::palette(); - TQApplication::setPalette( DarkPalette, true ); + TQApplication::tqsetPalette( DarkPalette, true ); } if ( Options::darkAppColors() && filename != "night.colors" ) { Options::setDarkAppColors( false ); - TQApplication::setPalette( OriginalPalette, true ); + TQApplication::tqsetPalette( OriginalPalette, true ); } map()->forceUpdate(); @@ -392,7 +392,7 @@ void KStars::exportImage( const TQString url, int w, int h ) { //If the filename string contains no "/" separators, assume the //user wanted to place a file in their home directory. KURL fileURL; - if ( ! url.contains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url; + if ( ! url.tqcontains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url; else fileURL = url; KTempFile tmpfile; @@ -411,17 +411,17 @@ void KStars::exportImage( const TQString url, int w, int h ) { } //Determine desired image format from filename extension - TQString ext = fname.mid( fname.findRev(".")+1 ); + TQString ext = fname.mid( fname.tqfindRev(".")+1 ); const char* format = "PNG"; if ( ext.lower() == "png" ) { format = "PNG"; } else if ( ext.lower() == "jpg" || ext.lower() == "jpeg" ) { format = "JPG"; } else if ( ext.lower() == "gif" ) { format = "GIF"; } else if ( ext.lower() == "pnm" ) { format = "PNM"; } else if ( ext.lower() == "bmp" ) { format = "BMP"; } - else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).arg( fname ) << endl; } + else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).tqarg( fname ) << endl; } - map()->exportSkyImage( &skyimage ); - kapp->processEvents(10000); + map()->exportSkyImage( TQT_TQPAINTDEVICE(&skyimage) ); + kapp->tqprocessEvents(10000); //skyImage is the size of the sky map. The requested image size is w x h. //If w x h is smaller than the skymap, then we simply crop the image. @@ -447,12 +447,12 @@ void KStars::exportImage( const TQString url, int w, int h ) { bitBlt( &outimage, dx, dy, &skyimage, sx, sy, sw, sh ); } - if ( ! outimage.save( fname, format ) ) kdDebug() << i18n( "Error: Unable to save image: %1 " ).arg( fname ) << endl; - else kdDebug() << i18n( "Image saved to file: %1" ).arg( fname ) << endl; + if ( ! outimage.save( fname, format ) ) kdDebug() << i18n( "Error: Unable to save image: %1 " ).tqarg( fname ) << endl; + else kdDebug() << i18n( "Image saved to file: %1" ).tqarg( fname ) << endl; if ( tmpfile.name() == fname ) { //attempt to upload image to remote location if ( ! KIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( fileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( fileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } @@ -512,7 +512,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) } TQListViewItem *driverItem = NULL; - driverItem = indidriver->localListView->findItem(deviceName, 0); + driverItem = indidriver->localListView->tqfindItem(deviceName, 0); if (driverItem == NULL) { kdDebug() << "Device " << deviceName << " not found!" << endl; @@ -523,7 +523,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) if (indidriver->isDeviceRunning(deviceName)) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); } // Set custome label for device @@ -538,7 +538,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) indidriver->serverR->setChecked(true); // Run it - indidriver->processDeviceStatus(0); + indidriver->processDevicetqStatus(0); } @@ -551,14 +551,14 @@ void KStars::shutdownINDI (TQString deviceName) } TQListViewItem *driverItem = NULL; - driverItem = indidriver->localListView->findItem(deviceName, 0); + driverItem = indidriver->localListView->tqfindItem(deviceName, 0); if (driverItem == NULL) { kdDebug() << "Device " << deviceName << " not found!" << endl; return; } - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); } @@ -654,20 +654,20 @@ void KStars::setINDITargetCoord(TQString deviceName, double RA, double DEC) return; } - prop = dev->findProp("EQUATORIAL_EOD_COORD"); + prop = dev->findProp("ETQUATORIAL_EOD_COORD"); if (!prop) return; el = prop->findElement("RA"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(RA)); + el->write_w->setText(TQString("%1").tqarg(RA)); el = prop->findElement("DEC"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(DEC)); + el->write_w->setText(TQString("%1").tqarg(DEC)); prop->newText(); @@ -698,20 +698,20 @@ void KStars::setINDITargetName(TQString deviceName, TQString objectName) return; } - prop = dev->findProp("EQUATORIAL_EOD_COORD"); + prop = dev->findProp("ETQUATORIAL_EOD_COORD"); if (!prop) return; el = prop->findElement("RA"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(target->ra()->Hours())); + el->write_w->setText(TQString("%1").tqarg(target->ra()->Hours())); el = prop->findElement("DEC"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(target->dec()->Degrees())); + el->write_w->setText(TQString("%1").tqarg(target->dec()->Degrees())); prop->newText(); @@ -813,7 +813,7 @@ void KStars::setINDIFocusSpeed(TQString deviceName, unsigned int speed) if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(speed)); + el->write_w->setText(TQString("%1").tqarg(speed)); prop->newText(); @@ -865,13 +865,13 @@ void KStars::setINDIGeoLocation(TQString deviceName, double longitude, double la if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(longitude)); + el->write_w->setText(TQString("%1").tqarg(longitude)); el = prop->findElement("LAT"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(latitude)); + el->write_w->setText(TQString("%1").tqarg(latitude)); prop->newText(); @@ -907,7 +907,7 @@ void KStars::setINDIFocusTimeout(TQString deviceName, int timeout) if (!el) return; if (el->write_w) - el->write_w->setText(TQString("%1").arg(timeout)); + el->write_w->setText(TQString("%1").tqarg(timeout)); else if (el->spin_w) el->spin_w->setValue(timeout); @@ -944,7 +944,7 @@ void KStars::startINDIExposure(TQString deviceName, int timeout) if (!el) return; if (el->write_w) - el->write_w->setText(TQString("%1").arg(timeout)); + el->write_w->setText(TQString("%1").tqarg(timeout)); else if (el->spin_w) el->spin_w->setValue(timeout); @@ -981,7 +981,7 @@ void KStars::setINDIFilterNum(TQString deviceName, int filter_num) if (!el) return; if (el->write_w) - el->write_w->setText(TQString("%1").arg(filter_num)); + el->write_w->setText(TQString("%1").tqarg(filter_num)); else if (el->spin_w) el->spin_w->setValue(filter_num); @@ -1061,7 +1061,7 @@ void KStars::setINDICCDTemp(TQString deviceName, int temp) if (!el) return; if (el->write_w) - el->write_w->setText(TQString("%1").arg(temp)); + el->write_w->setText(TQString("%1").tqarg(temp)); else if (el->spin_w) el->spin_w->setValue(temp); diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index 276e5c8a..544d9d9d 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -49,27 +49,27 @@ void KStars::initActions() { //File Menu: new KAction(i18n("&New Window"), "window_new", KShortcut( "Ctrl+N" ), - this, TQT_SLOT( newWindow() ), actionCollection(), "new_window"); + TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window"); new KAction(i18n("&Close Window"), "fileclose", KShortcut( "Ctrl+W" ), - this, TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); + TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); new KAction( i18n( "&Download Data..." ), "knewstuff", KShortcut( "Ctrl+D" ), - this, TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); - new KAction( i18n( "Open FITS..."), "fileopen", KShortcut( "Ctrl+O"), this, TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); + TQT_TQOBJECT(this), TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); + new KAction( i18n( "Open FITS..."), "fileopen", KShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); new KAction( i18n( "&Save Sky Image..." ), "fileexport", KShortcut( "Ctrl+I" ), - this, TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); + TQT_TQOBJECT(this), TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); new KAction( i18n( "&Run Script..." ), "launch", KShortcut( "Ctrl+R" ), - this, TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" ); - KStdAction::print(this, TQT_SLOT( slotPrint() ), actionCollection(), "print" ); - KStdAction::quit(this, TQT_SLOT( close() ), actionCollection(), "quit" ); + TQT_TQOBJECT(this), TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" ); + KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), actionCollection(), "print" ); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" ); //Time Menu: new KAction( i18n( "Set Time to &Now" ), KShortcut( "Ctrl+E" ), - this, TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); new KAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", KShortcut( "Ctrl+S" ), - this, TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("player_pause"), i18n("Start &Clock"), BarIcon("1rightarrow"), - 0, this, TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); actTimeRun->setOffToolTip( i18n( "Start Clock" ) ); actTimeRun->setOnToolTip( i18n( "Stop Clock" ) ); TQObject::connect(data()->clock(), TQT_SIGNAL(clockStarted()), actTimeRun, TQT_SLOT(turnOn()) ); @@ -79,36 +79,36 @@ void KStars::initActions() { //Focus Menu: new KAction(i18n( "&Zenith" ), KShortcut( "Z" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); new KAction(i18n( "&North" ), KShortcut( "N" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); new KAction(i18n( "&East" ), KShortcut( "E" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); new KAction(i18n( "&South" ), KShortcut( "S" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); new KAction(i18n( "&West" ), KShortcut( "W" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); - KAction *tmpAction = KStdAction::find( this, TQT_SLOT( slotFind() ), + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); + KAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), actionCollection(), "find_object" ); tmpAction->setText( i18n( "&Find Object..." ) ); tmpAction->setToolTip( i18n( "Find object" ) ); new KAction( i18n( "Engage &Tracking" ), "decrypted", KShortcut( "Ctrl+T" ), - this, TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); + TQT_TQOBJECT(this), TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); new KAction( i18n( "Set Focus &Manually..." ), KShortcut( "Ctrl+M" ), - this, TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); + TQT_TQOBJECT(this), TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); //View Menu: - KStdAction::zoomIn(this, TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); - KStdAction::zoomOut(this, TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); + KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); + KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); new KAction( i18n( "&Default Zoom" ), "viewmagfit.png", KShortcut( "Ctrl+Z" ), - this, TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); + TQT_TQOBJECT(this), TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); new KAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", KShortcut( "Ctrl+Shift+Z" ), - this, TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ), - Key_Space, this, TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); - KStdAction::fullScreen( this, TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); + Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); + KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); //Settings Menu: @@ -178,9 +178,9 @@ void KStars::initActions() { while ( !stream.eof() ) { line = stream.readLine(); - schemeName = line.left( line.find( ':' ) ); + schemeName = line.left( line.tqfind( ':' ) ); //I call it filename here, but it's used as the name of the action! - filename = "cs_" + line.mid( line.find( ':' ) +1, line.find( '.' ) - line.find( ':' ) - 1 ); + filename = "cs_" + line.mid( line.tqfind( ':' ) +1, line.tqfind( '.' ) - line.tqfind( ':' ) - 1 ); addColorMenuItem( i18n( schemeName.local8Bit() ), filename.local8Bit() ); } file.close(); @@ -191,62 +191,62 @@ void KStars::initActions() { initFOV(); new KAction( i18n( "Location on Earth", "&Geographic..." ), - "kstars_geo", KShortcut( "Ctrl+G" ), this, + "kstars_geo", KShortcut( "Ctrl+G" ), TQT_TQOBJECT(this), TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); - KStdAction::preferences( this, TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); new KAction(i18n( "Startup Wizard..." ), "wizard", KShortcut(), - this, TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); + TQT_TQOBJECT(this), TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); //Tools Menu: new KAction(i18n( "Calculator..."), KShortcut( "Ctrl+C"), - this, TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); + TQT_TQOBJECT(this), TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); new KAction(i18n( "Observing List..."), KShortcut( "Ctrl+L"), - this, TQT_SLOT( slotObsList() ), actionCollection(), "obslist"); + TQT_TQOBJECT(this), TQT_SLOT( slotObsList() ), actionCollection(), "obslist"); // enable action only if file was loaded and processed successfully. if (!data()->VariableStarsList.isEmpty()) new KAction(i18n( "AAVSO Light Curves..."), KShortcut( "Ctrl+V"), - this, TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); + TQT_TQOBJECT(this), TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); new KAction(i18n( "Altitude vs. Time..."), KShortcut( "Ctrl+A"), - this, TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); + TQT_TQOBJECT(this), TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); new KAction(i18n( "What's up Tonight..."), KShortcut("Ctrl+U"), - this, TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); + TQT_TQOBJECT(this), TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); //FIXME GLOSSARY // new KAction(i18n( "Glossary..."), KShortcut("Ctrl+K"), // this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary"); new KAction(i18n( "Script Builder..."), KShortcut("Ctrl+B"), - this, TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); + TQT_TQOBJECT(this), TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); new KAction(i18n( "Solar System..."), KShortcut("Ctrl+Y"), - this, TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); + TQT_TQOBJECT(this), TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); new KAction(i18n( "Jupiter's Moons..."), KShortcut("Ctrl+J"), - this, TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); + TQT_TQOBJECT(this), TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); // devices Menu - new KAction(i18n("Telescope Wizard..."), 0, this, TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); - new KAction(i18n("Telescope Properties..."), 0, this, TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); - new KAction(i18n("Device Manager..."), 0, this, TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); + new KAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); + new KAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); + new KAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); - tmpAction = new KAction(i18n("Capture Image Sequence..."), 0, this, TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); + tmpAction = new KAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); tmpAction->setEnabled(false); - tmpAction = new KAction(i18n("INDI Control Panel..."), 0, this, TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); + tmpAction = new KAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); tmpAction->setEnabled(false); - new KAction(i18n("Configure INDI..."), 0, this, TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); + new KAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); //Help Menu: new KAction( i18n( "Tip of the Day" ), "idea", 0, - this, TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); + TQT_TQOBJECT(this), TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); //Handbook toolBar item: new KAction( i18n( "&Handbook" ), "contents", KShortcut( "F1" ), - this, TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); + TQT_TQOBJECT(this), TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); // //viewToolBar actions: @@ -254,39 +254,39 @@ void KStars::initActions() { //show_stars: a = new KToggleAction( i18n( "Toggle Stars" ), "kstars_stars", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); //show_deepsky: a = new KToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); //show_planets: a = new KToggleAction( i18n( "Toggle Solar System" ), "kstars_planets", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); //show_clines: a = new KToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); //show_cnames: a = new KToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); //show_cbound: a = new KToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); //show_mw: a = new KToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); //show_grid: a = new KToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); //show_horizon: a = new KToggleAction( i18n( "Toggle Ground" ), "kstars_horizon", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); if (Options::fitsSaveDirectory().isEmpty()) Options::setFitsSaveDirectory(TQDir:: homeDirPath()); @@ -327,7 +327,7 @@ void KStars::initFOV() { if ( fields.count() == 4 ) { nm = fields[0].stripWhiteSpace(); - KToggleAction *kta = new KToggleAction( nm, 0, this, TQT_SLOT( slotTargetSymbol() ), + KToggleAction *kta = new KToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); if ( nm == Options::fOVName() ) kta->setChecked( true ); @@ -335,11 +335,11 @@ void KStars::initFOV() { } } } else { - kdDebug() << i18n( "Could not open file: %1" ).arg( f.name() ) << endl; + kdDebug() << i18n( "Could not open file: %1" ).tqarg( f.name() ) << endl; } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, this, TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); + fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); } void KStars::initStatusBar() { @@ -467,7 +467,7 @@ void KStars::privatedata::buildGUI() { ks->initStatusBar(); ks->initActions(); - // create the layout of the central widget + // create the tqlayout of the central widget ks->topLayout = new TQVBoxLayout( ks->centralWidget ); ks->topLayout->addWidget( ks->skymap ); diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp index 7e57364b..b0edbed0 100644 --- a/kstars/kstars/kstarssplash.cpp +++ b/kstars/kstars/kstarssplash.cpp @@ -25,9 +25,9 @@ #include "kstarssplash.h" #include "ksutils.h" -KStarsSplash::KStarsSplash( TQWidget *parent, const char* name ) +KStarsSplash::KStarsSplash( TQWidget *tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n( "Loading KStars..." ), - 0 /*no buttons*/, Ok, parent, name, false /*not modal*/ ) { + 0 /*no buttons*/, Ok, tqparent, name, false /*not modal*/ ) { //Set up widgets for splashscreen. TQFrame *page = plainPage(); @@ -59,19 +59,19 @@ KStarsSplash::KStarsSplash( TQWidget *parent, const char* name ) pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, TQColor( "White" ) ); pal.setColor( TQPalette::Inactive, TQColorGroup::Foreground, TQColor( "White" ) ); label->setPalette( pal ); - label->setAlignment( AlignHCenter ); + label->tqsetAlignment( AlignHCenter ); label->setText( i18n( "Welcome to KStars. Please stand by while loading..." ) ); topLayout->addWidget( label ); //initialize the progress message label - textCurrentStatus = new TQLabel( page, "label2" ); - textCurrentStatus->setPalette( pal ); - textCurrentStatus->setAlignment( AlignHCenter ); - topLayout->addWidget( textCurrentStatus ); + textCurrenttqStatus = new TQLabel( page, "label2" ); + textCurrenttqStatus->setPalette( pal ); + textCurrenttqStatus->tqsetAlignment( AlignHCenter ); + topLayout->addWidget( textCurrenttqStatus ); topLayout->activate(); disableResize(); - setMessage(TQString::null); // force repaint of widget with no text + setMessage(TQString()); // force tqrepaint of widget with no text } KStarsSplash::~KStarsSplash() { @@ -80,8 +80,8 @@ KStarsSplash::~KStarsSplash() { void KStarsSplash::paintEvent( TQPaintEvent* ) { bitBlt( Banner, 0, 0, splashImage, 0, 0, -1, -1 ); - label->repaint(); // standard text label - textCurrentStatus->repaint(); // status text label + label->tqrepaint(); // standard text label + textCurrenttqStatus->tqrepaint(); // status text label } void KStarsSplash::closeEvent( TQCloseEvent *e ) { @@ -90,11 +90,11 @@ void KStarsSplash::closeEvent( TQCloseEvent *e ) { } void KStarsSplash::setMessage( TQString s ) { - textCurrentStatus->setText( s ); - repaint(); // repaint splash screen + textCurrenttqStatus->setText( s ); + tqrepaint(); // tqrepaint splash screen /** *Flush all event data. This is needed because events will buffered and - *repaint call will queued in event buffer. With flush all X11 events of + *tqrepaint call will queued in event buffer. With flush all X11 events of *this application will flushed. */ kapp->flush(); diff --git a/kstars/kstars/kstarssplash.h b/kstars/kstars/kstarssplash.h index afe523a2..0becc4a8 100644 --- a/kstars/kstars/kstarssplash.h +++ b/kstars/kstars/kstarssplash.h @@ -33,11 +33,12 @@ class TQLabel; class KStarsSplash : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor. Create widgets. Load KStars logo. Start load timer. */ - KStarsSplash( TQWidget *parent, const char* name ); + KStarsSplash( TQWidget *tqparent, const char* name ); /**Destructor */ @@ -50,7 +51,7 @@ class KStarsSplash : public KDialogBase protected: /**Paint event to redraw the widgets. This only gets called when the timer fires. - *It should also repaint if another window was on top of the splash screen, but + *It should also tqrepaint if another window was on top of the splash screen, but *this may be difficult to implement (it may be that the program is too busy loading data *to notice that a redraw is required). */ @@ -65,7 +66,7 @@ class KStarsSplash : public KDialogBase void closeWindow(); private: - TQLabel *textCurrentStatus, *label; + TQLabel *textCurrenttqStatus, *label; TQWidget *Banner; TQPixmap *splashImage; }; diff --git a/kstars/kstars/kswizard.cpp b/kstars/kstars/kswizard.cpp index 85258362..88037007 100644 --- a/kstars/kstars/kswizard.cpp +++ b/kstars/kstars/kswizard.cpp @@ -31,10 +31,10 @@ #include "kswizardui.h" #include "kswizard.h" -KSWizard::KSWizard( TQWidget *parent, const char *name ) - : KSWizardUI( parent, name ) +KSWizard::KSWizard( TQWidget *tqparent, const char *name ) + : KSWizardUI( tqparent, name ) { - ksw = (KStars *)parent; + ksw = (KStars *)tqparent; GeoID.resize(10000); //Removing telescope page for now... diff --git a/kstars/kstars/kswizard.h b/kstars/kstars/kswizard.h index ea570498..27b3010b 100644 --- a/kstars/kstars/kswizard.h +++ b/kstars/kstars/kswizard.h @@ -39,13 +39,14 @@ class GeoLocation; class KSWizard : public KSWizardUI { Q_OBJECT + TQ_OBJECT public: /** *Constructor - *@p parent pointer to the parent widget + *@p tqparent pointer to the tqparent widget *@p name name for the KSWizard object */ - KSWizard( TQWidget *parent=0, const char *name=0 ); + KSWizard( TQWidget *tqparent=0, const char *name=0 ); /**Destructor */ ~KSWizard(); diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui index 398ac2fa..0a803053 100644 --- a/kstars/kstars/kswizardui.ui +++ b/kstars/kstars/kswizardui.ui @@ -1,10 +1,10 @@ KSWizardUI - + KSWizardUI - + 0 0 @@ -12,7 +12,7 @@ 492 - + WelcomePage @@ -23,7 +23,7 @@ unnamed - + Banner1 @@ -35,7 +35,7 @@ 0 - + 120 360 @@ -45,15 +45,15 @@ - + - layout11 + tqlayout11 unnamed - + textLabel1 @@ -61,9 +61,9 @@ <h3>Welcome to the KStars Setup Wizard</h3> - + - layout10 + tqlayout10 @@ -79,14 +79,14 @@ Fixed - + 20 20 - + textLabel2 @@ -95,7 +95,7 @@ <p>To get started, press the <b>Next</b> button.</p> - + WordBreak|AlignVCenter @@ -111,7 +111,7 @@ Expanding - + 20 189 @@ -122,7 +122,7 @@ - + GeoPage @@ -133,7 +133,7 @@ unnamed - + Banner2 @@ -145,7 +145,7 @@ 0 - + 120 360 @@ -155,15 +155,15 @@ - + - layout17 + tqlayout17 unnamed - + textLabel3 @@ -171,17 +171,17 @@ <h3>Choose Your Home Location</h3> - + - layout16 + tqlayout16 unnamed - + - layout15 + tqlayout15 @@ -197,22 +197,22 @@ Fixed - + 20 20 - + - layout14 + tqlayout14 unnamed - + textLabel4 @@ -225,7 +225,7 @@ country.</p> <p>Once you have selected a City, press <b>Next</b>.</p> - + WordBreak|AlignVCenter @@ -239,22 +239,22 @@ country.</p> Expanding - + 20 40 - + - layout4 + tqlayout4 unnamed - + textLabel5_3 @@ -270,7 +270,7 @@ country.</p> Filter the list by city name - + textLabel5 @@ -278,7 +278,7 @@ country.</p> City: - + textLabel5_2 @@ -314,16 +314,16 @@ country.</p> Expanding - + 20 20 - + - layout12 + tqlayout12 @@ -333,7 +333,7 @@ country.</p> LatBox - + 120 0 @@ -343,7 +343,7 @@ country.</p> Displays the latitude of the selected city - + textLabel7 @@ -351,14 +351,14 @@ country.</p> Longitude: - + textLabel7_2 Latitude: - + AlignVCenter|AlignLeft @@ -366,7 +366,7 @@ country.</p> LongBox - + 120 0 @@ -386,7 +386,7 @@ country.</p> CityListBox - + 180 0 @@ -405,7 +405,7 @@ country.</p> - + TelescopePage @@ -416,7 +416,7 @@ country.</p> unnamed - + Banner3 @@ -428,7 +428,7 @@ country.</p> 0 - + 120 360 @@ -438,15 +438,15 @@ country.</p> - + - layout18 + tqlayout18 unnamed - + textLabel1_2 @@ -454,9 +454,9 @@ country.</p> <h3>Setup Telescopes and Devices</h3> - + - layout17 + tqlayout17 @@ -472,22 +472,22 @@ country.</p> Fixed - + 20 20 - + - layout16 + tqlayout16 unnamed - + textLabel2_2 @@ -507,14 +507,14 @@ can also control telescopes remotely over the Internet. Fixed - + 20 16 - + textLabel3_2 @@ -535,16 +535,16 @@ You can always set up devices later using the <b>Devices</b> menu. Fixed - + 20 20 - + - layout15 + tqlayout15 @@ -560,7 +560,7 @@ You can always set up devices later using the <b>Devices</b> menu. Expanding - + 40 20 @@ -592,7 +592,7 @@ and other astronomical devices such as CCD cameras and focusers. Expanding - + 40 20 @@ -611,7 +611,7 @@ and other astronomical devices such as CCD cameras and focusers. Expanding - + 20 117 @@ -626,7 +626,7 @@ and other astronomical devices such as CCD cameras and focusers. - + DownLoadPage @@ -637,7 +637,7 @@ and other astronomical devices such as CCD cameras and focusers. unnamed - + Banner4 @@ -649,7 +649,7 @@ and other astronomical devices such as CCD cameras and focusers. 0 - + 120 360 @@ -659,15 +659,15 @@ and other astronomical devices such as CCD cameras and focusers. - + - layout19 + tqlayout19 unnamed - + textLabel2_3 @@ -675,9 +675,9 @@ and other astronomical devices such as CCD cameras and focusers. <h3>Download Extra Data Files</h3> - + - layout18 + tqlayout18 @@ -693,22 +693,22 @@ and other astronomical devices such as CCD cameras and focusers. Fixed - + 20 20 - + - layout17 + tqlayout17 unnamed - + textLabel1_3 @@ -721,7 +721,7 @@ button to proceed. </p> <p>You can also use this tool later, by selecting <b>Download data</b> from the <b>File</b> menu.</p> - + WordBreak|AlignTop @@ -735,16 +735,16 @@ button to proceed. </p> Expanding - + 20 30 - + - layout13 + tqlayout13 @@ -760,7 +760,7 @@ button to proceed. </p> Expanding - + 40 20 @@ -785,7 +785,7 @@ button to proceed. </p> Expanding - + 40 20 @@ -804,7 +804,7 @@ button to proceed. </p> Expanding - + 20 90 @@ -843,7 +843,7 @@ button to proceed. </p> 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000041d49444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d09a6c508138cb8c13d647141163de49043bca9f1628eb9294810f24f88c15b728b07617358888785d980427290b4a8d00b19a8821da8228cf42316ac87eed9247ac95c9aeaeef9eaabdffb5ebf85f178ccfcf7f5b79fec07a7280a08a008f25ceb7c29e5da573716e65a0be3f198ef6f5ededff9b9e1b34faf90882092a1ea21428b9220ffbf46054055b19386ba6970ae6665b5e0d2c5eb0b066067bbe1f21757c88f5504eff0c192189081303a5582b16854fccce2fe041f00cdd0a8103b874556405476b62d972ec2c2b90ff3fd8df5cb946549d80b34aea15ccaa94625450e2d0e558b460b7371a734b5e027251a155545678ab62d7eea90b4c504078908c107acb354cb251b1f8f08b1c18631aabbb4d18211404804f22545863561d2f060fb34aa8a18d0086204e72c46a32292e1a796f278c1da7a859d8da9a737506db04d0a24103d8949480b214d3bbee952a05c1d536f9d2684160c744f048311543d459eb1b65ee1754cedae13a64abd5d6127053c9d0281f22d4f75c6a2118a5c09272d7ab740638bf4ef2dd2174032d0d8d04c6fe19c32bedd8bc65e342aa3f785e2784bfd6bc1bd9db24b05505616a4edd67d5a8c1801a03a9962754c504bf34b8986acfb9be91cac7d54315a15541b36b134f74bd2dc53940115a5381e087bc25c6f71be831a8baa234cc1ee3eeb74ed83116beb2b8849d108a3730e8ce27e2bfb82419a7b407ac7c222fd0e6280a8078ce64e47ef54ac9d5be9aaae0162e0de568a44a18d3df90845d919c4f01463406340a44f40efb43a99b371618488e2670d1a2d7ee6f1d3be39342104e937ed85fb86599c33e9ee0be9a004946259d8b858909880d59aa00daa0d3280b5f39e34074c4b3a5434029a76a9e9f5cc0163b5c80024158a1cfc4cb1d3061d5834066cb0a403c008599a70f6bc27b8d03106ea3ae91987278c5b143b015547224ab5e24185cd9b81665273e7b6e7cecd82ddbf8098002de94049737bc09828cf3036f31c3735c8b0e98eb704672f348c7f7c93cd1fb2ae905119ff54e0dff3542b0e9dd983dcea2cc5eea6cf303e74ec687af5c41b6fa38f5e203c7ec8e1238ef85831a214afef21060ea781ec68247b65c6916353cc8b73d1ae79354606af2a930709aa118da1636c274dd7e3774b884a79aa6b5711a538d33cf9c01c1c9b83bc6a1f55c91ccb23b05b1deb43a7decdaffefd2862f61366aa8449c69e33642f012f2bb208fa98eeda1f3346f076c8eeef19475e9be115423364f78f84105a8643d34d90cfbfdcd8cf872589a45dc7f54cf3134a36f4e495c23f9da8db15bccb708d4014f2ca512cb5d4f7c13e84300d5cff6eb39b202bab053bdb9674f0648609427d0f8402ddeac30f4fcd3ced3efc3b422d406c09b340bedc1571e1bfc3d44dc281634c5fe5e758e7395cfbe6d6c130fd17d92372d2cb00c6470000000049454e44ae426082 - + dmsbox.h dmsbox.h diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 8bbd34ac..cb8d6baa 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -36,10 +36,10 @@ #include "mapcanvas.h" #include "dmsbox.h" -LocationDialog::LocationDialog( TQWidget* parent ) - : KDialogBase( KDialogBase::Plain, i18n( "Set Geographic Location" ), Ok|Cancel, Ok, parent ) { +LocationDialog::LocationDialog( TQWidget* tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "Set Geographic Location" ), Ok|Cancel, Ok, tqparent ) { - KStars *p = (KStars *)parent; + KStars *p = (KStars *)tqparent; TQFrame *page = plainPage(); CityBox = new TQGroupBox( page, "CityBox" ); @@ -52,18 +52,18 @@ LocationDialog::LocationDialog( TQWidget* parent ) CityLay = new TQVBoxLayout( CityBox, 6, 4 ); //root mgr for CityBox CityLay->setSpacing( 6 ); CityLay->setMargin( 6 ); - hlay = new TQHBoxLayout( 2 ); //this layout will be added to CityLay - vlay = new TQVBoxLayout( 2 ); //this layout will be added to hlay - glay = new TQGridLayout( 3, 2, 6 ); //this layout will be added to vlay + hlay = new TQHBoxLayout( 2 ); //this tqlayout will be added to CityLay + vlay = new TQVBoxLayout( 2 ); //this tqlayout will be added to hlay + glay = new TQGridLayout( 3, 2, 6 ); //this tqlayout will be added to vlay CoordLay = new TQVBoxLayout( CoordBox, 6, 4 ); //root mgr for coordbox CoordLay->setSpacing( 6 ); CoordLay->setMargin( 6 ); - glay2 = new TQGridLayout( 3, 4, 4 ); //this layout will be added to CoordLay - hlayCoord = new TQHBoxLayout( 2 ); //this layout will be added to glay2 - hlayTZ = new TQHBoxLayout( 2 ); //this layout will be added to glay2 - hlayButtons = new TQHBoxLayout( 2 ); //this layout will be added to glay2 - hlay3 = new TQHBoxLayout( 2 ); //this layout will be added to CoordLay + glay2 = new TQGridLayout( 3, 4, 4 ); //this tqlayout will be added to CoordLay + hlayCoord = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 + hlayTZ = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 + hlayButtons = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 + hlay3 = new TQHBoxLayout( 2 ); //this tqlayout will be added to CoordLay //Create widgets CityFiltLabel = new TQLabel( CityBox ); @@ -122,7 +122,7 @@ LocationDialog::LocationDialog( TQWidget* parent ) AddCityButton = new TQPushButton( i18n ( "Add to List" ), CoordBox, "AddCityButton" ); -//Pack the widgets into the layouts +//Pack the widgets into the tqlayouts RootLay->addWidget( CityBox, 0, 0 ); RootLay->addWidget( CoordBox, 0, 0 ); @@ -217,14 +217,14 @@ LocationDialog::~LocationDialog(){ } void LocationDialog::initCityList( void ) { - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); for (GeoLocation *loc = p->data()->geoList.first(); loc; loc = p->data()->geoList.next()) { GeoBox->insertItem( loc->fullName() ); filteredCityList.append( loc ); //If TZ is not even integer value, add it to listbox - if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->findItem( KGlobal::locale()->formatNumber( loc->TZ0() ) ) ) { + if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->tqfindItem( KGlobal::locale()->formatNumber( loc->TZ0() ) ) ) { for ( unsigned int i=0; i<((unsigned int) TZBox->count()); ++i ) { if ( TZBox->text( i ).toDouble() > loc->TZ0() ) { TZBox->insertItem( KGlobal::locale()->formatNumber( loc->TZ0() ), i-1 ); @@ -252,7 +252,7 @@ void LocationDialog::initCityList( void ) { } void LocationDialog::filterCity( void ) { - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); GeoBox->clear(); filteredCityList.clear(); @@ -283,7 +283,7 @@ void LocationDialog::filterCity( void ) { if ( GeoBox->firstItem() ) // set first item in list as selected GeoBox->setCurrentItem( GeoBox->firstItem() ); - MapView->repaint(); + MapView->tqrepaint(); } void LocationDialog::changeCity( void ) { @@ -298,11 +298,11 @@ void LocationDialog::changeCity( void ) { } } - MapView->repaint(); + MapView->tqrepaint(); //Fill the fields at the bottom of the window with the selected city's data. if ( SelectedCity ) { - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); NewCityName->setText( SelectedCity->translatedName() ); NewProvinceName->setText( SelectedCity->translatedProvince() ); NewCountryName->setText( SelectedCity->translatedCountry() ); @@ -328,7 +328,7 @@ void LocationDialog::changeCity( void ) { } void LocationDialog::addCity( void ) { - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); bCityAdded = false; if ( !nameModified && !dataModified ) { @@ -417,7 +417,7 @@ void LocationDialog::addCity( void ) { } void LocationDialog::findCitiesNear( int lng, int lat ) { - KStars *ks = (KStars *)parent(); + KStars *ks = (KStars *)tqparent(); //find all cities within 3 degrees of (lng, lat); list them in GeoBox GeoBox->clear(); @@ -437,7 +437,7 @@ void LocationDialog::findCitiesNear( int lng, int lat ) { if ( GeoBox->firstItem() ) // set first item in list as selected GeoBox->setCurrentItem( GeoBox->firstItem() ); - repaint(); + tqrepaint(); } bool LocationDialog::checkLongLat( void ) { diff --git a/kstars/kstars/locationdialog.h b/kstars/kstars/locationdialog.h index 23831361..995f7f13 100644 --- a/kstars/kstars/locationdialog.h +++ b/kstars/kstars/locationdialog.h @@ -24,7 +24,7 @@ * *The top section allows the location to be selected from a database *of 2000 cities. It contains a MapCanvas (showing map of the globe - *with cities overlaid, with a handler for mouse clicks), a QListBox + *with cities overlaid, with a handler for mouse clicks), a TQListBox *containing the names of cities in the database, and three KLineEdit *widgets, which allow the user to filter the List by the name of the *City, Province, and Country. In addition, the List @@ -58,13 +58,14 @@ class dmsBox; class LocationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** - *Constructor. Create all widgets, and pack them into QLayouts. + *Constructor. Create all widgets, and pack them into TQLayouts. *Connect Signals to Slots. Run initCityList(). */ - LocationDialog( TQWidget* parent = 0 ); + LocationDialog( TQWidget* tqparent = 0 ); /** *Destructor (empty) */ @@ -72,7 +73,7 @@ public: /** *Initialize list of cities. Note that the database is not read in here, - *that is done in the KStars constructor. This simply loads the local QListBox + *that is done in the KStars constructor. This simply loads the local TQListBox *with the names of the cities from the kstarsData object. */ void initCityList( void ); @@ -116,7 +117,7 @@ public slots: void filterCity( void ); /** - *When the selected city in the TQListBox changes, repaint the MapCanvas + *When the selected city in the TQListBox changes, tqrepaint the MapCanvas *so that the crosshairs icon appears on the newly selected city. */ void changeCity( void ); diff --git a/kstars/kstars/magnitudespinbox.cpp b/kstars/kstars/magnitudespinbox.cpp index 2f4b1930..09a85def 100644 --- a/kstars/kstars/magnitudespinbox.cpp +++ b/kstars/kstars/magnitudespinbox.cpp @@ -17,13 +17,13 @@ #include "magnitudespinbox.h" -MagnitudeSpinBox::MagnitudeSpinBox( TQWidget * parent , const char * name ) - : KDoubleNumInput( 0.0, 10.0, 0.0, 0.1 /*step*/, 1 /*precision*/, parent, name) +MagnitudeSpinBox::MagnitudeSpinBox( TQWidget * tqparent , const char * name ) + : KDoubleNumInput( 0.0, 10.0, 0.0, 0.1 /*step*/, 1 /*precision*/, tqparent, name) { } MagnitudeSpinBox::MagnitudeSpinBox( double minValue, double maxValue, - TQWidget * parent , const char * name ) - : KDoubleNumInput( minValue, maxValue, minValue, 0.1 /* step */, 1, parent, name) + TQWidget * tqparent , const char * name ) + : KDoubleNumInput( minValue, maxValue, minValue, 0.1 /* step */, 1, tqparent, name) { } diff --git a/kstars/kstars/magnitudespinbox.h b/kstars/kstars/magnitudespinbox.h index c5f120c5..36017176 100644 --- a/kstars/kstars/magnitudespinbox.h +++ b/kstars/kstars/magnitudespinbox.h @@ -20,7 +20,7 @@ /**@class MagnitudeSpinBox *A special spinbox for entering magnitude values. - *This class now inherits KDoubleNumInput instead of QSpinBox + *This class now inherits KDoubleNumInput instead of TQSpinBox *@short a custom spinbox for magnitude (float) values. *@author Heiko Evermann *@version 1.0 @@ -36,11 +36,11 @@ class MagnitudeSpinBox : public KDoubleNumInput /**Default Constructor. */ - MagnitudeSpinBox( TQWidget* parent = 0, const char* name = 0); + MagnitudeSpinBox( TQWidget* tqparent = 0, const char* name = 0); /**Constructor. Set minimum and maximum values for the spinbox. */ - MagnitudeSpinBox( double minValue, double maxValue, TQWidget* parent = 0, const char* name = 0); + MagnitudeSpinBox( double minValue, double maxValue, TQWidget* tqparent = 0, const char* name = 0); }; diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp index a16acfbc..c79fc0ad 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -73,13 +73,13 @@ int main(int argc, char *argv[]) //parse filename and image format const char* format = "PNG"; TQString fname = args->getOption( "filename" ); - TQString ext = fname.mid( fname.findRev(".")+1 ); + TQString ext = fname.mid( fname.tqfindRev(".")+1 ); if ( ext.lower() == "png" ) { format = "PNG"; } else if ( ext.lower() == "jpg" || ext.lower() == "jpeg" ) { format = "JPG"; } else if ( ext.lower() == "gif" ) { format = "GIF"; } else if ( ext.lower() == "pnm" ) { format = "PNM"; } else if ( ext.lower() == "bmp" ) { format = "BMP"; } - else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).arg( fname ) << endl; } + else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).tqarg( fname ) << endl; } //parse width and height bool ok(false); @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) KStarsData *dat = new KStarsData(); TQObject::connect( dat, TQT_SIGNAL( progressText(TQString) ), dat, TQT_SLOT( slotConsoleMessage(TQString) ) ); dat->initialize(); - while (!dat->startupComplete) { kapp->processEvents(50); } + while (!dat->startupComplete) { kapp->tqprocessEvents(50); } //Set Geographic Location dat->setLocationFromOptions(); @@ -109,8 +109,8 @@ int main(int argc, char *argv[]) TQString datestring = args->getOption( "date" ); KStarsDateTime kdt; if ( ! datestring.isEmpty() ) { - if ( datestring.contains( "-" ) ) { //assume ISODate format - if ( datestring.contains( ":" ) ) { //also includes time + if ( datestring.tqcontains( "-" ) ) { //assume ISODate format + if ( datestring.tqcontains( ":" ) ) { //also includes time kdt = KStarsDateTime::fromString( datestring, Qt::ISODate ); } else { //string probably contains date only kdt.setDate( ExtDate::fromString( datestring, Qt::ISODate ) ); @@ -128,10 +128,10 @@ int main(int argc, char *argv[]) kdWarning() << " 25 Feb 1950 ; 25 Feb 1950 05:30:00" << endl; kdWarning() << i18n( "Using CPU date/time instead." ) << endl; - kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); } } else { - kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); } dat->clock()->setUTC( kdt ); @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) TQString scriptfile = args->getOption( "script" ); if ( ! scriptfile.isEmpty() ) { if ( dat->executeScript( scriptfile, map ) ) { - std::cout << i18n( "Script executed." ).utf8() << std::endl; + std::cout << i18n( "Script executed." ).utf8().data() << std::endl; } else { kdWarning() << i18n( "Could not execute script." ) << endl; } @@ -160,13 +160,13 @@ int main(int argc, char *argv[]) dat->setFullTimeUpdate(); dat->updateTime(dat->geo(), map ); - kapp->processEvents(100000); + kapp->tqprocessEvents(100000); map->setMapGeometry(); - map->exportSkyImage( &sky ); - kapp->processEvents(100000); + map->exportSkyImage( TQT_TQPAINTDEVICE(&sky) ); + kapp->tqprocessEvents(100000); - if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).arg( fname ) << endl; - else kdDebug() << i18n( "Saved to file: %1" ).arg( fname ) << endl; + if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).tqarg( fname ) << endl; + else kdDebug() << i18n( "Saved to file: %1" ).tqarg( fname ) << endl; delete map; delete dat; @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) TQString datestring = args->getOption( "date" ); if ( ! datestring.isEmpty() && ! KStarsDateTime::fromString( datestring ).isValid() ) { - kdWarning() << i18n("Specified date (%1) is invalid. Will use current CPU date instead." ).arg( datestring ) << endl; + kdWarning() << i18n("Specified date (%1) is invalid. Will use current CPU date instead." ).tqarg( datestring ) << endl; datestring = ""; } diff --git a/kstars/kstars/mapcanvas.cpp b/kstars/kstars/mapcanvas.cpp index 85dbd1ca..bc76ab02 100644 --- a/kstars/kstars/mapcanvas.cpp +++ b/kstars/kstars/mapcanvas.cpp @@ -25,14 +25,14 @@ #include "kstars.h" #include "kstarsdata.h" -MapCanvas::MapCanvas(TQWidget *parent, const char *name ) : TQWidget(parent,name) { +MapCanvas::MapCanvas(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) { BGColor = "#33A"; setBackgroundColor( TQColor( BGColor ) ); setBackgroundMode( TQWidget::NoBackground ); Canvas = new TQPixmap(); bgImage = new TQPixmap(); - LocationDialog *ld = (LocationDialog *)topLevelWidget(); - KStars *ks = (KStars *)ld->parent(); + LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + KStars *ks = (KStars *)ld->tqparent(); TQString bgFile = ks->data()->stdDirs->findResource( "data", "kstars/geomap.png" ); bgImage->load( bgFile, "PNG" ); } @@ -57,7 +57,7 @@ void MapCanvas::setGeometry( const TQRect &r ) { } void MapCanvas::mousePressEvent( TQMouseEvent *e ) { - LocationDialog *ld = (LocationDialog *)topLevelWidget(); + LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); //Determine Lat/Long corresponding to event press int lng = ( e->x() - origin.x() ); @@ -68,8 +68,8 @@ void MapCanvas::mousePressEvent( TQMouseEvent *e ) { void MapCanvas::paintEvent( TQPaintEvent * ) { TQPainter pcanvas; - LocationDialog *ld = (LocationDialog *)topLevelWidget(); - KStars *ks = (KStars *)ld->parent(); + LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + KStars *ks = (KStars *)ld->tqparent(); //prepare the canvas pcanvas.begin( Canvas ); diff --git a/kstars/kstars/mapcanvas.h b/kstars/kstars/mapcanvas.h index b32098b2..66402408 100644 --- a/kstars/kstars/mapcanvas.h +++ b/kstars/kstars/mapcanvas.h @@ -38,18 +38,19 @@ class TQPixmap; class MapCanvas : public TQWidget { Q_OBJECT + TQ_OBJECT public: /**Default constructor. Initialize the widget: create pixmaps, load the *world map bitmap, set pointers to the main window and the - *LocationDialog parent. + *LocationDialog tqparent. */ - MapCanvas(TQWidget *parent=0, const char *name=0); + MapCanvas(TQWidget *tqparent=0, const char *name=0); /**Destructor (empty) */ ~MapCanvas(); public slots: - /**Set the geometry of the map widget (overloaded from TQWidget). + /**Set the tqgeometry of the map widget (overloaded from TQWidget). *Resizes the size of the map pixmap to match the widget, and resets *the Origin TQPoint so it remains at the center of the widget. *@note this is called automatically by resize events. @@ -60,13 +61,13 @@ public slots: */ virtual void setGeometry( int x, int y, int w, int h ); - /**Set the geometry of the map widget (overloaded from TQWidget). + /**Set the tqgeometry of the map widget (overloaded from TQWidget). *Resizes the size of the map pixmap to match the widget, and resets *the Origin TQPoint so it remains at the center of the widget. *This function behaves just like the above function. It differs *only in the data type of its argument. *@note this is called automatically by resize events. - *@p r TQRect describing geometry + *@p r TQRect describing tqgeometry */ virtual void setGeometry( const TQRect &r ); diff --git a/kstars/kstars/newfovui.ui b/kstars/kstars/newfovui.ui index 4abfc4ad..69cbdaeb 100644 --- a/kstars/kstars/newfovui.ui +++ b/kstars/kstars/newfovui.ui @@ -1,10 +1,10 @@ NewFOVUI - + NewFOVUI - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout6 + tqlayout6 unnamed - + textLabel1 @@ -54,14 +54,14 @@ - + tabWidget2 0 - + tab @@ -72,23 +72,23 @@ unnamed - + - layout16 + tqlayout16 unnamed - + - layout11 + tqlayout11 unnamed - + textLabel5 @@ -96,7 +96,7 @@ Telescope focal length: - + textLabel7_2 @@ -104,7 +104,7 @@ Eyepiece focal length: - + textLabel8_2 @@ -114,17 +114,17 @@ - + - layout15 + tqlayout15 unnamed - + - layout12 + tqlayout12 @@ -143,7 +143,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a telescope eyepiece. - + textLabel6_2 @@ -158,9 +158,9 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout13 + tqlayout13 @@ -179,7 +179,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a telescope eyepiece. - + textLabel6_2_2 @@ -194,9 +194,9 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout14 + tqlayout14 @@ -215,7 +215,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a telescope eyepiece. - + textLabel6_2_2_2 @@ -244,16 +244,16 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Expanding - + 20 21 - + - layout14 + tqlayout14 @@ -269,7 +269,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Expanding - + 152 20 @@ -296,7 +296,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" - + tab @@ -333,7 +333,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" Expanding - + 180 20 @@ -350,7 +350,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" Expanding - + 20 22 @@ -367,30 +367,30 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" Expanding - + 20 22 - + - layout26 + tqlayout26 unnamed - + - layout25 + tqlayout25 unnamed - + textLabel5_2 @@ -398,7 +398,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" Telescope focal length: - + textLabel9 @@ -408,17 +408,17 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" - + - layout24 + tqlayout24 unnamed - + - layout15 + tqlayout15 @@ -437,11 +437,11 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a camera mounted on a telescope. - + textLabel6_2_3 - + 60 0 @@ -458,9 +458,9 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout16 + tqlayout16 @@ -479,7 +479,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a camera mounted on a telescope. - + textLabel6_2_3_2 @@ -500,7 +500,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + TabPage @@ -511,23 +511,23 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo unnamed - + - layout26_3 + tqlayout26_3 unnamed - + - layout25_3 + tqlayout25_3 unnamed - + textLabel5_2_3 @@ -535,7 +535,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Radiotelescope diameter: - + textLabel9_3 @@ -545,17 +545,17 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout24_3 + tqlayout24_3 unnamed - + - layout15_4 + tqlayout15_4 @@ -574,11 +574,11 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a camera mounted on a telescope. - + textLabel6_2_3_4 - + 60 0 @@ -595,9 +595,9 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout16_4 + tqlayout16_4 @@ -616,7 +616,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a camera mounted on a telescope. - + textLabel6_2_3_2_3 @@ -645,16 +645,16 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Expanding - + 21 51 - + - layout36 + tqlayout36 @@ -670,7 +670,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Expanding - + 281 21 @@ -701,15 +701,15 @@ The computed HPBW angle (in arcminutes) will be displayed in the "Field of view" - + - layout14 + tqlayout14 unnamed - + fieldoFviewLabel @@ -742,32 +742,32 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to Expanding - + 298 20 - + - layout11 + tqlayout11 unnamed - + - layout3 + tqlayout3 unnamed - + - layout2 + tqlayout2 @@ -794,7 +794,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to Select a color for the field-of-view (FOV) symbol. - + textLabel8 @@ -832,15 +832,15 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to ShapeBox - Select a shape for the field-of-view symbol + Select a tqshape for the field-of-view symbol - Select a shape for the field-of-view (FOV) symbol. The possible shapes are: + Select a tqshape for the field-of-view (FOV) symbol. The possible tqshapes are: Circle, Square, Crosshairs, Bullseye. - + textLabel7 @@ -852,15 +852,15 @@ Circle, Square, Crosshairs, Bullseye. - + - layout10 + tqlayout10 unnamed - + ViewBox @@ -872,7 +872,7 @@ Circle, Square, Crosshairs, Bullseye. 0 - + 80 80 @@ -921,7 +921,7 @@ Circle, Square, Crosshairs, Bullseye. ShapeBox ColorButton - + klineedit.h knuminput.h diff --git a/kstars/kstars/objectnamelist.cpp b/kstars/kstars/objectnamelist.cpp index b86fdac8..8a35ea0a 100644 --- a/kstars/kstars/objectnamelist.cpp +++ b/kstars/kstars/objectnamelist.cpp @@ -184,11 +184,11 @@ void ObjectNameList::remove ( const TQString &name ) { int index = getIndex(name); SortedList *l = &(list[language][index]); - SkyObjectName *son = find( name ); + SkyObjectName *son = tqfind( name ); if ( son ) l->remove( son ); } -SkyObjectName* ObjectNameList::find(const TQString &name) { +SkyObjectName* ObjectNameList::tqfind(const TQString &name) { sort(); if (name.isNull()) return 0; // find works only in one list and not in all lists diff --git a/kstars/kstars/objectnamelist.h b/kstars/kstars/objectnamelist.h index 691311ee..ea19f621 100644 --- a/kstars/kstars/objectnamelist.h +++ b/kstars/kstars/objectnamelist.h @@ -71,7 +71,7 @@ class ObjectNameList { *@return pointer to the first object in the selected list. *@param name the name to use in selecting a list. */ - SkyObjectName* first(const TQString &name = TQString::null); + SkyObjectName* first(const TQString &name = TQString()); /**Returns next object in the currently selected list. *@return pointer to the next object in the current list, or NULL if @@ -87,13 +87,13 @@ class ObjectNameList { *@param name name of object to find. *@return pointer to object with the given name */ - SkyObjectName* find(const TQString &name = TQString::null); + SkyObjectName* tqfind(const TQString &name = TQString()); /**@short remove the named object from the list. *@param name the name of the object to be removed. *@note If the object is not found, then nothing happens. */ - void remove( const TQString &name = TQString::null ); + void remove( const TQString &name = TQString() ); /**Define the language which should be used for constellation names */ @@ -118,7 +118,7 @@ class ObjectNameList { private: /**Sorts the lists with objects for faster access. - *It's needed for find(). first() and find() call this function. + *It's needed for tqfind(). first() and tqfind() call this function. */ void sort(); @@ -128,7 +128,7 @@ class ObjectNameList { *of the list itself. *@param name the name of the object whose index is to be found */ - int getIndex( const TQString &name = TQString::null ); + int getIndex( const TQString &name = TQString() ); /**Two modes are available: *allLists = loop through the whole list if next() is called diff --git a/kstars/kstars/opsadvanced.h b/kstars/kstars/opsadvanced.h index 9295e437..7475cc49 100644 --- a/kstars/kstars/opsadvanced.h +++ b/kstars/kstars/opsadvanced.h @@ -36,9 +36,10 @@ class KStars; class OpsAdvanced : public OpsAdvancedUI { Q_OBJECT + TQ_OBJECT public: - OpsAdvanced( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); + OpsAdvanced( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); ~OpsAdvanced(); private slots: diff --git a/kstars/kstars/opsadvancedui.ui b/kstars/kstars/opsadvancedui.ui index 13022545..bdb07353 100644 --- a/kstars/kstars/opsadvancedui.ui +++ b/kstars/kstars/opsadvancedui.ui @@ -1,10 +1,10 @@ OpsAdvancedUI - + OpsAdvancedUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + kcfg_UseRefraction @@ -30,10 +30,10 @@ Correct coordinates of objects for the effects of the atmosphere - The atmosphere bends light passing through it, like a lens. If this item is checked, this "atmospheric refraction" will be simulated in the sky map. Note that this correction is only applied when using the Horizontal coordinate system. + The atmosphere bends light passing through it, like a lens. If this item is checked, this "atmospheric refraction" will be simulated in the sky map. Note that this correction is only applied when using theQt::Horizontal coordinate system. - + kcfg_UseAnimatedSlewing @@ -47,7 +47,7 @@ If checked, changing the focus position will result in a visible animated "slew" to the new position. Otherwise, the display will center on the new position instantaneously. - + kcfg_UseAutoLabel @@ -61,7 +61,7 @@ If checked, a name label will be temporarily attached to an object while it is centered in the display. You can attach a more persistent label to any object using the right-click popup menu. - + kcfg_UseHoverLabel @@ -75,7 +75,7 @@ If checked, a name label will be temporarily attached to an object while it is centered in the display. You can attach a more persistent label to any object using the right-click popup menu. - + ObsListOptions @@ -86,7 +86,7 @@ unnamed - + kcfg_ObsListSymbol @@ -97,7 +97,7 @@ true - + kcfg_ObsListText @@ -117,14 +117,14 @@ Fixed - + 20 20 - + kcfg_HideOnSlew @@ -138,15 +138,15 @@ When the map is in motion, smooth animation is compromised if the program has too many objects to draw on the map; check this item to temporarily hide some of the objects while the display is in motion. - + - layout16 + tqlayout16 unnamed - + textLabelHideTimeStep @@ -175,7 +175,7 @@ Expanding - + 40 20 @@ -184,7 +184,7 @@ - + HideBox @@ -198,15 +198,15 @@ unnamed - + - layout20 + tqlayout20 unnamed - + kcfg_HideStars @@ -224,7 +224,7 @@ kcfg_MagLimitHideStar - + 40 0 @@ -240,7 +240,7 @@ Stars fainter than this will not be drawn while the map is moving. - + textLabelMag1 @@ -258,7 +258,7 @@ Expanding - + 240 20 @@ -267,15 +267,15 @@ - + - layout4 + tqlayout4 unnamed - + kcfg_HideIC @@ -289,7 +289,7 @@ If checked, then objects in the IC catalog will be hidden when the map is in motion. - + kcfg_HideMilkyWay @@ -303,7 +303,7 @@ If checked, then the Milky Way contour will be hidden when the map is in motion. - + kcfg_HidePlanets @@ -317,7 +317,7 @@ If checked, then all solar system bodies will be hidden when the map is in motion. - + kcfg_HideCBounds @@ -325,7 +325,7 @@ Constellation boundaries - + kcfg_HideMessier @@ -339,7 +339,7 @@ If checked, then objects in the Messier catalog will be hidden when the map is in motion. - + kcfg_HideGrid @@ -353,7 +353,7 @@ If checked, then the coordinate grid will be hidden when the map is in motion. - + kcfg_HideNGC @@ -367,7 +367,7 @@ If checked, then objects in the NGC catalog will be hidden when the map is in motion. - + kcfg_HideCLines @@ -381,7 +381,7 @@ If checked, then constellation lines will be hidden when the map is in motion. - + kcfg_HideCNames @@ -409,7 +409,7 @@ Expanding - + 20 16 @@ -478,7 +478,7 @@ kcfg_HideCLines kcfg_HideGrid - + timestepbox.h magnitudespinbox.h diff --git a/kstars/kstars/opscatalog.cpp b/kstars/kstars/opscatalog.cpp index 60f45aaa..c3701446 100644 --- a/kstars/kstars/opscatalog.cpp +++ b/kstars/kstars/opscatalog.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include //QCheckListItem +#include //TQCheckListItem #include #include #include @@ -82,7 +82,7 @@ OpsCatalog::~OpsCatalog() {} void OpsCatalog::updateDisplay() { //Modify display according to settings in the CatalogList - if ( sender()->name() == TQString( "CatalogList" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "CatalogList" ) ) Options::setShowDeepSky( true ); Options::setShowMessier( showMessier->isOn() ); @@ -90,7 +90,7 @@ void OpsCatalog::updateDisplay() { Options::setShowNGC( showNGC->isOn() ); Options::setShowIC( showIC->isOn() ); for ( unsigned int i=0; idata()->customCatalogs().count(); ++i ) { - TQCheckListItem *item = (TQCheckListItem*)( CatalogList->findItem( ksw->data()->customCatalogs().at(i)->name(), 0 )); + TQCheckListItem *item = (TQCheckListItem*)( CatalogList->tqfindItem( ksw->data()->customCatalogs().at(i)->name(), 0 )); Options::showCatalog()[i] = item->isOn(); } @@ -172,7 +172,7 @@ void OpsCatalog::slotRemoveCatalog() { } } - //Remove entry in the QListView + //Remove entry in the TQListView CatalogList->takeItem( CatalogList->currentItem() ); ksw->map()->forceUpdate(); diff --git a/kstars/kstars/opscatalog.h b/kstars/kstars/opscatalog.h index d57049d5..0e6701e9 100644 --- a/kstars/kstars/opscatalog.h +++ b/kstars/kstars/opscatalog.h @@ -39,9 +39,10 @@ class TQCheckListItem; class OpsCatalog : public OpsCatalogUI { Q_OBJECT + TQ_OBJECT public: - OpsCatalog( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); + OpsCatalog( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); ~OpsCatalog(); private slots: diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui index 14db7c6a..d1dcbafc 100644 --- a/kstars/kstars/opscatalogui.ui +++ b/kstars/kstars/opscatalogui.ui @@ -1,10 +1,10 @@ OpsCatalogUI - + OpsCatalogUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox1 @@ -36,7 +36,7 @@ unnamed - + kcfg_ShowStars @@ -50,9 +50,9 @@ When selected, stars are drawn in the skymap. Use the other options in this box to control how many stars are drawn. - + - layout8 + tqlayout8 @@ -74,7 +74,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMag1 @@ -82,7 +82,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj mag - + textLabelMagStarsZoomOut @@ -90,7 +90,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Faint limit zoomed out: - + textLabelMag3 @@ -114,7 +114,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMagStars @@ -132,7 +132,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 65 20 @@ -149,7 +149,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 65 20 @@ -168,22 +168,22 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 20 16 - + - layout9 + tqlayout9 unnamed - + textLabelMagStarInfo @@ -205,7 +205,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Sets the faintest <b>magnitude</b> for which name and magnitude labels may be attached to stars. Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMag2 @@ -223,7 +223,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 40 20 @@ -232,9 +232,9 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - + - layout7 + tqlayout7 @@ -250,14 +250,14 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Fixed - + 20 20 - + kcfg_ShowStarNames @@ -273,9 +273,9 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - + - layout8 + tqlayout8 @@ -291,14 +291,14 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Fixed - + 20 20 - + kcfg_ShowStarMagnitudes @@ -316,7 +316,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - + groupBox2 @@ -327,15 +327,15 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj unnamed - + - layout15 + tqlayout15 unnamed - + Show Catalog @@ -360,9 +360,9 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj The list of catalogs available, other than the star catalog. By default, the list includes the Messier, NGC and IC catalogs. You can add your own object catalogs as well. - + - layout14 + tqlayout14 @@ -423,7 +423,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 20 68 @@ -434,9 +434,9 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - + - layout8_2 + tqlayout8_2 @@ -461,7 +461,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMag1_2 @@ -469,7 +469,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj mag - + textLabelMagStarsZoomOut_2 @@ -477,7 +477,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Faint limit zoomed out: - + textLabelMag3_2 @@ -504,7 +504,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMagStars_2 @@ -522,7 +522,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 65 20 @@ -539,7 +539,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 65 20 @@ -560,7 +560,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 20 16 @@ -593,7 +593,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj 789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f - + magnitudespinbox.h magnitudespinbox.h diff --git a/kstars/kstars/opscolors.cpp b/kstars/kstars/opscolors.cpp index 8746dd00..73f6ca59 100644 --- a/kstars/kstars/opscolors.cpp +++ b/kstars/kstars/opscolors.cpp @@ -62,8 +62,8 @@ OpsColors::OpsColors( TQWidget *p, const char *name, WFlags fl ) while ( !stream.eof() ) { line = stream.readLine(); - schemeName = line.left( line.find( ':' ) ); - filename = line.mid( line.find( ':' ) +1, line.length() ); + schemeName = line.left( line.tqfind( ':' ) ); + filename = line.mid( line.tqfind( ':' ) +1, line.length() ); PresetBox->insertItem( schemeName ); PresetFileList.append( filename ); } @@ -123,7 +123,7 @@ void OpsColors::slotPreset( int index ) { TQStringList::Iterator it = PresetFileList.at( index ); bool result = setColors( *it ); if (!result) { - TQString message = i18n( "The specified color scheme file (%1) could not be found, or was corrupt." ).arg( TQString(*it) ); + TQString message = i18n( "The specified color scheme file (%1) could not be found, or was corrupt." ).tqarg( TQString(*it) ); KMessageBox::sorry( 0, message, i18n( "Could Not Set Color Scheme" ) ); } } @@ -161,15 +161,15 @@ void OpsColors::slotAddPreset() { bool okPressed = false; TQString schemename = KInputDialog::getText( i18n( "New Color Scheme" ), i18n( "Enter a name for the new color scheme:" ), - TQString::null, &okPressed, 0 ); + TQString(), &okPressed, 0 ); if ( okPressed && ! schemename.isEmpty() ) { if ( ksw->data()->colorScheme()->save( schemename ) ) { PresetBox->insertItem( schemename ); - PresetBox->setCurrentItem( PresetBox->findItem( schemename ) ); + PresetBox->setCurrentItem( PresetBox->tqfindItem( schemename ) ); TQString fname = ksw->data()->colorScheme()->fileName(); PresetFileList.append( fname ); - ksw->addColorMenuItem( schemename, TQString("cs_" + fname.left(fname.find(".colors"))).utf8() ); + ksw->addColorMenuItem( schemename, TQString("cs_" + fname.left(fname.tqfind(".colors"))).utf8() ); } } } @@ -181,7 +181,7 @@ void OpsColors::slotRemovePreset() { cdatFile.setName( locateLocal( "appdata", "colors.dat" ) ); //determine filename in local user KDE directory tree. //Remove action from color-schemes menu - ksw->removeColorMenuItem( TQString("cs_" + filename.left( filename.find(".colors"))).utf8() ); + ksw->removeColorMenuItem( TQString("cs_" + filename.left( filename.tqfind(".colors"))).utf8() ); if ( !cdatFile.exists() || !cdatFile.open( IO_ReadWrite ) ) { TQString message = i18n( "Local color scheme index file could not be opened.\nScheme cannot be removed." ); @@ -205,7 +205,7 @@ void OpsColors::slotRemovePreset() { while ( !stream.eof() ) { TQString line = stream.readLine(); - if ( line.left( line.find(':') ) != name ) slist.append( line ); + if ( line.left( line.tqfind(':') ) != name ) slist.append( line ); else removed = true; } @@ -213,7 +213,7 @@ void OpsColors::slotRemovePreset() { TQFile colorFile; colorFile.setName( locateLocal( "appdata", filename ) ); //determine filename in local user KDE directory tree. if ( !colorFile.remove() ) { - TQString message = i18n( "Could not delete the file: %1" ).arg( colorFile.name() ); + TQString message = i18n( "Could not delete the file: %1" ).tqarg( colorFile.name() ); KMessageBox::sorry( 0, message, i18n( "Error Deleting File" ) ); } @@ -224,7 +224,7 @@ void OpsColors::slotRemovePreset() { for( unsigned int i=0; i OpsColorsUI - + OpsColorsUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox5 @@ -41,15 +41,15 @@ The list of all customizable colors in the program. Next to each item is a square showing the color it is currently set to. Click on any item to change its color. - + - layout4 + tqlayout4 unnamed - + textLabel1_2 @@ -79,15 +79,15 @@ - + - layout10 + tqlayout10 unnamed - + textLabel1 @@ -111,15 +111,15 @@ - + - layout11 + tqlayout11 unnamed - + textLabel2 @@ -145,7 +145,7 @@ - + groupBox6 @@ -167,9 +167,9 @@ List of all known color schemes. Several are provided by default, and you may also define your own. - + - layout9 + tqlayout9 @@ -185,7 +185,7 @@ Expanding - + 40 20 @@ -216,7 +216,7 @@ Expanding - + 40 20 @@ -233,7 +233,7 @@ Expanding - + 40 20 @@ -250,7 +250,7 @@ Expanding - + 40 20 @@ -285,5 +285,5 @@ AddPreset RemovePreset - + diff --git a/kstars/kstars/opsguides.cpp b/kstars/kstars/opsguides.cpp index aae84244..d9bfc7c9 100644 --- a/kstars/kstars/opsguides.cpp +++ b/kstars/kstars/opsguides.cpp @@ -18,8 +18,8 @@ #include #include "opsguides.h" -OpsGuides::OpsGuides( TQWidget* parent, const char* name, WFlags fl ) - : OpsGuidesUI( parent, name, fl ) +OpsGuides::OpsGuides( TQWidget* tqparent, const char* name, WFlags fl ) + : OpsGuidesUI( tqparent, name, fl ) { connect( kcfg_ShowCNames, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotToggleConstellOptions() ) ); diff --git a/kstars/kstars/opsguides.h b/kstars/kstars/opsguides.h index deb2ff50..383f6082 100644 --- a/kstars/kstars/opsguides.h +++ b/kstars/kstars/opsguides.h @@ -22,9 +22,10 @@ class OpsGuides : public OpsGuidesUI { Q_OBJECT + TQ_OBJECT public: - OpsGuides( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + OpsGuides( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~OpsGuides(); private slots: diff --git a/kstars/kstars/opsguidesui.ui b/kstars/kstars/opsguidesui.ui index 1f8c1dca..33a366c4 100644 --- a/kstars/kstars/opsguidesui.ui +++ b/kstars/kstars/opsguidesui.ui @@ -1,10 +1,10 @@ OpsGuidesUI - + OpsGuidesUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + kcfg_ShowCLines @@ -33,7 +33,7 @@ If checked, constellation lines will be drawn on the sky map. - + kcfg_ShowCBounds @@ -41,7 +41,7 @@ Constellation &boundaries - + kcfg_ShowCNames @@ -55,7 +55,7 @@ If checked, constellation names will be drawn on the sky map. - + ConstellOptions @@ -66,7 +66,7 @@ unnamed - + kcfg_UseLatinConstellNames @@ -80,7 +80,7 @@ Select this to use Latin constellation names on the sky map - + kcfg_UseLocalConstellNames @@ -94,7 +94,7 @@ Select this to use constellation names from your locality (if available) - + kcfg_UseAbbrevConstellNames @@ -120,14 +120,14 @@ Fixed - + 20 16 - + kcfg_ShowMilkyWay @@ -141,7 +141,7 @@ If checked, a contour representing the Milky Way will be drawn on the sky map - + kcfg_FillMilkyWay @@ -165,14 +165,14 @@ Fixed - + 20 16 - + kcfg_ShowGrid @@ -186,7 +186,7 @@ If checked, a grid of lines will be drawn every 2 hours in Right Ascension and every 20 degrees in Declination. - + kcfg_ShowEquator @@ -200,7 +200,7 @@ If checked, the celestial equator will be drawn in the sky map. - + kcfg_ShowEcliptic @@ -214,7 +214,7 @@ If checked, the ecliptic will be drawn on the sky map. The ecliptic is a great circle on the sky that the Sun appears to follow over the course of one year. All other solar system bodies roughly follow the ecliptic as well. - + kcfg_ShowHorizon @@ -228,7 +228,7 @@ If checked, a line representing the local horizon will be drawn on the map. - + kcfg_ShowGround @@ -252,7 +252,7 @@ Expanding - + 20 60 @@ -261,5 +261,5 @@ - + diff --git a/kstars/kstars/opssolarsystem.cpp b/kstars/kstars/opssolarsystem.cpp index 41ee58c0..4ee0a4da 100644 --- a/kstars/kstars/opssolarsystem.cpp +++ b/kstars/kstars/opssolarsystem.cpp @@ -21,10 +21,10 @@ #include "kstars.h" #include "magnitudespinbox.h" -OpsSolarSystem::OpsSolarSystem( TQWidget *parent, const char *name, WFlags fl ) - : OpsSolarSystemUI( parent, name, fl ) +OpsSolarSystem::OpsSolarSystem( TQWidget *tqparent, const char *name, WFlags fl ) + : OpsSolarSystemUI( tqparent, name, fl ) { - ksw = (KStars *)parent; + ksw = (KStars *)tqparent; connect( kcfg_ShowAsteroids, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAsteroidWidgets(bool) ) ); connect( kcfg_ShowComets, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotCometWidgets(bool) ) ); @@ -58,7 +58,7 @@ void OpsSolarSystem::slotCometWidgets( bool on ) { void OpsSolarSystem::slotSelectPlanets() { bool b=true; - if ( sender()->name() == TQString( "showNonePlanets" ) ) b = false; + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "showNonePlanets" ) ) b = false; kcfg_ShowSun->setChecked( b ); kcfg_ShowMoon->setChecked( b ); diff --git a/kstars/kstars/opssolarsystem.h b/kstars/kstars/opssolarsystem.h index 07ce2c64..cce6d052 100644 --- a/kstars/kstars/opssolarsystem.h +++ b/kstars/kstars/opssolarsystem.h @@ -32,9 +32,10 @@ class KStars; class OpsSolarSystem : public OpsSolarSystemUI { Q_OBJECT + TQ_OBJECT public: - OpsSolarSystem( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); + OpsSolarSystem( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); ~OpsSolarSystem(); private slots: diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui index 15b58a47..5742d6d6 100644 --- a/kstars/kstars/opssolarsystemui.ui +++ b/kstars/kstars/opssolarsystemui.ui @@ -1,10 +1,10 @@ OpsSolarSystemUI - + OpsSolarSystemUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox2 @@ -30,15 +30,15 @@ unnamed - + - layout20 + tqlayout20 unnamed - + kcfg_ShowSaturn @@ -52,7 +52,7 @@ If checked, Saturn will be drawn on the map. - + kcfg_ShowPlanetImages @@ -66,7 +66,7 @@ If checked, then the planets, the Sun and the Moon will be shown as bitmap images on the map - + kcfg_ShowMars @@ -80,7 +80,7 @@ If checked, Mars will be drawn on the map. - + kcfg_ShowPlanetNames @@ -94,7 +94,7 @@ If checked, name labels will be attached to the planets, the Sun and the Moon - + kcfg_ShowPluto @@ -136,7 +136,7 @@ Press this button to unselect all planets, the Sun and the Moon so that they will not be drawn on the map - + kcfg_ShowVenus @@ -150,7 +150,7 @@ If checked, Venus will be drawn on the map. - + kcfg_ShowSun @@ -164,7 +164,7 @@ If checked, the Sun will be drawn on the map. - + kcfg_ShowJupiter @@ -178,7 +178,7 @@ If checked, Jupiter will be drawn on the map. - + kcfg_ShowMoon @@ -192,7 +192,7 @@ If checked, the Moon will be drawn on the map. - + kcfg_ShowMercury @@ -206,7 +206,7 @@ If checked, Mercury will be drawn on the map. - + kcfg_ShowNeptune @@ -230,14 +230,14 @@ Fixed - + 100 20 - + kcfg_ShowUranus @@ -263,7 +263,7 @@ Expanding - + 20 40 @@ -272,7 +272,7 @@ - + groupBox3 @@ -283,7 +283,7 @@ unnamed - + kcfg_ShowComets @@ -307,14 +307,14 @@ Fixed - + 20 16 - + textLabel3 @@ -322,7 +322,7 @@ Show asteroids brighter than - + textLabel5 @@ -330,7 +330,7 @@ mag - + textLabel4 @@ -338,7 +338,7 @@ AU - + textLabel6 @@ -346,7 +346,7 @@ mag - + kcfg_ShowAsteroids @@ -360,7 +360,7 @@ If checked, asteroids will be drawn on the map - + kcfg_ShowAsteroidNames @@ -391,7 +391,7 @@ Set the maximum distance from the Sun for a comet to have a name label, in Astronomical Units (AU). 1 AU is the distance between the Earth and the Sun, approximately 150 million km - + kcfg_ShowCometNames @@ -435,7 +435,7 @@ - + groupBox4 @@ -446,7 +446,7 @@ unnamed - + kcfg_UseAutoTrail @@ -460,15 +460,15 @@ If checked then any solar system body will have a temporary trail attached while it is centered in the display. - + - layout12 + tqlayout12 unnamed - + kcfg_FadePlanetTrails @@ -492,7 +492,7 @@ Expanding - + 40 20 @@ -569,7 +569,7 @@ kcfg_FadePlanetTrails ClearAllTrails - + knuminput.h magnitudespinbox.h diff --git a/kstars/kstars/planetcatalog.cpp b/kstars/kstars/planetcatalog.cpp index ce4b9351..3367f35c 100644 --- a/kstars/kstars/planetcatalog.cpp +++ b/kstars/kstars/planetcatalog.cpp @@ -35,7 +35,7 @@ PlanetCatalog::PlanetCatalog(KStarsData *dat) : Earth(0), Sun(0), kd(dat) { PlanetCatalog::~PlanetCatalog() { // - // do NOT delete Sun. It is also in the QList + // do NOT delete Sun. It is also in the TQList // and will be deleted automatically. // delete Earth; diff --git a/kstars/kstars/planetcatalog.h b/kstars/kstars/planetcatalog.h index 99a7b65e..0680d0c1 100644 --- a/kstars/kstars/planetcatalog.h +++ b/kstars/kstars/planetcatalog.h @@ -48,6 +48,7 @@ class dms; class PlanetCatalog : public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ @@ -77,7 +78,7 @@ class PlanetCatalog : public TQObject { /**@return pointer to the Earth. (must not be const because we call findPosition on it in KSPlanetBase::updateCoords() )*/ KSPlanet *earth() { return Earth; } - /**Compute the present Horizontal coordinates of all planets. + /**Compute the presentQt::Horizontal coordinates of all planets. *@p LST pointer to the current local sidereal time *@p lat pointer to the current geographic latitude */ diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp index 0e7c467a..74af0865 100644 --- a/kstars/kstars/simclock.cpp +++ b/kstars/kstars/simclock.cpp @@ -25,9 +25,9 @@ int SimClock::idgen = 1; int SimClock::TimerInterval = 100; //msec -SimClock::SimClock(TQObject *parent, const KStarsDateTime &when) : +SimClock::SimClock(TQObject *tqparent, const KStarsDateTime &when) : DCOPObject("clock#" + TQCString().setNum(idgen++)), - TQObject(parent), + TQObject(tqparent), tmr(this) { if (! when.isValid() ) tmr.stop(); @@ -43,7 +43,7 @@ SimClock::SimClock(TQObject *parent, const KStarsDateTime &when) : SimClock::SimClock (const SimClock &old) : DCOPObject("clock#" + TQCString().setNum(idgen++)), - TQObject(old.parent()), + TQObject(old.tqparent()), SimClockInterface(), tmr(this) { @@ -163,7 +163,7 @@ void SimClock::setUTC(const KStarsDateTime &newtime) { } kdDebug() << i18n( "Setting clock: UTC: %1 JD: %2" ) - .arg( UTC.toString() ).arg( KGlobal::locale()->formatNumber( UTC.djd() ) ) << endl; + .tqarg( UTC.toString() ).tqarg( KGlobal::locale()->formatNumber( UTC.djd() ) ) << endl; emit timeChanged(); } else { kdDebug() << i18n( "Cannot set SimClock: Invalid Date/Time." ) << endl; @@ -172,7 +172,7 @@ void SimClock::setUTC(const KStarsDateTime &newtime) { void SimClock::setScale(float s) { if (Scale != s ) { - kdDebug() << i18n( "New clock scale: %1 sec" ).arg( s ) << endl; + kdDebug() << i18n( "New clock scale: %1 sec" ).tqarg( s ) << endl; Scale = s; if (tmr.isActive()) { julianmark = UTC.djd(); diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h index d4375bdb..6bf9355c 100644 --- a/kstars/kstars/simclock.h +++ b/kstars/kstars/simclock.h @@ -32,14 +32,15 @@ class SimClock : public TQObject, public SimClockInterface { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parent parent object for the clock + * @param tqparent tqparent object for the clock * @param when the date/time to which the SimClock should be initialized in UTC */ - SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::currentDateTime() ); + SimClock(TQObject *tqparent = 0, const KStarsDateTime &when = KStarsDateTime::tqcurrentDateTime() ); /** * Constructor * @param old a SimClock to initialize from. diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp index 13a5ab45..27f72614 100644 --- a/kstars/kstars/skymap.cpp +++ b/kstars/kstars/skymap.cpp @@ -51,13 +51,13 @@ #include "starobject.h" #include "customcatalog.h" -SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) - : TQWidget (parent,name), computeSkymap(true), angularDistanceMode(false), +SkyMap::SkyMap(KStarsData *d, TQWidget *tqparent, const char *name ) + : TQWidget (tqparent,name), computeSkymap(true), angularDistanceMode(false), ksw(0), data(d), pmenu(0), sky(0), sky2(0), IBoxes(0), ClickedObject(0), FocusObject(0), TransientObject(0), starpix(0), pts(0), sp(0) { - if ( parent ) ksw = (KStars*) parent->parent(); + if ( tqparent ) ksw = (KStars*) tqparent->tqparent(); else ksw = 0; pts = new TQPointArray( 2000 ); // points for milkyway and horizon @@ -72,9 +72,9 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) setBackgroundColor( TQColor( data->colorScheme()->colorNamed( "SkyColor" ) ) ); setBackgroundMode( TQWidget::NoBackground ); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setMinimumSize( 380, 250 ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); setMouseTracking (true); //Generate MouseMove events! midMouseButtonDown = false; @@ -121,7 +121,7 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) connect( this, TQT_SIGNAL( destinationChanged() ), this, TQT_SLOT( slewFocus() ) ); //Initialize Refraction correction lookup table arrays. RefractCorr1 is for calculating - //the apparent altitude from the true altitude, and RefractCorr2 is for the reverse. + //the aptqparent altitude from the true altitude, and RefractCorr2 is for the reverse. for ( unsigned int index = 0; index <184; ++index ) { double alt = -1.75 + index*0.5; //start at -1.75 degrees to get midpoint value for each interval. @@ -925,7 +925,7 @@ void SkyMap::slewFocus( void ) { fadeTransientLabel(); forceUpdate(); - kapp->processEvents(10); //keep up with other stuff + kapp->tqprocessEvents(10); //keep up with other stuff if ( Options::useAltAz() ) { dX = destination()->az()->Degrees() - focus()->az()->Degrees(); @@ -1102,7 +1102,7 @@ SkyPoint SkyMap::dXdYToRaDec( double dx, double dy, bool useAltAz, dms *LST, con az = focus()->az()->Degrees() + deltaAz.Degrees(); alt.setRadians( asin( cosc*sinAlt0 + ( dy*sinc*cosAlt0 )/r ) ); - if ( doRefract ) alt.setD( refract( &alt, false ).Degrees() ); //find true altitude from apparent altitude + if ( doRefract ) alt.setD( refract( &alt, false ).Degrees() ); //find true altitude from aptqparent altitude az.SinCos( sinAz, cosAz ); alt.SinCos( sinAlt, cosAlt ); @@ -1141,7 +1141,7 @@ SkyPoint SkyMap::dXdYToRaDec( double dx, double dy, bool useAltAz, dms *LST, con } } -dms SkyMap::refract( const dms *alt, bool findApparent ) { +dms SkyMap::refract( const dms *alt, bool findAptqparent ) { if ( alt->Degrees() <= -2.000 ) return dms( alt->Degrees() ); int index = int( ( alt->Degrees() + 2.0 )*2. ); //RefractCorr arrays start at alt=-2.0 degrees. @@ -1152,7 +1152,7 @@ dms SkyMap::refract( const dms *alt, bool findApparent ) { return dms( alt->Degrees() ); } - if ( findApparent ) { + if ( findAptqparent ) { result.setD( alt->Degrees() + RefractCorr1[index] ); } else { result.setD( alt->Degrees() + RefractCorr2[index] ); @@ -1179,7 +1179,7 @@ void SkyMap::forceUpdate( bool now ) } computeSkymap = true; - if ( now ) repaint(); + if ( now ) tqrepaint(); else update(); } @@ -1195,7 +1195,7 @@ bool SkyMap::checkVisibility( SkyPoint *p, float FOV, double XMax ) { bool useAltAz = Options::useAltAz(); //Skip objects below the horizon if: - // + using Horizontal coords, + // + usingQt::Horizontal coords, // + the ground is drawn, // + and either of the following is true: // - focus is above the horizon @@ -1252,18 +1252,18 @@ void SkyMap::setZoomMouseCursor() p.drawLine( mx + 5, my + 5, mx + 11, my + 11 ); p.end(); -// create a mask to make parts of the pixmap invisible - TQBitmap mask (32, 32); - mask.fill (color0); // all is invisible +// create a tqmask to make parts of the pixmap invisible + TQBitmap tqmask (32, 32); + tqmask.fill (color0); // all is invisible - p.begin (&mask); + p.begin (&tqmask); // paint over the parts which should be visible p.setPen (TQPen (color1, 3)); p.drawEllipse( mx - 7, my - 7, 14, 14 ); p.drawLine( mx + 5, my + 5, mx + 12, my + 12 ); p.end(); - cursorPix.setMask (mask); // set the mask + cursorPix.setMask (tqmask); // set the tqmask TQCursor cursor (cursorPix); setCursor (cursor); } @@ -1289,11 +1289,11 @@ void SkyMap::setDefaultMouseCursor() p.drawLine (mx + 2, my - 2, mx + 8, mx - 8); p.end(); -// create a mask to make parts of the pixmap invisible - TQBitmap mask (32, 32); - mask.fill (color0); // all is invisible +// create a tqmask to make parts of the pixmap invisible + TQBitmap tqmask (32, 32); + tqmask.fill (color0); // all is invisible - p.begin (&mask); + p.begin (&tqmask); // paint over the parts which should be visible p.setPen (TQPen (color1, 3)); // 1. diagonal @@ -1304,7 +1304,7 @@ void SkyMap::setDefaultMouseCursor() p.drawLine (mx + 2, my - 2, mx + 8, mx - 8); p.end(); - cursorPix.setMask (mask); // set the mask + cursorPix.setMask (tqmask); // set the tqmask TQCursor cursor (cursorPix); setCursor (cursor); } @@ -1313,7 +1313,7 @@ void SkyMap::setMouseMoveCursor() { if (mouseButtonDown) { - setCursor (9); // cursor shape defined in qt + setCursor (9); // cursor tqshape defined in qt mouseMoveCursor = true; } } diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h index b6badd3b..1a6acf0d 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -58,12 +58,13 @@ class DeepSkyObject; class SkyMap : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** *Constructor. Read stored settings from KConfig object (focus position, *zoom factor, sky color, etc.). Run initPopupMenus(). */ - SkyMap( KStarsData *d, TQWidget *parent=0, const char *name=0); + SkyMap( KStarsData *d, TQWidget *tqparent=0, const char *name=0); /** *Destructor (empty) @@ -163,7 +164,7 @@ public: *@note setDestination() emits the destinationChanged() SIGNAL, *which triggers the TQT_SLOT function SkyMap::slewFocus(). This *function iteratively steps the Focus point toward Destination, - *repainting the sky at each step (if Options::useAnimatedSlewing()==true). + *tqrepainting the sky at each step (if Options::useAnimatedSlewing()==true). *@param f a pointer to the SkyPoint the map should slew to */ void setDestination( SkyPoint *f ); @@ -368,7 +369,7 @@ public: */ bool isAngleMode() const {return angularDistanceMode;} -/**@short update the geometry of the angle ruler +/**@short update the tqgeometry of the angle ruler */ void updateAngleRuler(); @@ -388,7 +389,7 @@ public: /**@short Draw the current Sky map to a pixmap which is to be printed or exported to a file. * *Each of the draw functions is called, with a value for the Scale parameter computed to fit the - *geometry of the TQPaintDevice. + *tqgeometry of the TQPaintDevice. *@param pd pointer to the TQPaintDevice on which to draw. *@see KStars::slotExportImage() *@see KStars::slotPrint() @@ -406,7 +407,7 @@ public slots: */ virtual void setGeometry( const TQRect &r ); -/**Recalculates the positions of objects in the sky, and then repaints the sky map. +/**Recalculates the positions of objects in the sky, and then tqrepaints the sky map. *If the positions don't need to be recalculated, use update() instead of forceUpdate(). *This saves a lot of CPU time. *@param now if true, paintEvent() is run immediately. Otherwise, it is added to the event queue @@ -427,13 +428,13 @@ public slots: *simply assigned the nearest stored value. The precaclulated values are stored in the *RefractCorr1 and RefractCorr2 arrays, and these are initialized in the SkyMap constructor. * - *There are two cases: the true altitude is known, and the apparent altitude is needed; - *or the apparent altitude is known and the true altitude is needed. + *There are two cases: the true altitude is known, and the aptqparent altitude is needed; + *or the aptqparent altitude is known and the true altitude is needed. *@param alt The input altitude - *@param findApparent if TRUE, then alt is the true altitude, and we'll find the apparent alt. + *@param findAptqparent if TRUE, then alt is the true altitude, and we'll find the aptqparent alt. *@return the corrected altitude, as a dms object. */ - dms refract( const dms *alt, bool findApparent ); + dms refract( const dms *alt, bool findAptqparent ); /**Step the Focus point toward the Destination point. Do this iteratively, redrawing the Sky *Map after each step, until the Focus point is within 1 step of the Destination point. @@ -554,7 +555,7 @@ protected: *@li +/- keys Zoom in and out *@li N/E/S/W keys Go to the cardinal points on the Horizon *@li Z Go to the Zenith - *@li Space Toggle between Horizontal and Equatorial coordinate systems + *@li Space Toggle betweenQt::Horizontal and Equatorial coordinate systems *@li 0-9 Go to a major Solar System body (0=Sun; 1-9 are the major planets, except 3=Moon) *@li [ Place starting point for measuring an angular distance *@li ] End point for Angular Distance; display measurement. @@ -622,7 +623,7 @@ private slots: */ void slotTransientLabel(); -/**Set the shape of mouse cursor to a cross with 4 arrows. */ +/**Set the tqshape of mouse cursor to a cross with 4 arrows. */ void setMouseMoveCursor(); private: @@ -776,7 +777,7 @@ private: void drawBoxes( TQPainter &p ); /**Draw symbols at the position of each Telescope currently being controlled by KStars. - *@note The shape of the Telescope symbol is currently a hard-coded bullseye. + *@note The tqshape of the Telescope symbol is currently a hard-coded bullseye. *@note there is no scale factor because this is only used for drawing onto the screen, not printing. *@param psky reference to the TQPainter on which to draw (this should be the Sky pixmap). */ @@ -824,7 +825,7 @@ private: *screen pixel coordinate offsets from the center of the Sky pixmap. *@param dx horizontal pixel offset from center of SkyMap. *@param dy vertical pixel offset from center of SkyMap. - *@param Horiz if TRUE, the SkyMap is displayed using the Horizontal coordinate system + *@param Horiz if TRUE, the SkyMap is displayed using theQt::Horizontal coordinate system *@param LSTh pointer to the local sidereal time, as a dms object. *@param lat pointer to the current geographic laitude, as a dms object *@param doRefraction if TRUE, correct for atmospheric refraction @@ -853,7 +854,7 @@ private: *exclude a large number of objects. * *Next, it determines if one of the poles of the current Coordinate System - *(Equatorial or Horizontal) is currently inside the sky map window. This is + *(Equatorial orQt::Horizontal) is currently inside the sky map window. This is *stored in the member variable 'bool SkyMap::isPoleVisible, and is set by the *function SkyMap::setMapGeometry(), which is called by SkyMap::paintEvent(). *If a Pole is visible, then it will return TRUE immediately. The idea is that @@ -900,11 +901,11 @@ private: */ double findPA( SkyObject *o, int x, int y, double scale=1.0 ); -/**@short Sets the shape of the default mouse cursor to a cross. +/**@short Sets the tqshape of the default mouse cursor to a cross. */ void setDefaultMouseCursor(); -/**@short Sets the shape of the mouse cursor to a magnifying glass. +/**@short Sets the tqshape of the mouse cursor to a magnifying glass. */ void setZoomMouseCursor(); @@ -919,7 +920,7 @@ private: bool mouseButtonDown, midMouseButtonDown; bool mouseMoveCursor; // true if mouseMoveEvent; needed by setMouseMoveCursor bool slewing, clockSlewing; - bool computeSkymap; //if false only old pixmap will repainted with bitBlt(), this saves a lot of cpu usage + bool computeSkymap; //if false only old pixmap will tqrepainted with bitBlt(), this saves a lot of cpu usage bool angularDistanceMode; int idSolInfo, idMessHST, idMoonInfo, idMoonImages, idMessInfo, idNGCHST; int scrollCount; diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp index 8b15c57a..81c575b4 100644 --- a/kstars/kstars/skymapdraw.cpp +++ b/kstars/kstars/skymapdraw.cpp @@ -166,11 +166,11 @@ void SkyMap::drawTelescopeSymbols(TQPainter &psky) { if (portConnect->state == PS_BUSY) return; - eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("EQUATORIAL_EOD_COORD"); + eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("ETQUATORIAL_EOD_COORD"); if (eqNum == NULL) { - eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("EQUATORIAL_COORD"); + eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("ETQUATORIAL_COORD"); if (eqNum == NULL) { eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("HORIZONTAL_COORD"); @@ -232,7 +232,7 @@ void SkyMap::drawTelescopeSymbols(TQPainter &psky) { { indi_sp.setRA0(raDMS); indi_sp.setDec0(decDMS); - indi_sp.apparentCoord( (double) J2000, ksw->data()->ut().djd()); + indi_sp.aptqparentCoord( (double) J2000, ksw->data()->ut().djd()); } if ( Options::useAltAz() ) indi_sp.EquatorialToHorizontal( ksw->LST(), ksw->geo()->lat() ); @@ -299,7 +299,7 @@ void SkyMap::drawMilkyWay( TQPainter& psky, double scale ) } if ( ptsCount && partVisible ) { - psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); + psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); } } else { TQPoint o = getXY( data->MilkyWay[j].at(0), Options::useAltAz(), Options::useRefraction(), scale ); @@ -871,7 +871,7 @@ void SkyMap::drawHorizon( TQPainter& psky, double scale ) double dx = 0.5*double(Width)/Options::zoomFactor(); double r0 = 2.0*sin(0.25*dms::PI); -// //Second QPointsArray for blocking the region outside the sky circle +// //Second TQPointsArray for blocking the region outside the sky circle // TQPointArray bpts( 100 ); //need 90 points along sky circle, plus 4 to complete polygon // uint bpCount(0); @@ -905,7 +905,7 @@ void SkyMap::drawHorizon( TQPainter& psky, double scale ) } //Draw the Horizon polygon - psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); + psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); //remove all items in points list for ( register unsigned int i=0; i= -1000 && o.x() <= Width+1000 && o.y() >=-1000 && o.y() <= Height+1000 ) ) { //Want to disable line-drawing if this point and the last are both outside bounds of display. - if ( ! rect().contains( o ) && ! rect().contains( cur ) ) doDrawLine = false; + if ( ! TQT_TQRECT_OBJECT(rect()).tqcontains( o ) && ! TQT_TQRECT_OBJECT(rect()).tqcontains( cur ) ) doDrawLine = false; cur = o; if ( doDrawLine ) { @@ -1859,7 +1859,7 @@ void SkyMap::exportSkyImage( const TQPaintDevice *pd ) { bool drawCBounds( Options::showCBounds() ); bool drawGrid( Options::showGrid() ); - p.begin( pd ); + p.tqbegin( const_cast(pd) ); TQPaintDeviceMetrics pdm( p.device() ); //scale image such that it fills 90% of the x or y dimension on the paint device @@ -1876,7 +1876,7 @@ void SkyMap::exportSkyImage( const TQPaintDevice *pd ) { p.setClipping( true ); //Fill background with sky color - p.fillRect( x1, y1, pdWidth, pdHeight, TQBrush( data->colorScheme()->colorNamed( "SkyColor" ) ) ); + p.fillRect( x1, y1, pdWidth, pdHeight, TQBrush( TQColor(data->colorScheme()->colorNamed( "SkyColor" ) )) ); if ( x1 || y1 ) p.translate( x1, y1 ); diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp index 26b04a5f..60e90a14 100644 --- a/kstars/kstars/skymapevents.cpp +++ b/kstars/kstars/skymapevents.cpp @@ -453,7 +453,7 @@ void SkyMap::mouseMoveEvent( TQMouseEvent *e ) { if ( ZoomRect.center().x() > 0 && ZoomRect.center().y() > 0 ) { //cancel operation if the user let go of CTRL if ( !( e->state() & ControlButton ) ) { - ZoomRect = TQRect(); //invalidate ZoomRect + ZoomRect = TQRect(); //tqinvalidate ZoomRect update(); } else { //Resize the rectangle so that it passes through the cursor position @@ -600,7 +600,7 @@ void SkyMap::mouseReleaseEvent( TQMouseEvent * ) { ksw->zoom( Options::zoomFactor() * factor ); setDefaultMouseCursor(); - ZoomRect = TQRect(); //invalidate ZoomRect + ZoomRect = TQRect(); //tqinvalidate ZoomRect forceUpdate(); } else { setDefaultMouseCursor(); @@ -629,12 +629,12 @@ void SkyMap::mouseReleaseEvent( TQMouseEvent * ) { void SkyMap::mousePressEvent( TQMouseEvent *e ) { //did we Grab an infoBox? - if ( e->button() == LeftButton && infoBoxes()->grabBox( e ) ) { + if ( e->button() == Qt::LeftButton && infoBoxes()->grabBox( e ) ) { update(); //refresh without redrawing skymap return; } - if ( (e->state() & ControlButton) && (e->button() == LeftButton) ) { + if ( (e->state() & ControlButton) && (e->button() == Qt::LeftButton) ) { ZoomRect.moveCenter( e->pos() ); setZoomMouseCursor(); update(); //refresh without redrawing skymap @@ -649,13 +649,13 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { double dy = ( 0.5*height() - e->y() )/Options::zoomFactor(); if (unusablePoint (dx, dy)) return; // break if point is unusable - if ( !midMouseButtonDown && e->button() == MidButton ) { + if ( !midMouseButtonDown && e->button() == Qt::MidButton ) { y0 = 0.5*height() - e->y(); //record y pixel coordinate for middle-button zooming midMouseButtonDown = true; } if ( !mouseButtonDown ) { - if ( e->button()==LeftButton ) { + if ( e->button()==Qt::LeftButton ) { mouseButtonDown = true; scrollCount = 0; } @@ -671,11 +671,11 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { if ( clickedObject() ) { setClickedPoint( clickedObject() ); - if ( e->button() == RightButton ) { + if ( e->button() == Qt::RightButton ) { clickedObject()->showPopupMenu( pmenu, TQCursor::pos() ); } - if ( ksw && e->button() == LeftButton ) { + if ( ksw && e->button() == Qt::LeftButton ) { ksw->statusBar()->changeItem( clickedObject()->translatedLongName(), 0 ); } } else { @@ -684,10 +684,10 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { setClickedObject( NULL ); switch (e->button()) { - case LeftButton: + case Qt::LeftButton: if ( ksw ) ksw->statusBar()->changeItem( i18n( "Empty sky" ), 0 ); break; - case RightButton: + case Qt::RightButton: { SkyObject *nullObj = new SkyObject( SkyObject::TYPE_UNKNOWN, clickedPoint()->ra()->Hours(), clickedPoint()->dec()->Degrees() ); pmenu->createEmptyMenu( nullObj ); @@ -706,7 +706,7 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { void SkyMap::mouseDoubleClickEvent( TQMouseEvent *e ) { //Was the event inside an infoBox? If so, shade the box. - if ( e->button() == LeftButton ) { + if ( e->button() == Qt::LeftButton ) { if ( infoBoxes()->shadeBox( e ) ) { update(); return; @@ -733,7 +733,7 @@ void SkyMap::paintEvent( TQPaintEvent * ) *sky2 = *sky; drawOverlays( sky2 ); bitBlt( this, 0, 0, sky2 ); - return ; // exit because the pixmap is repainted and that's all what we want + return ; // exit because the pixmap is tqrepainted and that's all what we want } TQPainter psky; @@ -754,7 +754,7 @@ void SkyMap::paintEvent( TQPaintEvent * ) bool drawGrid( Options::showGrid() && !(checkSlewing && Options::hideGrid() ) ); psky.begin( sky ); - psky.fillRect( 0, 0, width(), height(), TQBrush( data->colorScheme()->colorNamed( "SkyColor" ) ) ); + psky.fillRect( 0, 0, width(), height(), TQBrush( TQColor(data->colorScheme()->colorNamed( "SkyColor" ) )) ); if ( drawMW ) drawMilkyWay( psky ); if ( drawGrid ) drawCoordinateGrid( psky ); diff --git a/kstars/kstars/skyobject.cpp b/kstars/kstars/skyobject.cpp index 5ea5036d..18decc7c 100644 --- a/kstars/kstars/skyobject.cpp +++ b/kstars/kstars/skyobject.cpp @@ -205,7 +205,7 @@ TQTime SkyObject::transitTimeUT( const KStarsDateTime &dt, const GeoLocation *ge //dt0 is the first guess at the transit time. KStarsDateTime dt0 = dt.addSecs( dSec ); - //recompute object's position at UT0 and then find + //recompute object's position at UT0 and then tqfind //transit time of this refined position SkyPoint sp = recomputeCoords( dt0, geo ); const dms *ram = sp.ra0(); @@ -342,32 +342,32 @@ TQString SkyObject::messageFromTitle( const TQString &imageTitle ) { TQString message = imageTitle; //HST Image - if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.contains("HST") ) { - message = i18n( "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]" ).arg( longname() ); + if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.tqcontains("HST") ) { + message = i18n( "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]" ).tqarg( longname() ); //Spitzer Image - } else if ( imageTitle.contains( i18n( "Show Spitzer Image" ) ) ) { - message = i18n( "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]" ).arg( longname() ); + } else if ( imageTitle.tqcontains( i18n( "Show Spitzer Image" ) ) ) { + message = i18n( "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]" ).tqarg( longname() ); //SEDS Image } else if ( imageTitle == i18n( "Show SEDS Image" ) ) { - message = i18n( "%1: SEDS, http://www.seds.org [free for non-commercial use]" ).arg( longname() ); + message = i18n( "%1: SEDS, http://www.seds.org [free for non-commercial use]" ).tqarg( longname() ); //Kitt Peak AOP Image } else if ( imageTitle == i18n( "Show KPNO AOP Image" ) ) { - message = i18n( "%1: Advanced Observing Program at Kitt Peak National Observatory [free for non-commercial use; no physical reproductions]" ).arg( longname() ); + message = i18n( "%1: Advanced Observing Program at Kitt Peak National Observatory [free for non-commercial use; no physical reproductions]" ).tqarg( longname() ); //NOAO Image - } else if ( imageTitle.contains( i18n( "Show NOAO Image" ) ) ) { - message = i18n( "%1: National Optical Astronomy Observatories and AURA [free for non-commercial use]" ).arg( longname() ); + } else if ( imageTitle.tqcontains( i18n( "Show NOAO Image" ) ) ) { + message = i18n( "%1: National Optical Astronomy Observatories and AURA [free for non-commercial use]" ).tqarg( longname() ); //VLT Image - } else if ( imageTitle.contains( "VLT" ) ) { - message = i18n( "%1: Very Large Telescope, operated by the European Southern Observatory [free for non-commercial use; no reproductions]" ).arg( longname() ); + } else if ( imageTitle.tqcontains( "VLT" ) ) { + message = i18n( "%1: Very Large Telescope, operated by the European Southern Observatory [free for non-commercial use; no reproductions]" ).tqarg( longname() ); //All others } else if ( imageTitle.startsWith( i18n( "Show" ) ) ) { - message = imageTitle.mid( imageTitle.find( " " ) + 1 ); //eat first word, "Show" + message = imageTitle.mid( imageTitle.tqfind( " " ) + 1 ); //eat first word, "Show" message = longname() + ": " + message; } @@ -383,7 +383,7 @@ void SkyObject::saveUserLog( const TQString &newLog ) { //Do nothing if new log is the "default" message //(keep going if new log is empty; we'll want to delete its current entry) - if ( newLog == (i18n("Record here observation logs and/or data on %1.").arg(name())) || newLog.isEmpty() ) + if ( newLog == (i18n("Record here observation logs and/or data on %1.").tqarg(name())) || newLog.isEmpty() ) return; // header label @@ -408,9 +408,9 @@ void SkyObject::saveUserLog( const TQString &newLog ) { int startIndex, endIndex; TQString sub; - startIndex = logs.find(KSLabel); + startIndex = logs.tqfind(KSLabel); sub = logs.mid (startIndex); - endIndex = sub.find("[KSLogEnd]"); + endIndex = sub.tqfind("[KSLogEnd]"); logs.remove(startIndex, endIndex + 11); } diff --git a/kstars/kstars/skyobject.h b/kstars/kstars/skyobject.h index 442c8c43..2ad09ab6 100644 --- a/kstars/kstars/skyobject.h +++ b/kstars/kstars/skyobject.h @@ -29,7 +29,7 @@ /**@class SkyObject *Provides all necessary information about an object in the sky: - *its coordinates, name(s), type, magnitude, and QStringLists of + *its coordinates, name(s), type, magnitude, and TQStringLists of *URLs for images and webpages regarding the object. *@short Information about an object in the sky. *@author Jason Harris diff --git a/kstars/kstars/skyobjectname.cpp b/kstars/kstars/skyobjectname.cpp index 696803b5..c4ba6937 100644 --- a/kstars/kstars/skyobjectname.cpp +++ b/kstars/kstars/skyobjectname.cpp @@ -23,8 +23,8 @@ SkyObjectName::SkyObjectName( const TQString &str, SkyObject *obj ) { } -SkyObjectNameListItem::SkyObjectNameListItem ( TQListBox *parent, SkyObjectName *obj ) - : TQListBoxText ( parent ), object ( obj ) +SkyObjectNameListItem::SkyObjectNameListItem ( TQListBox *tqparent, SkyObjectName *obj ) + : TQListBoxText ( tqparent ), object ( obj ) { setText( obj->text() ); } diff --git a/kstars/kstars/skyobjectname.h b/kstars/kstars/skyobjectname.h index 580671c7..7e3ca979 100644 --- a/kstars/kstars/skyobjectname.h +++ b/kstars/kstars/skyobjectname.h @@ -37,7 +37,7 @@ class SkyObjectName { public: /**Constructor*/ - SkyObjectName (const TQString &str = TQString::null, SkyObject *obj = 0); + SkyObjectName (const TQString &str = TQString(), SkyObject *obj = 0); /**Destructor (empty)*/ ~SkyObjectName() {} @@ -79,7 +79,7 @@ class SkyObjectNameListItem : public TQListBoxText { public: /**Constructor */ - SkyObjectNameListItem (TQListBox *parent, SkyObjectName *name ); + SkyObjectNameListItem (TQListBox *tqparent, SkyObjectName *name ); /**Destructor (empty)*/ ~SkyObjectNameListItem() {} diff --git a/kstars/kstars/skypoint.cpp b/kstars/kstars/skypoint.cpp index c5ea55a8..2272d978 100644 --- a/kstars/kstars/skypoint.cpp +++ b/kstars/kstars/skypoint.cpp @@ -329,7 +329,7 @@ void SkyPoint::precessFromAnyEpoch(long double jd0, long double jdf){ } /** No descriptions */ -void SkyPoint::apparentCoord(long double jd0, long double jdf){ +void SkyPoint::aptqparentCoord(long double jd0, long double jdf){ precessFromAnyEpoch(jd0,jdf); @@ -589,7 +589,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "A: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -630,7 +630,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "B: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -643,7 +643,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "C: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -663,7 +663,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "D: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -676,7 +676,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "E: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } } @@ -713,7 +713,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "F: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } } else { //pdc > 0.0, so search down @@ -732,7 +732,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "G: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -745,7 +745,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "H: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } } @@ -761,7 +761,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "I: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -770,7 +770,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListname2().lower() ) { TQString r = i18n( "Constellation name (optional)", o->name().local8Bit().data() ); r = r.left(1) + r.mid(1).lower(); //lowercase letters (except first letter) - int i = r.find(" "); + int i = r.tqfind(" "); i++; if ( i>0 ) r = r.left(i) + r.mid(i,1).upper() + r.mid(i+1); //capitalize 2nd word return r; diff --git a/kstars/kstars/skypoint.h b/kstars/kstars/skypoint.h index 11ad9b26..44fa551f 100644 --- a/kstars/kstars/skypoint.h +++ b/kstars/kstars/skypoint.h @@ -29,7 +29,7 @@ * *The sky coordinates of a point in the sky. The *coordinates are stored in both Equatorial (Right Ascension, - *Declination) and Horizontal (Azimuth, Altitude) coordinate systems. + *Declination) andQt::Horizontal (Azimuth, Altitude) coordinate systems. *Provides set/get functions for each coordinate angle, and functions *to convert between the Equatorial and Horizon coordinate systems. * @@ -292,14 +292,14 @@ public: */ virtual void updateCoords( KSNumbers *num, bool includePlanets=true, const dms *lat=0, const dms *LST=0 ); -/**Computes the apparent coordinates for this SkyPoint for any epoch, +/**Computes the aptqparent coordinates for this SkyPoint for any epoch, *accounting for the effects of precession, nutation, and aberration. *Similar to updateCoords(), but the starting epoch need not be *J2000, and the target epoch need not be the present time. *@param jd0 Julian Day which identifies the original epoch *@param jdf Julian Day which identifies the final epoch */ - void apparentCoord(long double jd0, long double jdf); + void aptqparentCoord(long double jd0, long double jdf); /**Determine the effects of nutation for this SkyPoint. *@param num pointer to KSNumbers object containing current values of diff --git a/kstars/kstars/stardatasink.cpp b/kstars/kstars/stardatasink.cpp index e77b3820..e0f9f09f 100644 --- a/kstars/kstars/stardatasink.cpp +++ b/kstars/kstars/stardatasink.cpp @@ -20,8 +20,8 @@ #include "dms.h" #include "kstarsdata.h" -StarDataSink::StarDataSink(KStarsData *parent, const char *name) : TQObject(parent, name) { - ksData = parent; +StarDataSink::StarDataSink(KStarsData *tqparent, const char *name) : TQObject(tqparent, name) { + ksData = tqparent; receivedBlocks = 0; nameListCount = ksData->ObjNames.count(); } diff --git a/kstars/kstars/stardatasink.h b/kstars/kstars/stardatasink.h index 81b55d5e..57bda9e5 100644 --- a/kstars/kstars/stardatasink.h +++ b/kstars/kstars/stardatasink.h @@ -21,7 +21,7 @@ /**@class StarDataSink *StarDataSink receives data from an FileSource object and appends these data - *to a QList of star data. It's an asynchronous io class. + *to a TQList of star data. It's an asynchronous io class. *@author Thomas Kabelmann *@version 1.0 */ @@ -38,10 +38,11 @@ class StarDataSink : public TQObject, public TQDataSink { *class needs signals */ Q_OBJECT + TQ_OBJECT public: /** constructor */ - StarDataSink( KStarsData *parent, const char *name=0 ); + StarDataSink( KStarsData *tqparent, const char *name=0 ); /** destructor */ ~StarDataSink(); diff --git a/kstars/kstars/starobject.cpp b/kstars/kstars/starobject.cpp index 8e46b0db..12fb5652 100644 --- a/kstars/kstars/starobject.cpp +++ b/kstars/kstars/starobject.cpp @@ -112,7 +112,7 @@ TQString StarObject::greekLetter( bool gchar ) const { if ( code == "omi" ) gchar ? letter = TQString( TQChar(alpha +14) ) : letter = i18n("omicron"); if ( code == "pi " ) gchar ? letter = TQString( TQChar(alpha +15) ) : letter = i18n("pi"); if ( code == "rho" ) gchar ? letter = TQString( TQChar(alpha +16) ) : letter = i18n("rho"); - //there are two unicode symbols for sigma; + //there are two tqunicode symbols for sigma; //skip the first one, the second is more widely used if ( code == "sig" ) gchar ? letter = TQString( TQChar(alpha +18) ) : letter = i18n("sigma"); if ( code == "tau" ) gchar ? letter = TQString( TQChar(alpha +19) ) : letter = i18n("tau"); diff --git a/kstars/kstars/starobject.h b/kstars/kstars/starobject.h index d92fae87..db19b48c 100644 --- a/kstars/kstars/starobject.h +++ b/kstars/kstars/starobject.h @@ -206,7 +206,7 @@ class StarObject : public SkyObject { /**Show star object popup menu. Overloaded from virtual *SkyObject::showPopupMenu() *@param pmenu pointer to the KSPopupMenu object - *@param pos QPojnt holding the x,y coordinates for the menu + *@param pos TQPojnt holding the x,y coordinates for the menu */ virtual void showPopupMenu( KSPopupMenu *pmenu, TQPoint pos ) { pmenu->createStarMenu( this ); pmenu->popup( pos ); } diff --git a/kstars/kstars/starpixmap.cpp b/kstars/kstars/starpixmap.cpp index 59e21fe5..fe04bc1d 100644 --- a/kstars/kstars/starpixmap.cpp +++ b/kstars/kstars/starpixmap.cpp @@ -69,7 +69,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { if (colorIntensity < 0) colorIntensity = 0; // min TQPixmap pix (STARSIZE, STARSIZE); - TQBitmap mask (STARSIZE, STARSIZE); + TQBitmap tqmask (STARSIZE, STARSIZE); TQImage image; TQPainter p; TQMemArray starColor; @@ -87,11 +87,11 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { // background of the star if ( colorMode==1 ) // night colors (fill red, no temperature colors) - pix.fill (Qt::red); + pix.fill (TQt::red); else if ( colorMode==2 ) //star chart colors (fill black, no temperature colors) - pix.fill (Qt::black); + pix.fill (TQt::black); else - pix.fill (Qt::white); // default (white) + pix.fill (TQt::white); // default (white) for (int color = 0; color < 10; color ++) { int ic = color; @@ -104,11 +104,11 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { p.end(); } - mask.fill (Qt::color0); + tqmask.fill (TQt::color0); - p.begin (&mask); - p.setPen (TQPen ( Qt::color1, 1)); - p.setBrush( TQBrush( Qt::color1 ) ); + p.begin (&tqmask); + p.setPen (TQPen ( TQt::color1, 1)); + p.setBrush( TQBrush( TQt::color1 ) ); p.drawEllipse(0, 0, STARSIZE, STARSIZE); p.end(); @@ -117,7 +117,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { TQImage tmp = pix.convertToImage(); pix.convertFromImage( KImageEffect::blur( tmp, 100.0 ) ); - pix.setMask (mask); // set the mask + pix.setMask (tqmask); // set the tqmask image = pix.convertToImage(); // create the image for smoothScale() for (int i = 0; i < 26; i++) diff --git a/kstars/kstars/statform.ui b/kstars/kstars/statform.ui index 8287a805..23605ac5 100644 --- a/kstars/kstars/statform.ui +++ b/kstars/kstars/statform.ui @@ -1,10 +1,10 @@ statForm - + statForm - + 0 0 @@ -19,7 +19,7 @@ unnamed - + stdDevLabel @@ -35,7 +35,7 @@ true - + maxLabel @@ -51,7 +51,7 @@ true - + atMinLabel @@ -59,7 +59,7 @@ @ - + bitPixLabel @@ -75,7 +75,7 @@ true - + heightLabel @@ -91,7 +91,7 @@ true - + meanLabel @@ -107,7 +107,7 @@ true - + atMaxLabel @@ -115,7 +115,7 @@ @ - + widthLabel @@ -147,7 +147,7 @@ true - + minLabel @@ -176,5 +176,5 @@ meanOUT stddevOUT - + diff --git a/kstars/kstars/streamformui.ui b/kstars/kstars/streamformui.ui index 90d4c1b8..3c4fbcc0 100644 --- a/kstars/kstars/streamformui.ui +++ b/kstars/kstars/streamformui.ui @@ -1,10 +1,10 @@ streamForm - + streamForm - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout2 + tqlayout2 @@ -31,13 +31,13 @@ playB - + 32 32 - + 32 32 @@ -57,13 +57,13 @@ captureB - + 32 32 - + 32 32 @@ -97,7 +97,7 @@ Expanding - + 300 21 @@ -106,7 +106,7 @@ - + videoFrame @@ -119,7 +119,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 80998c07..36e991c5 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -40,7 +40,7 @@ FILE *wfp; - StreamWG::StreamWG(INDIStdDevice *inStdDev, TQWidget * parent, const char * name) : streamForm(parent, name) + StreamWG::StreamWG(INDIStdDevice *inStdDev, TQWidget * tqparent, const char * name) : streamForm(tqparent, name) { stdDev = inStdDev; @@ -90,7 +90,7 @@ void StreamWG::setColorFrame(bool color) TQString errMsg; struct sockaddr_in pin; struct hostent *serverHostName = gethostbyname(host.ascii()); - errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").arg(host).arg(port); + errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").tqarg(host).tqarg(port); memset(&pin, 0, sizeof(pin)); pin.sin_family = AF_INET; @@ -138,14 +138,14 @@ void StreamWG::setSize(int wd, int ht) streamFrame->totalBaseCount = wd * ht; - resize(wd + layout()->margin() * 2 , ht + playB->height() + layout()->margin() * 2 + layout()->spacing()); + resize(wd + tqlayout()->margin() * 2 , ht + playB->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()); streamFrame->resize(wd, ht); } void StreamWG::resizeEvent(TQResizeEvent *ev) { - streamFrame->resize(ev->size().width() - layout()->margin() * 2, ev->size().height() - playB->height() - layout()->margin() * 2 - layout()->spacing()); + streamFrame->resize(ev->size().width() - tqlayout()->margin() * 2, ev->size().height() - playB->height() - tqlayout()->margin() * 2 - tqlayout()->spacing()); } /* @@ -254,26 +254,26 @@ void StreamWG::captureImage() if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( currentFileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } } else { - TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); } } -VideoWG::VideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, Qt::WNoAutoErase) +VideoWG::VideoWG(TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase) { streamImage = NULL; - grayTable=new QRgb[256]; + grayTable=new TQRgb[256]; for (int i=0;i<256;i++) - grayTable[i]=qRgb(i,i,i); + grayTable[i]=tqRgb(i,i,i); } VideoWG::~VideoWG() diff --git a/kstars/kstars/streamwg.h b/kstars/kstars/streamwg.h index 754853e5..a4aeb907 100644 --- a/kstars/kstars/streamwg.h +++ b/kstars/kstars/streamwg.h @@ -29,9 +29,10 @@ class StreamWG : public streamForm { Q_OBJECT + TQ_OBJECT public: - StreamWG(INDIStdDevice *inStdDev, TQWidget * parent =0, const char * name =0); + StreamWG(INDIStdDevice *inStdDev, TQWidget * tqparent =0, const char * name =0); ~StreamWG(); friend class VideoWG; @@ -63,12 +64,13 @@ }; - class VideoWG : public QFrame + class VideoWG : public TQFrame { Q_OBJECT + TQ_OBJECT public: - VideoWG(TQWidget * parent =0, const char * name =0); + VideoWG(TQWidget * tqparent =0, const char * name =0); ~VideoWG(); friend class StreamWG; @@ -77,9 +79,9 @@ private: int totalBaseCount; - QRgb *grayTable; - QImage *streamImage; - QPixmap qPix; + TQRgb *grayTable; + TQImage *streamImage; + TQPixmap qPix; KPixmapIO kPixIO; protected: diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp index b2f17009..b391d213 100644 --- a/kstars/kstars/telescopeprop.cpp +++ b/kstars/kstars/telescopeprop.cpp @@ -29,11 +29,11 @@ #include "indimenu.h" #include "indidriver.h" -telescopeProp::telescopeProp(TQWidget* parent, const char* name, bool modal, WFlags fl) -: scopeProp(parent,name, modal,fl) +telescopeProp::telescopeProp(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: scopeProp(tqparent,name, modal,fl) { - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; ksw->establishINDI(); indi_driver = ksw->getINDIDriver(); @@ -213,10 +213,10 @@ void telescopeProp::updateScopeDetails(int index) versionEdit->setText(indi_driver->devices[finalIndex]->version); if (indi_driver->devices[finalIndex]->focal_length != -1) - focalEdit->setText(TQString("%1").arg(indi_driver->devices[finalIndex]->focal_length)); + focalEdit->setText(TQString("%1").tqarg(indi_driver->devices[finalIndex]->focal_length)); if (indi_driver->devices[finalIndex]->aperture != -1) - apertureEdit->setText(TQString("%1").arg(indi_driver->devices[finalIndex]->aperture)); + apertureEdit->setText(TQString("%1").tqarg(indi_driver->devices[finalIndex]->aperture)); } @@ -228,7 +228,7 @@ void telescopeProp::removeScope() index = telescopeListBox->currentItem(); finalIndex = findDeviceIndex(index); - if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove %1?").arg(indi_driver->devices[finalIndex]->label), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) + if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove %1?").tqarg(indi_driver->devices[finalIndex]->label), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) return; telescopeListBox->removeItem(index); diff --git a/kstars/kstars/telescopeprop.h b/kstars/kstars/telescopeprop.h index 3c036bdc..3bd3de66 100644 --- a/kstars/kstars/telescopeprop.h +++ b/kstars/kstars/telescopeprop.h @@ -26,9 +26,10 @@ class INDIDriver; class telescopeProp : public scopeProp { Q_OBJECT + TQ_OBJECT public: - telescopeProp(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + telescopeProp(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~telescopeProp(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui index cea9e20d..7212fffd 100644 --- a/kstars/kstars/telescopepropui.ui +++ b/kstars/kstars/telescopepropui.ui @@ -1,10 +1,10 @@ scopeProp - + scopeProp - + 0 0 @@ -22,7 +22,7 @@ unnamed - + textLabel1 @@ -30,9 +30,9 @@ Telescopes: - + - layout12 + tqlayout12 @@ -72,7 +72,7 @@ Expanding - + 236 20 @@ -101,22 +101,22 @@ 0 - + 130 0 - + - layout8 + tqlayout8 unnamed - + textLabel2 @@ -124,7 +124,7 @@ Driver: - + textLabel2_2_6 @@ -132,7 +132,7 @@ Version: - + textLabel2_2 @@ -140,7 +140,7 @@ Label: - + textLabel2_2_2 @@ -148,7 +148,7 @@ Focal length: - + textLabel2_2_3 @@ -158,9 +158,9 @@ - + - layout9 + tqlayout9 @@ -184,9 +184,9 @@ labelEdit - + - layout5 + tqlayout5 @@ -197,7 +197,7 @@ focalEdit - + textLabel2_2_4 @@ -207,9 +207,9 @@ - + - layout6 + tqlayout6 @@ -220,7 +220,7 @@ apertureEdit - + textLabel2_2_5 @@ -242,7 +242,7 @@ Expanding - + 21 190 @@ -251,7 +251,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui index 8f055960..91ad458f 100644 --- a/kstars/kstars/telescopewizard.ui +++ b/kstars/kstars/telescopewizard.ui @@ -1,10 +1,10 @@ telescopeWizard - + telescopeWizard - + 0 1 @@ -20,13 +20,13 @@ 0 - + 500 300 - + 800 300 @@ -42,9 +42,9 @@ unnamed - + - layout12 + tqlayout12 @@ -53,7 +53,7 @@ 10 - + helpB @@ -74,14 +74,14 @@ Expanding - + 56 11 - + backB @@ -89,7 +89,7 @@ &Back - + nextB @@ -105,11 +105,11 @@ - + wizardContainer - + introPage @@ -120,7 +120,7 @@ unnamed - + intoPageLabel @@ -141,13 +141,13 @@ This Wizard will help you to connect to your telescope and control it from KStar <br><br> Please click next to continue. - + WordBreak|AlignVCenter - + modelPage @@ -158,7 +158,7 @@ Please click next to continue. unnamed - + modelPageLabel @@ -167,7 +167,7 @@ Please click next to continue. Please select your telescope model from the list below. Click next after selecting a model. - + WordBreak|AlignTop @@ -181,22 +181,22 @@ Please select your telescope model from the list below. Click next after selecti Expanding - + 20 25 - + - layout10 + tqlayout10 unnamed - + telescopeCombo @@ -211,7 +211,7 @@ Please select your telescope model from the list below. Click next after selecti Minimum - + 196 16 @@ -230,14 +230,14 @@ Please select your telescope model from the list below. Click next after selecti Expanding - + 20 25 - + textLabel1 @@ -248,7 +248,7 @@ Please select your telescope model from the list below. Click next after selecti - + telescopePage @@ -259,7 +259,7 @@ Please select your telescope model from the list below. Click next after selecti unnamed - + telescopePageInfo @@ -274,18 +274,18 @@ Please select your telescope model from the list below. Click next after selecti <h3>2. Align Your Telescope</h3> -You need to align your telescope before you can control it properly from KStars. Please refer to your telescope manual for alignment instructions. +You need to align your telescope before you can control it properly from KStars. Please refer to your telescope manual for tqalignment instructions. <br><br> -After a successful alignment, connect your telescope's RS232 interface to your computer's serial or USB port. +After a successful tqalignment, connect your telescope's RS232 interface to your computer's serial or USB port. <br><br><br>Click next to continue. - + WordBreak|AlignTop - + localPage @@ -296,7 +296,7 @@ After a successful alignment, connect your telescope's RS232 interface to your c unnamed - + localPageLabel @@ -306,7 +306,7 @@ After a successful alignment, connect your telescope's RS232 interface to your c Verify if the following time, date, and location settings are correct. If any of the settings are incorrect, you can correct them via the <tt>Set time</tt> and <tt>Set Location</tt> buttons. - + WordBreak|AlignTop @@ -320,46 +320,46 @@ Verify if the following time, date, and location settings are correct. If any of Expanding - + 20 20 - + - layout14 + tqlayout14 unnamed - + - layout13 + tqlayout13 unnamed - + - layout6 + tqlayout6 unnamed - + - layout2 + tqlayout2 unnamed - + timeLabel @@ -367,7 +367,7 @@ Verify if the following time, date, and location settings are correct. If any of <b>Time</b> - + timeOut @@ -382,15 +382,15 @@ Verify if the following time, date, and location settings are correct. If any of - + - layout3 + tqlayout3 unnamed - + dateLabel @@ -398,7 +398,7 @@ Verify if the following time, date, and location settings are correct. If any of <b>Date</b> - + dateOut @@ -415,15 +415,15 @@ Verify if the following time, date, and location settings are correct. If any of - + - layout4 + tqlayout4 unnamed - + locationLabel @@ -431,7 +431,7 @@ Verify if the following time, date, and location settings are correct. If any of <b>Location</b> - + locationOut @@ -448,15 +448,15 @@ Verify if the following time, date, and location settings are correct. If any of - + - layout11 + tqlayout11 unnamed - + setTimeB @@ -464,7 +464,7 @@ Verify if the following time, date, and location settings are correct. If any of Set Time... - + setLocationB @@ -486,7 +486,7 @@ Verify if the following time, date, and location settings are correct. If any of Expanding - + 20 40 @@ -495,7 +495,7 @@ Verify if the following time, date, and location settings are correct. If any of - + portPage @@ -506,7 +506,7 @@ Verify if the following time, date, and location settings are correct. If any of unnamed - + portPageLabel @@ -524,7 +524,7 @@ Verify if the following time, date, and location settings are correct. If any of Enter the port number your telescope is connected to. If you only have one serial port in your computer, the port is usually <tt>/dev/ttyS0</tt> <br><br>If you are unsure about the port number, you can leave the field empty and KStars will try to scan the ports for attached telescopes. Beware that the autoscan process might take a few minutes to complete. - + WordBreak|AlignTop @@ -538,22 +538,22 @@ Enter the port number your telescope is connected to. If you only have one seria Expanding - + 20 25 - + - layout17 + tqlayout17 unnamed - + portLabel @@ -576,7 +576,7 @@ Enter the port number your telescope is connected to. If you only have one seria Expanding - + 141 16 @@ -595,7 +595,7 @@ Enter the port number your telescope is connected to. If you only have one seria Expanding - + 20 25 @@ -605,7 +605,7 @@ Enter the port number your telescope is connected to. If you only have one seria - + wizardPix @@ -617,7 +617,7 @@ Enter the port number your telescope is connected to. If you only have one seria - + klineedit.h diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index 664a4749..4538ba14 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -40,7 +40,7 @@ #define TIMEOUT_THRESHHOLD 20 -telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* name ) : telescopeWizard(parent, name) +telescopeWizardProcess::telescopeWizardProcess( TQWidget* tqparent, const char* name ) : telescopeWizard(tqparent, name) { currentPort = -1; timeOutCount = 0; @@ -57,7 +57,7 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* na backB->hide(); currentPage = INTRO_P; - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; ksw->establishINDI(); @@ -74,11 +74,11 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* na dateOut->setText( TQString().sprintf("%d-%02d-%02d", newDate.year(), newDate.month(), newDate.day())); if (ksw->geo()->translatedProvince().isEmpty()) - locationOut->setText( TQString("%1, %2").arg(ksw->geo()->translatedName()).arg(ksw->geo()->translatedCountry())); + locationOut->setText( TQString("%1, %2").tqarg(ksw->geo()->translatedName()).tqarg(ksw->geo()->translatedCountry())); else - locationOut->setText( TQString("%1, %2, %3").arg(ksw->geo()->translatedName()) - .arg(ksw->geo()->translatedProvince()) - .arg(ksw->geo()->translatedCountry())); + locationOut->setText( TQString("%1, %2, %3").tqarg(ksw->geo()->translatedName()) + .tqarg(ksw->geo()->translatedProvince()) + .tqarg(ksw->geo()->translatedCountry())); for (unsigned int i=0; i < indidriver->devices.size(); i++) @@ -91,7 +91,7 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* na portList << "/dev/ttyS0" << "/dev/ttyS1" << "/dev/ttyS2" << "/dev/ttyS3" << "/dev/ttyS4" << "/dev/ttyUSB0" << "/dev/ttyUSB1" << "/dev/ttyUSB2" << "/dev/ttyUSB3";// << "/dev/ttyUSB4"; - connect(helpB, TQT_SIGNAL(clicked()), parent, TQT_SLOT(appHelpActivated())); + connect(helpB, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(appHelpActivated())); connect(nextB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processNext())); connect(backB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processBack())); connect(setTimeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newTime())); @@ -106,7 +106,7 @@ telescopeWizardProcess::~telescopeWizardProcess() { if (progressScan) if (progressScan->wasCancelled()) - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); Options::setIndiMessages( INDIMessageBar ); @@ -211,9 +211,9 @@ void telescopeWizardProcess::newLocation() ksw->slotGeoLocator(); - locationOut->setText( TQString("%1, %2, %3").arg(ksw->geo()->translatedName()) - .arg(ksw->geo()->translatedProvince()) - .arg(ksw->geo()->translatedCountry())); + locationOut->setText( TQString("%1, %2, %3").tqarg(ksw->geo()->translatedName()) + .tqarg(ksw->geo()->translatedProvince()) + .tqarg(ksw->geo()->translatedCountry())); timeOut->setText( TQString().sprintf("%02d:%02d:%02d", ksw->data()->lt().time().hour(), ksw->data()->lt().time().minute(), ksw->data()->lt().time().second())); dateOut->setText( TQString().sprintf("%d-%02d-%02d", ksw->data()->lt().date().year(), @@ -230,14 +230,14 @@ int telescopeWizardProcess::establishLink() return (0); TQListViewItem *driverItem = NULL; - driverItem = indidriver->localListView->findItem(telescopeCombo->currentText(), 0); + driverItem = indidriver->localListView->tqfindItem(telescopeCombo->currentText(), 0); if (driverItem == NULL) return -1; // If device is already running, we need to shut it down first if (indidriver->isDeviceRunning(telescopeCombo->currentText())) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); } // Set custome label for device @@ -248,7 +248,7 @@ int telescopeWizardProcess::establishLink() // Make sure we start is locally indidriver->localR->setChecked(true); // Run it - indidriver->processDeviceStatus(0); + indidriver->processDevicetqStatus(0); if (!indidriver->isDeviceRunning(telescopeCombo->currentText())) return (3); @@ -274,7 +274,7 @@ void telescopeWizardProcess::processPort() if (timeOutCount >= TIMEOUT_THRESHHOLD) { - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); Reset(); KMessageBox::error(0, i18n("Error: connection timeout. Unable to communicate with an INDI server")); close(); @@ -335,7 +335,7 @@ void telescopeWizardProcess::scanPorts() { KMessageBox::sorry(0, i18n("Sorry. KStars failed to detect any attached telescopes, please check your settings and try again.")); linkRejected = true; - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); Reset(); return; } diff --git a/kstars/kstars/telescopewizardprocess.h b/kstars/kstars/telescopewizardprocess.h index 3e55ccfe..cd76ebb2 100644 --- a/kstars/kstars/telescopewizardprocess.h +++ b/kstars/kstars/telescopewizardprocess.h @@ -26,9 +26,10 @@ class telescopeWizardProcess : public telescopeWizard { Q_OBJECT + TQ_OBJECT public: - telescopeWizardProcess( TQWidget* parent = 0, const char* name = 0); + telescopeWizardProcess( TQWidget* tqparent = 0, const char* name = 0); ~telescopeWizardProcess(); unsigned int currentPage; diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp index 5e2301eb..a8822439 100644 --- a/kstars/kstars/thumbnaileditor.cpp +++ b/kstars/kstars/thumbnaileditor.cpp @@ -29,10 +29,10 @@ #include "thumbnaileditorui.h" #include "thumbnailpicker.h" -ThumbnailEditor::ThumbnailEditor( TQWidget *parent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n( "Edit Thumbnail Image" ), Ok|Cancel, Ok, parent, name ) +ThumbnailEditor::ThumbnailEditor( TQWidget *tqparent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n( "Edit Thumbnail Image" ), Ok|Cancel, Ok, tqparent, name ) { - tp = (ThumbnailPicker*)parent; + tp = (ThumbnailPicker*)tqparent; TQFrame *page = plainPage(); TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, 0 ); @@ -63,7 +63,7 @@ TQPixmap ThumbnailEditor::thumbnail() { void ThumbnailEditor::slotUpdateCropLabel() { TQRect *r = ui->ImageCanvas->cropRect(); ui->CropLabel->setText( i18n( "Crop region: [%1,%2 %3x%4]" ) - .arg( r->left() ).arg( r->top() ).arg( r->width() ).arg( r->height() ) ); + .tqarg( r->left() ).tqarg( r->top() ).tqarg( r->width() ).tqarg( r->height() ) ); } TQPixmap ThumbImage::croppedImage() { @@ -75,7 +75,7 @@ TQPixmap ThumbImage::croppedImage() { return result; } -ThumbImage::ThumbImage( TQWidget *parent, const char *name ) : TQLabel( parent, name ) +ThumbImage::ThumbImage( TQWidget *tqparent, const char *name ) : TQLabel( tqparent, name ) { setBackgroundMode( TQWidget::NoBackground ); bMouseButtonDown = false; @@ -130,7 +130,7 @@ void ThumbImage::paintEvent( TQPaintEvent* ) { } void ThumbImage::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == LeftButton && CropRect->contains( e->pos() ) ) { + if ( e->button() == Qt::LeftButton && CropRect->tqcontains( e->pos() ) ) { bMouseButtonDown = true; //The Anchor tells how far from the CropRect corner we clicked diff --git a/kstars/kstars/thumbnaileditor.h b/kstars/kstars/thumbnaileditor.h index 78d5134b..74300aae 100644 --- a/kstars/kstars/thumbnaileditor.h +++ b/kstars/kstars/thumbnaileditor.h @@ -25,11 +25,12 @@ class ThumbnailEditorUI; class ThumbnailPicker; class TQPoint; -class ThumbImage : public QLabel +class ThumbImage : public TQLabel { Q_OBJECT + TQ_OBJECT public: - ThumbImage( TQWidget *parent, const char *name = 0 ); + ThumbImage( TQWidget *tqparent, const char *name = 0 ); ~ThumbImage(); void setImage( TQPixmap *pm ) { Image = pm; setFixedSize( Image->width(), Image->height() ); } @@ -62,8 +63,9 @@ private: class ThumbnailEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ThumbnailEditor( TQWidget *parent, const char *name=0 ); + ThumbnailEditor( TQWidget *tqparent, const char *name=0 ); ~ThumbnailEditor(); TQPixmap thumbnail(); diff --git a/kstars/kstars/thumbnaileditorui.ui b/kstars/kstars/thumbnaileditorui.ui index 81675a98..532b4fa3 100644 --- a/kstars/kstars/thumbnaileditorui.ui +++ b/kstars/kstars/thumbnaileditorui.ui @@ -1,10 +1,10 @@ ThumbnailEditorUI - + ThumbnailEditorUI - + 0 0 @@ -35,7 +35,7 @@ - + CropLabel @@ -48,11 +48,11 @@ Crop region: [0,0 200 x 200] - + AlignCenter - + MessageLabel @@ -65,7 +65,7 @@ (crop region will be scaled to 200x200) - + AlignCenter @@ -94,5 +94,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082 - + diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index c9460480..e8544b6b 100644 --- a/kstars/kstars/thumbnailpicker.cpp +++ b/kstars/kstars/thumbnailpicker.cpp @@ -43,9 +43,9 @@ #include "detaildialog.h" #include "skyobject.h" -ThumbnailPicker::ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *parent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n( "Choose Thumbnail Image" ), Ok|Cancel, Ok, parent, name ), - SelectedImageIndex(-1), dd((DetailDialog*)parent), Object(o), bImageFound( false ) +ThumbnailPicker::ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *tqparent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n( "Choose Thumbnail Image" ), Ok|Cancel, Ok, tqparent, name ), + SelectedImageIndex(-1), dd((DetailDialog*)tqparent), Object(o), bImageFound( false ) { Image = new TQPixmap( current ); ImageRect = new TQRect( 0, 0, 200, 200 ); @@ -85,9 +85,9 @@ void ThumbnailPicker::slotFillList() { //Query Google Image Search: KURL gURL( "http://images.google.com/images" ); //Search for the primary name, or longname and primary name - TQString sName = TQString("\"%1\"").arg( Object->name() ); + TQString sName = TQString("\"%1\"").tqarg( Object->name() ); if ( Object->longname() != Object->name() ) { - sName = TQString("\"%1\" ").arg( Object->longname() ) + sName; + sName = TQString("\"%1\" ").tqarg( Object->longname() ) + sName; } gURL.addQueryItem( "q", sName ); //add the Google-image query string @@ -141,14 +141,14 @@ void ThumbnailPicker::parseGooglePage( TQStringList &ImList, TQString URL ) { return; } - int index = PageHTML.find( "?imgurl=", 0 ); + int index = PageHTML.tqfind( "?imgurl=", 0 ); while ( index >= 0 ) { index += 8; //move to end of "?imgurl=" marker //Image URL is everything from index to next occurence of "&" - ImList.append( PageHTML.mid( index, PageHTML.find( "&", index ) - index ) ); + ImList.append( PageHTML.mid( index, PageHTML.tqfind( "&", index ) - index ) ); - index = PageHTML.find( "?imgurl=", index ); + index = PageHTML.tqfind( "?imgurl=", index ); } } @@ -176,7 +176,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) { //Add image to list //If image is taller than desktop, rescale it. - //I tried to use kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) + //I tried to use kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight ) //for the titlebar height, but this returned zero. //Hard-coding 25 instead :( if ( tmp.exists() ) { @@ -195,7 +195,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) { // this returns zero... // //DEBUG -// kdDebug() << "Title bar height: " << kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl; +// kdDebug() << "Title bar height: " << kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight ) << endl; if ( h > hDesk ) im = im.smoothScale( w*hDesk/h, hDesk ); @@ -313,7 +313,7 @@ void ThumbnailPicker::slotSetFromURL() { if ( im.isNull() ) { KMessageBox::sorry( 0, - i18n("Failed to load image at %1").arg( localFile.name() ), + i18n("Failed to load image at %1").tqarg( localFile.name() ), i18n("Failed to Load Image") ); return; } diff --git a/kstars/kstars/thumbnailpicker.h b/kstars/kstars/thumbnailpicker.h index 8cd52b99..26e82bda 100644 --- a/kstars/kstars/thumbnailpicker.h +++ b/kstars/kstars/thumbnailpicker.h @@ -37,8 +37,9 @@ class SkyObject; class ThumbnailPicker : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *parent=0, const char *name=0 ); + ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *tqparent=0, const char *name=0 ); ~ThumbnailPicker(); TQPixmap* image() { return Image; } diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui index b5ffd200..fb534086 100644 --- a/kstars/kstars/thumbnailpickerui.ui +++ b/kstars/kstars/thumbnailpickerui.ui @@ -1,10 +1,10 @@ ThumbnailPickerUI - + ThumbnailPickerUI - + 0 0 @@ -22,23 +22,23 @@ 4 - + - layout9 + tqlayout9 unnamed - + - layout8 + tqlayout8 unnamed - + SearchLabel @@ -56,7 +56,7 @@ Expanding - + 40 20 @@ -80,14 +80,14 @@ ImageList - + 300 0 - + textLabel3 @@ -108,17 +108,17 @@ - + - layout10 + tqlayout10 unnamed - + - layout9 + tqlayout9 @@ -134,22 +134,22 @@ Expanding - + 53 20 - + - layout8 + tqlayout8 unnamed - + textLabel1 @@ -157,7 +157,7 @@ Current thumbnail: - + CurrentImage @@ -169,13 +169,13 @@ 0 - + 200 200 - + 200 200 @@ -200,7 +200,7 @@ Expanding - + 53 20 @@ -209,9 +209,9 @@ - + - layout3 + tqlayout3 @@ -227,16 +227,16 @@ Expanding - + 40 20 - + - layout2 + tqlayout2 @@ -270,7 +270,7 @@ Expanding - + 40 20 @@ -289,7 +289,7 @@ Expanding - + 20 233 @@ -302,7 +302,7 @@ - + kprogress.h klistbox.h diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp index 5040cf1f..5f6040f0 100644 --- a/kstars/kstars/timebox.cpp +++ b/kstars/kstars/timebox.cpp @@ -17,14 +17,14 @@ #include "timebox.h" #include "libkdeedu/extdate/extdatetime.h" -#include //needed for QTime +#include //needed for TQTime #include #include #include #include #include -timeBox::timeBox(TQWidget *parent, const char *name, bool tt) : TQLineEdit(parent,name) +timeBox::timeBox(TQWidget *tqparent, const char *name, bool tt) : TQLineEdit(tqparent,name) { if (tt) { @@ -91,7 +91,7 @@ TQTime timeBox::createTime ( bool *ok ) TQStringList fields; //check for colon-delimiters or space-delimiters - if ( entry.contains(':') ) + if ( entry.tqcontains(':') ) fields = TQStringList::split( ':', entry ); else fields = TQStringList::split( " ", entry ); @@ -102,8 +102,8 @@ TQTime timeBox::createTime ( bool *ok ) if ( fields.count() == 2 ) { double mx = fields[1].toDouble( &checkValue ); if ( checkValue ) { - fields[1] = TQString("%1").arg( int(mx) ); - fields.append( TQString("%1").arg( int( 60.0*(mx - int(mx)) ) ) ); + fields[1] = TQString("%1").tqarg( int(mx) ); + fields.append( TQString("%1").tqarg( int( 60.0*(mx - int(mx)) ) ) ); } else { fields.append( TQString( "0" ) ); } @@ -113,9 +113,9 @@ TQTime timeBox::createTime ( bool *ok ) // ignore all after 3rd field if ( fields.count() >= 3 ) { - fields[0].replace( TQRegExp("h"), "" ); - fields[1].replace( TQRegExp("m"), "" ); - fields[2].replace( TQRegExp("s"), "" ); + fields[0].tqreplace( TQRegExp("h"), "" ); + fields[1].tqreplace( TQRegExp("m"), "" ); + fields[2].tqreplace( TQRegExp("s"), "" ); } //See if first two fields parse as integers. // @@ -141,7 +141,7 @@ TQTime timeBox::createTime ( bool *ok ) } // if ( !valueFound ) -// KMessageBox::sorry( 0, errMsg.arg( "Angle" ), i18n( "Could Not Set Value" ) ); +// KMessageBox::sorry( 0, errMsg.tqarg( "Angle" ), i18n( "Could Not Set Value" ) ); return qt; @@ -159,9 +159,9 @@ ExtDate timeBox::createDate (bool */*ok*/) if ( !date.isValid() ) { kdDebug() << k_funcinfo << "Invalid date" << endl; - showDate(ExtDate::currentDate()); + showDate(ExtDate::tqcurrentDate()); entry = text().stripWhiteSpace(); - return ExtDate::currentDate(); + return ExtDate::tqcurrentDate(); } else { return date; } diff --git a/kstars/kstars/timebox.h b/kstars/kstars/timebox.h index 1f3f8b6d..297b89aa 100644 --- a/kstars/kstars/timebox.h +++ b/kstars/kstars/timebox.h @@ -29,7 +29,7 @@ class ExtDate; * This class creates a TQHBox with 3 TQLineEdit Fields which will contain * either Time (Hour, Minute, Second) or Date (Day, Month, Year). * - * Inherits QHBox + * Inherits TQHBox *@author Pablo de Vicente *@version 1.0 */ @@ -38,12 +38,12 @@ class timeBox : public TQLineEdit { public: /** * Constructor for the timeBox object. - * @param parent is the parent QWidget + * @param tqparent is the tqparent TQWidget * @param n name is the name of the object * @param tt boolean. true means that the object will hold a Time. * false means that the object will hold a Date. */ - timeBox(TQWidget *parent, const char *n, bool tt=TRUE); + timeBox(TQWidget *tqparent, const char *n, bool tt=TRUE); ~timeBox(); diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index f4d1449f..7a64b5b2 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -29,14 +29,14 @@ #include "simclock.h" #include "libkdeedu/extdate/extdatepicker.h" -TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) - : KDialogBase( KDialogBase::Plain, i18n( "set clock to a new time", "Set Time" ), Ok|Cancel, Ok, parent ) +TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "set clock to a new time", "Set Time" ), Ok|Cancel, Ok, tqparent ) { - ksw = (KStars*) parent; + ksw = (KStars*) tqparent; TQFrame *page = plainPage(); vlay = new TQVBoxLayout( page, 2, 2 ); - hlay = new TQHBoxLayout( 2 ); //this layout will be added to the VLayout + hlay = new TQHBoxLayout( 2 ); //this tqlayout will be added to the VLayout dPicker = new ExtDatePicker( page ); dPicker->setDate( now.date() ); @@ -112,7 +112,7 @@ void TimeDialog::keyReleaseEvent( TQKeyEvent *kev ) { void TimeDialog::setNow( void ) { - KStarsDateTime dt( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); dPicker->setDate( dt.date() ); TQTime t = dt.time(); diff --git a/kstars/kstars/timedialog.h b/kstars/kstars/timedialog.h index e0f1a30e..f18e4d3b 100644 --- a/kstars/kstars/timedialog.h +++ b/kstars/kstars/timedialog.h @@ -33,8 +33,8 @@ class KStars; /**@class TimeDialog *A class for adjusting the Time and Date. Contains a ExtDatePicker widget - *for selecting the date, and three QSpinBoxes for selecting the Hour, - *Minute and Second. There is also a "Now" QPushbutton for selecting the + *for selecting the date, and three TQSpinBoxes for selecting the Hour, + *Minute and Second. There is also a "Now" TQPushbutton for selecting the *Time and Date from the system clock. *@short Dialog for adjusting the Time and Date. *@author Jason Harris @@ -43,12 +43,13 @@ class KStars; class TimeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** - *Constructor. Creates widgets and packs them into QLayouts. + *Constructor. Creates widgets and packs them into TQLayouts. *Connects Signals and Slots. */ - TimeDialog( const KStarsDateTime &now, TQWidget* parent = 0 ); + TimeDialog( const KStarsDateTime &now, TQWidget* tqparent = 0 ); /** *Destructor (empty) diff --git a/kstars/kstars/timespinbox.cpp b/kstars/kstars/timespinbox.cpp index 72549f9b..828e0330 100644 --- a/kstars/kstars/timespinbox.cpp +++ b/kstars/kstars/timespinbox.cpp @@ -37,8 +37,8 @@ #define SIDEREAL_YEAR 31558149.77 #define TROPICAL_YEAR 31556925.19 -TimeSpinBox::TimeSpinBox( TQWidget *parent, const char *name, bool _daysonly ) - : TQSpinBox ( -41, 41, 1 /* step */, parent, name ) +TimeSpinBox::TimeSpinBox( TQWidget *tqparent, const char *name, bool _daysonly ) + : TQSpinBox ( -41, 41, 1 /* step */, tqparent, name ) { setValidator( 0 ); setButtonSymbols( TQSpinBox::PlusMinus ); diff --git a/kstars/kstars/timespinbox.h b/kstars/kstars/timespinbox.h index 16c23fb5..46d82a1a 100644 --- a/kstars/kstars/timespinbox.h +++ b/kstars/kstars/timespinbox.h @@ -30,21 +30,22 @@ class TimeSpinBox : public TQSpinBox { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - TimeSpinBox( TQWidget *parent, const char* name=0, bool daysOnly = false ); + TimeSpinBox( TQWidget *tqparent, const char* name=0, bool daysOnly = false ); /**Destructor (empty)*/ ~TimeSpinBox() {} /**Convert the internal value to a display string. - *@note reimplemented from QSpinBox + *@note reimplemented from TQSpinBox *@p value the internal value to convert to a display string *@return the display string */ virtual TQString mapValueToText( int value ); /**Convert the displayed string to an internal value. - *@note reimplemented from QSpinBox + *@note reimplemented from TQSpinBox *@p ok bool pointer set to TRUE if conversion was successful *@return internal value converted from displayed text */ diff --git a/kstars/kstars/timestepbox.cpp b/kstars/kstars/timestepbox.cpp index 6b661592..ff956136 100644 --- a/kstars/kstars/timestepbox.cpp +++ b/kstars/kstars/timestepbox.cpp @@ -23,8 +23,8 @@ #include "timestepbox.h" -TimeStepBox::TimeStepBox( TQWidget *parent, const char* name, bool daysonly ) - : TQFrame( parent, name ) { +TimeStepBox::TimeStepBox( TQWidget *tqparent, const char* name, bool daysonly ) + : TQFrame( tqparent, name ) { timeBox = new TimeSpinBox( this, "timebox", daysonly ); unitBox = new TimeUnitBox( this, "unitbox", daysonly ); diff --git a/kstars/kstars/timestepbox.h b/kstars/kstars/timestepbox.h index c1bc8fc2..b335ee0d 100644 --- a/kstars/kstars/timestepbox.h +++ b/kstars/kstars/timestepbox.h @@ -35,9 +35,10 @@ class TimeStepBox : public TQFrame { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - TimeStepBox( TQWidget *parent=0, const char* name=0, bool daysonly=false ); + TimeStepBox( TQWidget *tqparent=0, const char* name=0, bool daysonly=false ); /**Destructor. (empty)*/ ~TimeStepBox() {} diff --git a/kstars/kstars/timeunitbox.cpp b/kstars/kstars/timeunitbox.cpp index 0b89f057..49cb9eac 100644 --- a/kstars/kstars/timeunitbox.cpp +++ b/kstars/kstars/timeunitbox.cpp @@ -22,8 +22,8 @@ #include -TimeUnitBox::TimeUnitBox(TQWidget *parent, const char *name, bool daysonly ) - : TQVBox( parent, name ) { +TimeUnitBox::TimeUnitBox(TQWidget *tqparent, const char *name, bool daysonly ) + : TQVBox( tqparent, name ) { UpButton = new TQPushButton( "+", this ); UpButton->setMaximumWidth( 22 ); diff --git a/kstars/kstars/timeunitbox.h b/kstars/kstars/timeunitbox.h index 9e190b7b..9926338f 100644 --- a/kstars/kstars/timeunitbox.h +++ b/kstars/kstars/timeunitbox.h @@ -45,9 +45,10 @@ class TQPushButton; class TimeUnitBox : public TQVBox { Q_OBJECT + TQ_OBJECT public: /**Constructor*/ - TimeUnitBox(TQWidget *parent=0, const char *name=0, bool daysonly = false); + TimeUnitBox(TQWidget *tqparent=0, const char *name=0, bool daysonly = false); /**Destructor (empty)*/ ~TimeUnitBox(); /**@return the value of UnitStep for the current spinbox value() */ diff --git a/kstars/kstars/timezonerule.cpp b/kstars/kstars/timezonerule.cpp index 0a711f57..1d66d32c 100644 --- a/kstars/kstars/timezonerule.cpp +++ b/kstars/kstars/timezonerule.cpp @@ -168,7 +168,7 @@ int TimeZoneRule::findStartDay( const KStarsDateTime &d ) { return test.day(); } -int TimeZoneRule::findRevertDay( const KStarsDateTime &d ) { +int TimeZoneRule::tqfindRevertDay( const KStarsDateTime &d ) { // Determine the calendar date of RevertDay for the month and year of the given date. ExtDate test; @@ -215,7 +215,7 @@ bool TimeZoneRule::isDSTActive( const KStarsDateTime &date ) { if ( day < sday ) return false; if ( day==sday && date.time() < StartTime ) return false; } else if ( month == RevertMonth ) { - int rday = findRevertDay( date ); + int rday = tqfindRevertDay( date ); if ( day > rday ) return false; if ( day==rday && date.time() > RevertTime ) return false; } @@ -239,7 +239,7 @@ void TimeZoneRule::nextDSTChange_LTime( const KStarsDateTime &date ) { if ( RevertMonth < date.date().month() ) ++y; result = KStarsDateTime( ExtDate( y, RevertMonth, 1 ), RevertTime ); - result = KStarsDateTime( ExtDate( y, RevertMonth, findRevertDay( result ) ), RevertTime ); + result = KStarsDateTime( ExtDate( y, RevertMonth, tqfindRevertDay( result ) ), RevertTime ); } else { // Next change is starting DST. @@ -284,7 +284,7 @@ void TimeZoneRule::previousDSTChange_LTime( const KStarsDateTime &date ) { if ( RevertMonth > date.date().month() ) --y; result = KStarsDateTime( ExtDate( y, RevertMonth, 1 ), RevertTime ); - result = KStarsDateTime( ExtDate( y, RevertMonth, findRevertDay( result ) ), RevertTime ); + result = KStarsDateTime( ExtDate( y, RevertMonth, tqfindRevertDay( result ) ), RevertTime ); } kdDebug() << i18n( "Previous Daylight Savings Time change (Local Time): " ) << result.toString() << endl; diff --git a/kstars/kstars/timezonerule.h b/kstars/kstars/timezonerule.h index 75ae5d2d..53ade37e 100644 --- a/kstars/kstars/timezonerule.h +++ b/kstars/kstars/timezonerule.h @@ -28,7 +28,7 @@ *The rules themselves are stored in the TZrulebook.dat file, which is read *on startup; each line in the file creates a TimeZoneRule object. * - *TimeZoneRule consists of QStrings identifying the months and days on which + *TimeZoneRule consists of TQStrings identifying the months and days on which *DST starts and ends, TQTime objects identifying the time at which the *changes occur, and a double indicating the size of the offset in hours *(probably always 1.00). @@ -158,7 +158,7 @@ private: *of the given KStarsDateTime. *@p d the date containing the year to be tested *@return the calendar date, an integer between 1 and 31. */ - int findRevertDay( const KStarsDateTime &d ); + int tqfindRevertDay( const KStarsDateTime &d ); int StartDay, RevertDay; int StartWeek, RevertWeek; diff --git a/kstars/kstars/toggleaction.cpp b/kstars/kstars/toggleaction.cpp index a0b59a64..5242f896 100644 --- a/kstars/kstars/toggleaction.cpp +++ b/kstars/kstars/toggleaction.cpp @@ -19,8 +19,8 @@ ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix, const TQString& offtext, const TQIconSet& offpix, - int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) : - KAction(ontext, onpix, accel, receiver, slot, parent, name), + int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) : + KAction(ontext, onpix, accel, receiver, slot, tqparent, name), officon(offpix), onicon(onpix), offcap(offtext), @@ -29,8 +29,8 @@ ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix, {} ToggleAction::ToggleAction(const TQString& ontext, const TQString& offtext, - int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) : - KAction(ontext, accel, receiver, slot, parent, name), + int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) : + KAction(ontext, accel, receiver, slot, tqparent, name), officon(), onicon(), offcap(offtext), diff --git a/kstars/kstars/toggleaction.h b/kstars/kstars/toggleaction.h index 5eef8d04..a2f05a98 100644 --- a/kstars/kstars/toggleaction.h +++ b/kstars/kstars/toggleaction.h @@ -31,12 +31,13 @@ class ToggleAction : public KAction { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - ToggleAction(const TQString& ontext, const TQIconSet& onpix, const TQString& offtext, const TQIconSet& offpix, int accel, const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0 ) ; + ToggleAction(const TQString& ontext, const TQIconSet& onpix, const TQString& offtext, const TQIconSet& offpix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0 ) ; /**Constructor. Same as above, but without icons. */ - ToggleAction(const TQString& ontext, const TQString& offtext, int accel, const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0 ) ; + ToggleAction(const TQString& ontext, const TQString& offtext, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0 ) ; /**Sets the ToolTip text for the "on" state. *@p tip the tooltip string diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index 458b467f..4c51a6a4 100644 --- a/kstars/kstars/tools/altvstime.cpp +++ b/kstars/kstars/tools/altvstime.cpp @@ -41,10 +41,10 @@ #include "kstarsdatetime.h" #include "libkdeedu/extdate/extdatetimeedit.h" -AltVsTime::AltVsTime( TQWidget* parent) : - KDialogBase( KDialogBase::Plain, i18n( "Altitude vs. Time" ), Close, Close, parent ) +AltVsTime::AltVsTime( TQWidget* tqparent) : + KDialogBase( KDialogBase::Plain, i18n( "Altitude vs. Time" ), Close, Close, tqparent ) { - ks = (KStars*) parent; + ks = (KStars*) tqparent; TQFrame *page = plainPage(); @@ -53,7 +53,7 @@ AltVsTime::AltVsTime( TQWidget* parent) : View = new AVTPlotWidget( -12.0, 12.0, -90.0, 90.0, page ); View->setMinimumSize( 400, 400 ); - View->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + View->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); View->setXAxisType( KStarsPlotWidget::TIME ); View->setYAxisType( KStarsPlotWidget::ANGLE ); View->setShowGrid( false ); @@ -113,7 +113,7 @@ AltVsTime::AltVsTime( TQWidget* parent) : AltVsTime::~AltVsTime() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void AltVsTime::slotAddSource(void) { @@ -190,7 +190,7 @@ void AltVsTime::slotAddSource(void) { avtUI->decBox->TQWidget::setFocus(); } - View->repaint(false); + View->tqrepaint(false); } //Use find dialog to choose an object @@ -201,7 +201,7 @@ void AltVsTime::slotBrowseObject(void) { processObject( o ); } - View->repaint(); + View->tqrepaint(); } void AltVsTime::processObject( SkyObject *o, bool forceAdd ) { @@ -307,11 +307,11 @@ void AltVsTime::slotHighlight(void) { //move input focus to the next logical widget void AltVsTime::slotAdvanceFocus(void) { - if ( sender()->name() == TQString( "nameBox" ) ) avtUI->addButton->setFocus(); - if ( sender()->name() == TQString( "raBox" ) ) avtUI->decBox->setFocus(); - if ( sender()->name() == TQString( "decbox" ) ) avtUI->addButton->setFocus(); - if ( sender()->name() == TQString( "longBox" ) ) avtUI->latBox->setFocus(); - if ( sender()->name() == TQString( "latBox" ) ) avtUI->updateButton->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "nameBox" ) ) avtUI->addButton->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "raBox" ) ) avtUI->decBox->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "decbox" ) ) avtUI->addButton->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "longBox" ) ) avtUI->latBox->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "latBox" ) ) avtUI->updateButton->setFocus(); } void AltVsTime::slotClear(void) { @@ -323,7 +323,7 @@ void AltVsTime::slotClear(void) { avtUI->decBox->clear(); avtUI->epochName->clear(); View->clearObjectList(); - View->repaint(); + View->tqrepaint(); } void AltVsTime::slotClearBoxes(void) { @@ -400,7 +400,7 @@ void AltVsTime::slotUpdateDateLoc(void) { o->updateCoords( num ); //update pList entry - pList.replace( i, (SkyPoint*)o ); + pList.tqreplace( i, (SkyPoint*)o ); KPlotObject *po = new KPlotObject( "", "white", KPlotObject::CURVE, 1, KPlotObject::SOLID ); for ( double h=-12.0; h<=12.0; h+=0.5 ) { @@ -437,7 +437,7 @@ void AltVsTime::slotUpdateDateLoc(void) { setLSTLimits(); slotHighlight(); - View->repaint(); + View->tqrepaint(); delete num; } @@ -468,7 +468,7 @@ void AltVsTime::setLSTLimits(void) { void AltVsTime::showCurrentDate (void) { - KStarsDateTime dt = KStarsDateTime::currentDateTime(); + KStarsDateTime dt = KStarsDateTime::tqcurrentDateTime(); if ( dt.time() > TQTime( 12, 0, 0 ) ) dt = dt.addDays( 1 ); avtUI->dateBox->setDate( dt.date() ); } @@ -495,8 +495,8 @@ double AltVsTime::getEpoch (TQString eName) return epoch; } -AVTPlotWidget::AVTPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name ) - : KStarsPlotWidget( x1, x2, y1, y2, parent, name ) +AVTPlotWidget::AVTPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name ) + : KStarsPlotWidget( x1, x2, y1, y2, tqparent, name ) { //Default SunRise/SunSet values SunRise = 0.25; @@ -512,7 +512,7 @@ void AVTPlotWidget::mouseMoveEvent( TQMouseEvent *e ) { int Xcursor = e->x(); int Ycursor = e->y(); - if ( ! checkRect.contains( e->x(), e->y() ) ) { + if ( ! checkRect.tqcontains( e->x(), e->y() ) ) { if ( e->x() < checkRect.left() ) Xcursor = checkRect.left(); if ( e->x() > checkRect.right() ) Xcursor = checkRect.right(); if ( e->y() < checkRect.top() ) Ycursor = checkRect.top(); diff --git a/kstars/kstars/tools/altvstime.h b/kstars/kstars/tools/altvstime.h index fc11e55b..04b6448b 100644 --- a/kstars/kstars/tools/altvstime.h +++ b/kstars/kstars/tools/altvstime.h @@ -48,10 +48,11 @@ class AltVsTimeUI; class AVTPlotWidget : public KStarsPlotWidget { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - AVTPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 ); + AVTPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=0, const char* name=0 ); /**Set the fractional positions of the Sunrise and Sunset positions, *in units where last midnight was 0.0, and next midnight is 1.0. @@ -93,11 +94,12 @@ private: class AltVsTime : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - AltVsTime( TQWidget* parent = 0); + AltVsTime( TQWidget* tqparent = 0); /**Destructor */ diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui index a4d1bb29..73ff7033 100644 --- a/kstars/kstars/tools/altvstimeui.ui +++ b/kstars/kstars/tools/altvstimeui.ui @@ -1,10 +1,10 @@ AltVsTimeUI - + AltVsTimeUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + tabWidget2 @@ -31,7 +31,7 @@ 0 - + tab @@ -42,9 +42,9 @@ unnamed - + - layout30 + tqlayout30 @@ -53,7 +53,7 @@ 0 - + textLabel3 @@ -77,7 +77,7 @@ StrongFocus - + textLabel4 @@ -93,7 +93,7 @@ Dec: - + textLabel2 @@ -108,7 +108,7 @@ RA: - + AlignVCenter @@ -150,20 +150,20 @@ epochName - + 80 0 - + 80 32767 - + textLabel1 @@ -173,9 +173,9 @@ - + - layout6 + tqlayout6 @@ -228,7 +228,7 @@ 0 - + 100 0 @@ -260,7 +260,7 @@ PlotList - + 100 0 @@ -272,7 +272,7 @@ - + tab @@ -283,15 +283,15 @@ unnamed - + - layout57 + tqlayout57 unnamed - + textLabel5 @@ -303,7 +303,7 @@ dateBox - + 90 0 @@ -320,7 +320,7 @@ Expanding - + 257 20 @@ -329,9 +329,9 @@ - + - layout25 + tqlayout25 @@ -345,7 +345,7 @@ Choose City... - + textLabel7 @@ -377,7 +377,7 @@ StrongFocus - + textLabel6 @@ -421,16 +421,16 @@ Expanding - + 20 16 - + - layout26 + tqlayout26 @@ -446,7 +446,7 @@ Expanding - + 40 20 @@ -526,7 +526,7 @@ latBox updateButton - + dmsbox.h diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui index 2445322a..701dbc0e 100644 --- a/kstars/kstars/tools/argchangeviewoption.ui +++ b/kstars/kstars/tools/argchangeviewoption.ui @@ -1,10 +1,10 @@ ArgChangeViewOption - + ArgChangeViewOption - + 0 0 @@ -16,9 +16,9 @@ unnamed - + - layout2 + tqlayout2 @@ -45,14 +45,14 @@ Expanding - + 50 20 - + textLabel1_2 @@ -95,14 +95,14 @@ Expanding - + 160 20 - + textLabel1 @@ -122,7 +122,7 @@ Expanding - + 20 16 @@ -133,7 +133,7 @@ - + kpushbutton.h klineedit.h diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui index f5e0d0fb..c5a5eb65 100644 --- a/kstars/kstars/tools/argexportimage.ui +++ b/kstars/kstars/tools/argexportimage.ui @@ -1,10 +1,10 @@ ArgExportImage - + ArgExportImage - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout7 + tqlayout7 unnamed - + textLabel1 @@ -36,7 +36,7 @@ ExportFileName - + 160 0 @@ -45,9 +45,9 @@ - + - layout6 + tqlayout6 @@ -63,16 +63,16 @@ Expanding - + 40 20 - + - layout5 + tqlayout5 @@ -106,7 +106,7 @@ 5000 - + textLabel2 @@ -114,7 +114,7 @@ Image width: - + textLabel2_2 @@ -136,7 +136,7 @@ Expanding - + 20 40 @@ -179,14 +179,14 @@ update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -221,10 +221,10 @@ slotEmitRelativeValueChanged(int) name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor @@ -255,7 +255,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082 - + knuminput.h diff --git a/kstars/kstars/tools/argloadcolorscheme.ui b/kstars/kstars/tools/argloadcolorscheme.ui index addc92eb..a95d895c 100644 --- a/kstars/kstars/tools/argloadcolorscheme.ui +++ b/kstars/kstars/tools/argloadcolorscheme.ui @@ -1,10 +1,10 @@ ArgLoadColorScheme - + ArgLoadColorScheme - + 0 0 @@ -23,5 +23,5 @@ - + diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui index 5d28243b..fe969021 100644 --- a/kstars/kstars/tools/arglooktoward.ui +++ b/kstars/kstars/tools/arglooktoward.ui @@ -1,10 +1,10 @@ ArgLookToward - + ArgLookToward - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout12 + tqlayout12 unnamed - + textLabel1 @@ -32,7 +32,7 @@ Dir: - + @@ -125,7 +125,7 @@ Expanding - + 40 20 @@ -144,7 +144,7 @@ Expanding - + 20 40 @@ -155,7 +155,7 @@ - + kpushbutton.h diff --git a/kstars/kstars/tools/argprintimage.ui b/kstars/kstars/tools/argprintimage.ui index a8bc4a24..56e7e215 100644 --- a/kstars/kstars/tools/argprintimage.ui +++ b/kstars/kstars/tools/argprintimage.ui @@ -1,10 +1,10 @@ ArgPrintImage - + ArgPrintImage - + 0 0 @@ -16,7 +16,7 @@ unnamed - + UsePrintDialog @@ -24,7 +24,7 @@ Show print dialog - + UseChartColors @@ -45,7 +45,7 @@ Expanding - + 20 70 @@ -54,5 +54,5 @@ - + diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui index 8446c010..52852ab6 100644 --- a/kstars/kstars/tools/argsetactionindi.ui +++ b/kstars/kstars/tools/argsetactionindi.ui @@ -1,10 +1,10 @@ ArgSetActionINDI - + ArgSetActionINDI - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout50 + tqlayout50 unnamed - + - layout47 + tqlayout47 unnamed - + textLabel1 @@ -43,7 +43,7 @@ Device: - + textLabel1_2 @@ -53,9 +53,9 @@ - + - layout48 + tqlayout48 @@ -83,7 +83,7 @@ Expanding - + 61 21 @@ -102,7 +102,7 @@ Expanding - + 20 9 @@ -113,7 +113,7 @@ - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argsetaltaz.ui b/kstars/kstars/tools/argsetaltaz.ui index 5c40d16a..f0ce32ac 100644 --- a/kstars/kstars/tools/argsetaltaz.ui +++ b/kstars/kstars/tools/argsetaltaz.ui @@ -1,10 +1,10 @@ ArgSetAltAz - + ArgSetAltAz - + 0 0 @@ -16,9 +16,9 @@ unnamed - + - layout13 + tqlayout13 @@ -45,10 +45,10 @@ Set the Altitude coordinate to be focused on in the sky map, in degrees. You can express the angle as a simple integer ("45") or floating-point ("45.333") value, or as space- or colon-delimited values specifying degrees, arcminutes and arcseconds ("45:20", "45:20:00", "45:20", "45 20.0", etc.). -The Altitude is one of the coordinates in the Horizontal coordinate system. It is defined as the angle of an object above or below the horizon. For example, the Zenith has an Altitude of 90 degrees. Altitude is also known as Elevation. +The Altitude is one of the coordinates in theQt::Horizontal coordinate system. It is defined as the angle of an object above or below the horizon. For example, the Zenith has an Altitude of 90 degrees. Altitude is also known as Elevation. - + textLabel1 @@ -80,7 +80,7 @@ The Altitude is one of the coordinates in the Horizontal coordinate system. It The azimuth is one of the coordinates in the horizontal coordinate system. It is defined as the angle measured along the horizon, between the North point and the point on the horizon directly below the object. Azimuth increases clockwise around the horizon - + textLabel1_2 @@ -100,7 +100,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i Expanding - + 20 40 @@ -136,7 +136,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i AzBox AltBox - + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui index 28822d8a..4fc68a90 100644 --- a/kstars/kstars/tools/argsetccdtempindi.ui +++ b/kstars/kstars/tools/argsetccdtempindi.ui @@ -1,10 +1,10 @@ ArgSetCCDTempINDI - + ArgSetCCDTempINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout62 + tqlayout62 @@ -86,7 +86,7 @@ Expanding - + 27 21 @@ -105,7 +105,7 @@ Expanding - + 20 9 @@ -114,7 +114,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui index 662b1ebe..4991d65c 100644 --- a/kstars/kstars/tools/argsetcolor.ui +++ b/kstars/kstars/tools/argsetcolor.ui @@ -1,10 +1,10 @@ ArgSetColor - + ArgSetColor - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout11 + tqlayout11 unnamed - + textLabel1 @@ -32,7 +32,7 @@ Color name: - + textLabel2 @@ -40,9 +40,9 @@ Color value: - + - layout10 + tqlayout10 @@ -66,7 +66,7 @@ Expanding - + 40 20 @@ -92,7 +92,7 @@ Expanding - + 20 40 @@ -139,14 +139,14 @@ update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -180,10 +180,10 @@ chooseColor() name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor @@ -218,7 +218,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082 - + kcolorbutton.h diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui index 17e58302..f04ff3ec 100644 --- a/kstars/kstars/tools/argsetfilternumindi.ui +++ b/kstars/kstars/tools/argsetfilternumindi.ui @@ -1,10 +1,10 @@ ArgSetFilterNumINDI - + ArgSetFilterNumINDI - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + textLabel1 @@ -43,7 +43,7 @@ Device: - + textLabel1_2 @@ -53,9 +53,9 @@ - + - layout62 + tqlayout62 @@ -89,7 +89,7 @@ Expanding - + 27 21 @@ -108,7 +108,7 @@ Expanding - + 20 9 @@ -117,7 +117,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argsetfocusspeedindi.ui b/kstars/kstars/tools/argsetfocusspeedindi.ui index 73023c28..2f723c4c 100644 --- a/kstars/kstars/tools/argsetfocusspeedindi.ui +++ b/kstars/kstars/tools/argsetfocusspeedindi.ui @@ -1,10 +1,10 @@ ArgSetFocusSpeedINDI - + ArgSetFocusSpeedINDI - + 0 0 @@ -26,7 +26,7 @@ Expanding - + 20 9 @@ -43,7 +43,7 @@ Expanding - + 45 21 @@ -55,7 +55,7 @@ deviceName - + textLabel1 @@ -63,7 +63,7 @@ Device: - + textLabel1_2 @@ -84,7 +84,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui index fd7a827c..67687cca 100644 --- a/kstars/kstars/tools/argsetfocustimeoutindi.ui +++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui @@ -1,10 +1,10 @@ ArgSetFocusTimeoutINDI - + ArgSetFocusTimeoutINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout62 + tqlayout62 @@ -86,7 +86,7 @@ Expanding - + 27 21 @@ -105,7 +105,7 @@ Expanding - + 20 9 @@ -114,7 +114,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui index 4400fe06..16429e9d 100644 --- a/kstars/kstars/tools/argsetframetypeindi.ui +++ b/kstars/kstars/tools/argsetframetypeindi.ui @@ -1,10 +1,10 @@ ArgSetFrameTypeINDI - + ArgSetFrameTypeINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout55 + tqlayout55 unnamed - + - layout47 + tqlayout47 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout54 + tqlayout54 @@ -63,7 +63,7 @@ deviceName - + typeCombo @@ -80,7 +80,7 @@ Expanding - + 56 21 @@ -99,7 +99,7 @@ Expanding - + 20 9 @@ -108,7 +108,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index 00e0f7b0..5b5ecf93 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -1,10 +1,10 @@ ArgSetGeoLocation - + ArgSetGeoLocation - + 0 0 @@ -16,31 +16,31 @@ unnamed - + - layout36 + tqlayout36 unnamed - + - layout35 + tqlayout35 unnamed - + - layout34 + tqlayout34 unnamed - + textLabel1_2 @@ -59,7 +59,7 @@ Enter the Country name for the desired location. It might be easier to use the "Find City" location to choose your location from the list of predefined cities. - + textLabel1 @@ -67,7 +67,7 @@ City: - + textLabel1_2_3 @@ -99,9 +99,9 @@ - + - layout33 + tqlayout33 @@ -117,7 +117,7 @@ Expanding - + 49 20 @@ -152,7 +152,7 @@ Expanding - + 49 20 @@ -171,7 +171,7 @@ Expanding - + 20 40 @@ -188,10 +188,10 @@ CountryName FindCityButton - + slotFindCity() - - + + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argsetgeolocationindi.ui b/kstars/kstars/tools/argsetgeolocationindi.ui index 6dd5fbf8..2dfdf5db 100644 --- a/kstars/kstars/tools/argsetgeolocationindi.ui +++ b/kstars/kstars/tools/argsetgeolocationindi.ui @@ -1,10 +1,10 @@ ArgSetGeoLocationINDI - + ArgSetGeoLocationINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout34 + tqlayout34 unnamed - + - layout32 + tqlayout32 unnamed - + textLabel1_3 @@ -40,7 +40,7 @@ Device: - + textLabel1 @@ -48,7 +48,7 @@ Long: - + textLabel1_2 @@ -58,9 +58,9 @@ - + - layout33 + tqlayout33 @@ -129,7 +129,7 @@ Expanding - + 20 23 @@ -161,7 +161,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082 - + klineedit.h dmsbox.h diff --git a/kstars/kstars/tools/argsetlocaltime.ui b/kstars/kstars/tools/argsetlocaltime.ui index 03247473..9f1e8c9b 100644 --- a/kstars/kstars/tools/argsetlocaltime.ui +++ b/kstars/kstars/tools/argsetlocaltime.ui @@ -1,10 +1,10 @@ ArgSetLocalTime - + ArgSetLocalTime - + 0 0 @@ -21,9 +21,9 @@ DateBox - + - layout43 + tqlayout43 @@ -39,14 +39,14 @@ Expanding - + 70 20 - + TimeBox @@ -69,7 +69,7 @@ Expanding - + 20 20 @@ -101,5 +101,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082 - + diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui index 2ca20aa4..fad42e04 100644 --- a/kstars/kstars/tools/argsetportindi.ui +++ b/kstars/kstars/tools/argsetportindi.ui @@ -1,10 +1,10 @@ ArgSetPortINDI - + ArgSetPortINDI - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout23 + tqlayout23 unnamed - + textLabel1 @@ -32,7 +32,7 @@ Device: - + textLabel1_2 @@ -62,7 +62,7 @@ Expanding - + 20 9 @@ -71,7 +71,7 @@ - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argsetradec.ui b/kstars/kstars/tools/argsetradec.ui index b78ac04a..28ce300d 100644 --- a/kstars/kstars/tools/argsetradec.ui +++ b/kstars/kstars/tools/argsetradec.ui @@ -1,10 +1,10 @@ ArgSetRaDec - + ArgSetRaDec - + 0 0 @@ -16,9 +16,9 @@ unnamed - + - layout13 + tqlayout13 @@ -48,7 +48,7 @@ Declination is one of the coordinates in the Equatorial coordinate system; it measures the angle of an object North or South of the Celestial Equator. The star Polaris, which is near the celestial north pole, has a Declination of nearly 90 degrees. - + textLabel1 @@ -80,7 +80,7 @@ Declination is one of the coordinates in the Equatorial coordinate system; it me Right Ascension is one of the coordinates in the Equatorial coordinate system. It measures the angle around the celestial equator from the Vernal equinox, increasing to the East. Right Ascension (RA) is almost always expressed in Hours instead of Degrees; the Celestial Equator is divided into 24 Hours, so 1 Hour of RA is equal to 360/24=15 Degrees. See the AstroInfo article for more details, - + textLabel1_2 @@ -100,7 +100,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system. Expanding - + 20 40 @@ -136,7 +136,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system. RaBox DecBox - + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui index 528e783e..dc877bdf 100644 --- a/kstars/kstars/tools/argsetscopeactionindi.ui +++ b/kstars/kstars/tools/argsetscopeactionindi.ui @@ -1,10 +1,10 @@ ArgSetScopeActionINDI - + ArgSetScopeActionINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout55 + tqlayout55 unnamed - + - layout47 + tqlayout47 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout54 + tqlayout54 @@ -63,7 +63,7 @@ deviceName - + actionCombo @@ -80,7 +80,7 @@ Expanding - + 56 21 @@ -99,7 +99,7 @@ Expanding - + 20 9 @@ -108,7 +108,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argsettargetcoordindi.ui b/kstars/kstars/tools/argsettargetcoordindi.ui index 8973b24b..fb4aa1e4 100644 --- a/kstars/kstars/tools/argsettargetcoordindi.ui +++ b/kstars/kstars/tools/argsettargetcoordindi.ui @@ -1,10 +1,10 @@ ArgSetTargetCoordINDI - + ArgSetTargetCoordINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout34 + tqlayout34 unnamed - + - layout32 + tqlayout32 unnamed - + textLabel1_3 @@ -40,7 +40,7 @@ Device: - + textLabel1 @@ -48,7 +48,7 @@ RA: - + textLabel1_2 @@ -58,9 +58,9 @@ - + - layout33 + tqlayout33 @@ -129,7 +129,7 @@ Expanding - + 20 24 @@ -161,7 +161,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082 - + klineedit.h dmsbox.h diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui index 0f4b17f9..5ed3aea9 100644 --- a/kstars/kstars/tools/argsettargetnameindi.ui +++ b/kstars/kstars/tools/argsettargetnameindi.ui @@ -1,10 +1,10 @@ ArgSetTargetNameINDI - + ArgSetTargetNameINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout44 + tqlayout44 unnamed - + - layout40 + tqlayout40 unnamed - + textLabel1_2 @@ -40,7 +40,7 @@ Device: - + textLabel1 @@ -50,9 +50,9 @@ - + - layout41 + tqlayout41 @@ -70,9 +70,9 @@ - + - layout42 + tqlayout42 @@ -88,7 +88,7 @@ Expanding - + 52 20 @@ -128,7 +128,7 @@ Expanding - + 20 8 @@ -139,7 +139,7 @@ - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argsettrack.ui b/kstars/kstars/tools/argsettrack.ui index bacb0597..edf2d0bf 100644 --- a/kstars/kstars/tools/argsettrack.ui +++ b/kstars/kstars/tools/argsettrack.ui @@ -1,10 +1,10 @@ ArgSetTrack - + ArgSetTrack - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout24 + tqlayout24 unnamed - + CheckTrack @@ -50,7 +50,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente Expanding - + 40 20 @@ -69,7 +69,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente Expanding - + 20 40 @@ -78,5 +78,5 @@ If unchecked, then Tracking will be forced off, even if an object has been cente - + diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui index 9c0f1302..cbc96c51 100644 --- a/kstars/kstars/tools/argsetutcindi.ui +++ b/kstars/kstars/tools/argsetutcindi.ui @@ -1,10 +1,10 @@ ArgSetUTCINDI - + ArgSetUTCINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout88 + tqlayout88 unnamed - + - layout86 + tqlayout86 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout87 + tqlayout87 @@ -80,7 +80,7 @@ Expanding - + 51 20 @@ -99,7 +99,7 @@ Expanding - + 20 9 @@ -110,7 +110,7 @@ - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui index ce7be2f4..654265de 100644 --- a/kstars/kstars/tools/argshutdownindi.ui +++ b/kstars/kstars/tools/argshutdownindi.ui @@ -1,10 +1,10 @@ ArgShutdownINDI - + ArgShutdownINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - layout4 + tqlayout4 unnamed - + textLabel1 @@ -59,7 +59,7 @@ Expanding - + 20 33 @@ -68,7 +68,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui index 47a631e6..b9fb3b0d 100644 --- a/kstars/kstars/tools/argstartexposureindi.ui +++ b/kstars/kstars/tools/argstartexposureindi.ui @@ -1,10 +1,10 @@ ArgStartExposureINDI - + ArgStartExposureINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + duration @@ -50,9 +50,9 @@ - + - layout62 + tqlayout62 @@ -86,7 +86,7 @@ Expanding - + 27 21 @@ -105,7 +105,7 @@ Expanding - + 20 9 @@ -116,7 +116,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui index 3bd5503c..cccf697e 100644 --- a/kstars/kstars/tools/argstartfocusindi.ui +++ b/kstars/kstars/tools/argstartfocusindi.ui @@ -1,10 +1,10 @@ ArgStartFocusINDI - + ArgStartFocusINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout55 + tqlayout55 unnamed - + - layout47 + tqlayout47 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout54 + tqlayout54 @@ -63,7 +63,7 @@ deviceName - + directionCombo @@ -80,7 +80,7 @@ Expanding - + 56 21 @@ -99,7 +99,7 @@ Expanding - + 20 9 @@ -110,7 +110,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui index 554ea363..3f3b5767 100644 --- a/kstars/kstars/tools/argstartindi.ui +++ b/kstars/kstars/tools/argstartindi.ui @@ -1,10 +1,10 @@ ArgStartINDI - + ArgStartINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - layout4 + tqlayout4 unnamed - + textLabel1 @@ -57,14 +57,14 @@ Expanding - + 61 20 - + INDIMode @@ -75,7 +75,7 @@ unnamed - + LocalButton @@ -86,7 +86,7 @@ true - + ServerButton @@ -108,7 +108,7 @@ Expanding - + 20 40 @@ -117,7 +117,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui index f4c85a1c..88db343f 100644 --- a/kstars/kstars/tools/argswitchindi.ui +++ b/kstars/kstars/tools/argswitchindi.ui @@ -1,10 +1,10 @@ ArgSwitchINDI - + ArgSwitchINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - layout4 + tqlayout4 unnamed - + textLabel1 @@ -57,14 +57,14 @@ Expanding - + 61 20 - + INDIConnection @@ -78,7 +78,7 @@ unnamed - + OnButton @@ -89,7 +89,7 @@ true - + OffButton @@ -111,7 +111,7 @@ Expanding - + 20 33 @@ -122,7 +122,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argtimescale.ui b/kstars/kstars/tools/argtimescale.ui index f2b0eab3..febb793c 100644 --- a/kstars/kstars/tools/argtimescale.ui +++ b/kstars/kstars/tools/argtimescale.ui @@ -1,10 +1,10 @@ ArgTimeScale - + ArgTimeScale - + 0 0 @@ -16,9 +16,9 @@ unnamed - + - layout4 + tqlayout4 @@ -39,7 +39,7 @@ Expanding - + 150 20 @@ -58,7 +58,7 @@ Expanding - + 20 40 @@ -90,7 +90,7 @@ 789c9d95594f32591086effd15c4ba3393fae895ee4ce6824540141011b7c95cf406a202caa6f065fefb549faaea0b24996fc623cb937aeb3d55754e871f67a587eb6ee9ecc7c96a1dada74929798e96a5b374339bedfefceb8f9f27a7b65da27fcb724bf6e96f27a783752929f516f32c070402289b3fc39d8203c3136157e276c1260eac0f0ade0907927f2d9c58261f929cad72be0cef8535ff5959e277c201ef0fa02cf1ae7022f9efca12ff301ca81e87c21a5f32db5acf95b0eebfcdd92e2be3a5b0fa7986435bfd6e981d99278c0ae6795c288b3e2b98e3036157d8f839961308af985df51b1b0e9dc0098ddf5a3811fd7dceaee52a370d475e28f9b7ca1c07539f67173c144e65be2fcae2d763f62d89df2acb7cc282393e57b6b9ff58d893fca632c7d1ccc78bbcd48b4c7cc2ec4bfdf0aa2cfbf50be6fa2c65d9af2aacfd2c94e53cccf9fa7645eb7794a59ebdb027fe5565895f09cb7e981a267f9febaf3117fab6702af599e7a5e2049e6dce1377c25affa6608e4786e34a58894dfc8b59f5f890731087e28f2de648fbdb16ccfd6c9465bf7365c732f12f61ed3f5016fd4a59f4e6790fddd00a5d137f638eb4bfa532df5ffc148ea4be5ac17c5ea9b2ecd72b98efff403893fa1accb12d5c5696fd4d7f6152c41f95c53f2a98f56b6597fbf3857da9b75e30fb5584b59fa78239de5596fd3e0be6fdccf311b99115f1fcdaccb12fe77927ac7e2365f1c382793e63e14cfccdf3132571e69b1f07e83327d23fbac2bee4d785d57f2a9c89de9c6fecaa1fce98135bf845b9e2189e2a07e6fee287b0cfcf3bce9525ff5d38927a1bcca9cc1b66ca528ff93d89d338e3f9e182b9c86f31a752ff609d2f847f5f83b5ea31c218137a4f8fac0cc738e10cd6d3b7189f718a2ff88a6f38c339ad05adfcf31d3f7089ab037d42ea356e708b9ff8853bdc6395de6b58c706ad736c1ee823f2de608b146dbcc08e8976f012afb04b3975ec1de853aa2457f749d5c16b1ce00d0ecdf75b1ce1dd11fd1b55d236cef7f8808ff88465b4d02676d03da29f51dd9e513fa28f150c3004246d07002288bfe9e7d45f0712f22635a490d15ef730361e3b389c67aedf2390ea3157e73dc333e9a6f042d13ebc7ed32f6882405d3ee1c678030ee10d6630a76f162c8ee8f37adeb14c0aaa0b3e68b725ac80a2b039a29f630db6e46bc127d5fd45de4b5226b0833d8ea07a445f871ae96dacc218ead08073c835136842eba8be016db830e77a419f21aca143f76c025b9ae7e5813ea35bd5a0731fd1c4877a7f614fde57d085deb7f31ad31dccf54fd087883ab7a88f6baabb45fdf760003707fa09ddd826f66048af1826f00a0bb3aa7009b73082bb03fd2faeffa7fff58cfffcbcfffdfbc93f7f7d62d7 - + timestepbox.h diff --git a/kstars/kstars/tools/argwaitfor.ui b/kstars/kstars/tools/argwaitfor.ui index 21478f29..c09fc538 100644 --- a/kstars/kstars/tools/argwaitfor.ui +++ b/kstars/kstars/tools/argwaitfor.ui @@ -1,10 +1,10 @@ ArgWaitFor - + ArgWaitFor - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout17 + tqlayout17 unnamed - + textLabel1 @@ -32,7 +32,7 @@ <font color="#00007f">Sec:</font> - + DelayBox @@ -53,7 +53,7 @@ Expanding - + 40 20 @@ -72,7 +72,7 @@ Expanding - + 20 40 @@ -81,5 +81,5 @@ - + diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui index cb3f8610..9034751d 100644 --- a/kstars/kstars/tools/argwaitforkey.ui +++ b/kstars/kstars/tools/argwaitforkey.ui @@ -1,10 +1,10 @@ ArgWaitForKey - + ArgWaitForKey - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout18 + tqlayout18 unnamed - + textLabel1 @@ -55,7 +55,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr Expanding - + 40 20 @@ -74,7 +74,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr Expanding - + 20 40 @@ -85,7 +85,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr - + klineedit.h diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui index 8b93e300..d4ccaee4 100644 --- a/kstars/kstars/tools/argzoom.ui +++ b/kstars/kstars/tools/argzoom.ui @@ -1,10 +1,10 @@ ArgZoom - + ArgZoom - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -56,7 +56,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea Expanding - + 30 20 @@ -75,7 +75,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea Expanding - + 20 40 @@ -86,7 +86,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea - + klineedit.h diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index 3b87826b..98e9087b 100644 --- a/kstars/kstars/tools/astrocalc.cpp +++ b/kstars/kstars/tools/astrocalc.cpp @@ -38,8 +38,8 @@ #include -AstroCalc::AstroCalc( TQWidget* parent ) : - KDialogBase( parent, "starscalculator", true, i18n("Calculator"), Close ), +AstroCalc::AstroCalc( TQWidget* tqparent ) : + KDialogBase( tqparent, "starscalculator", true, i18n("Calculator"), Close ), JDFrame(0), GeodCoordFrame(0), GalFrame(0), SidFrame(0), PrecFrame(0), AppFrame(0), DayFrame(0), AzelFrame(0), PlanetsFrame(0), EquinoxFrame(0), EclFrame(0), AngDistFrame(0) @@ -58,11 +58,11 @@ AstroCalc::AstroCalc( TQWidget* parent ) : navigationPanel->addColumn("Section"); navigationPanel->setRootIsDecorated(1); - TQPixmap jdIcon = TQPixmap ("jd.png"); - TQPixmap geodIcon = TQPixmap ("geodetic.png"); - TQPixmap solarIcon = TQPixmap ("geodetic.png"); - TQPixmap sunsetIcon = TQPixmap ("sunset.png"); - TQPixmap timeIcon = TQPixmap ("sunclock.png"); + TQPixmap jdIcon = TQPixmap (TQString("jd.png")); + TQPixmap geodIcon = TQPixmap (TQString("geodetic.png")); + TQPixmap solarIcon = TQPixmap (TQString("geodetic.png")); + TQPixmap sunsetIcon = TQPixmap (TQString("sunset.png")); + TQPixmap timeIcon = TQPixmap (TQString("sunclock.png")); TQListViewItem * timeItem = new TQListViewItem(navigationPanel,i18n("Time Calculators")); timeItem->setPixmap(0,timeIcon); @@ -78,7 +78,7 @@ AstroCalc::AstroCalc( TQWidget* parent ) : TQListViewItem * coordItem = new TQListViewItem(navigationPanel,i18n("Celestial Coordinates")); new TQListViewItem(coordItem,i18n("Galactic Coordinates")); new TQListViewItem(coordItem,i18n("Precession")); - new TQListViewItem(coordItem,i18n("Apparent Coordinates")); + new TQListViewItem(coordItem,i18n("Aptqparent Coordinates")); new TQListViewItem(coordItem,i18n("Horizontal Coordinates")); new TQListViewItem(coordItem,i18n("Ecliptic Coordinates")); new TQListViewItem(coordItem,i18n("Angular Distance")); @@ -119,7 +119,7 @@ void AstroCalc::slotItemSelection(TQListViewItem *item) genGalFrame(); if(!(election.compare(i18n("Precession")))) genPrecFrame(); - if(!(election.compare(i18n("Apparent Coordinates")))) + if(!(election.compare(i18n("Aptqparent Coordinates")))) genAppFrame(); if(!(election.compare(i18n("Horizontal Coordinates")))) genAzelFrame(); @@ -190,7 +190,7 @@ void AstroCalc::genCoordText(void) "
  • " "Galactic: Galactic/Equatorial coordinates conversion" "
  • " - "Apparent: Computation of current equatorial coordinates" + "Aptqparent: Computation of current equatorial coordinates" " from a given epoch" "
  • " "Ecliptic: Ecliptic/Equatorial coordinates conversion" @@ -270,7 +270,7 @@ void AstroCalc::delRightPanel(void) delete EclFrame; else if (rightPanel == Precessor) delete PrecFrame; - else if (rightPanel == Apparent) + else if (rightPanel == Aptqparent) delete AppFrame; else if (rightPanel == Azel) delete AzelFrame; @@ -342,8 +342,8 @@ void AstroCalc::genPrecFrame(void) void AstroCalc::genAppFrame(void) { delRightPanel(); - AppFrame = new modCalcApCoord(split,"Apparent"); - rightPanel = Apparent; + AppFrame = new modCalcApCoord(split,"Aptqparent"); + rightPanel = Aptqparent; } void AstroCalc::genAzelFrame(void) @@ -374,7 +374,7 @@ void AstroCalc::genVlsrFrame(void) rightPanel = Vlsr; } -TQSize AstroCalc::sizeHint() const +TQSize AstroCalc::tqsizeHint() const { return TQSize(640,430); } diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h index bbabcb24..c88bd104 100644 --- a/kstars/kstars/tools/astrocalc.h +++ b/kstars/kstars/tools/astrocalc.h @@ -56,11 +56,11 @@ class modCalcVlsr; class AstroCalc : public KDialogBase { - -Q_OBJECT +Q_OBJECT +TQ_OBJECT public: /** construtor */ - AstroCalc(TQWidget *parent = 0); + AstroCalc(TQWidget *tqparent = 0); /** destructor */ ~AstroCalc(); @@ -101,7 +101,7 @@ Q_OBJECT /**Generate frame for Precession frame. */ void genPrecFrame(void); - /**Generate frame for apparent coordinates frame. */ + /**Generate frame for aptqparent coordinates frame. */ void genAppFrame(void); /**Generate frame for horizontal coordinates frame. */ @@ -120,7 +120,7 @@ Q_OBJECT void delRightPanel(void); /**@returns suggested size of calculator window. */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: /**Determine which item is selected in the function menu TQListBox. @@ -137,7 +137,7 @@ Q_OBJECT TQVBox *vbox, *rightBox; TQString previousElection; - enum typeOfPanel {GenText, TimeText, GeoText, SolarText, CoordText, JD, SidTime, DayLength, Equinox, GeoCoord, Galactic, Precessor, Apparent, Azel, Planets, Ecliptic, AngDist, Vlsr}; + enum typeOfPanel {GenText, TimeText, GeoText, SolarText, CoordText, JD, SidTime, DayLength, Equinox, GeoCoord, Galactic, Precessor, Aptqparent, Azel, Planets, Ecliptic, AngDist, Vlsr}; typeOfPanel rightPanel; modCalcJD *JDFrame; diff --git a/kstars/kstars/tools/jmoontool.cpp b/kstars/kstars/tools/jmoontool.cpp index 7d7add93..f4d63cf3 100644 --- a/kstars/kstars/tools/jmoontool.cpp +++ b/kstars/kstars/tools/jmoontool.cpp @@ -30,10 +30,10 @@ #include "dms.h" #include "ksnumbers.h" -JMoonTool::JMoonTool(TQWidget *parent, const char *name) - : KDialogBase( KDialogBase::Plain, i18n("Jupiter Moons Tool"), Close, Close, parent, name ) +JMoonTool::JMoonTool(TQWidget *tqparent, const char *name) + : KDialogBase( KDialogBase::Plain, i18n("Jupiter Moons Tool"), Close, Close, tqparent, name ) { - ksw = (KStars*)parent; + ksw = (KStars*)tqparent; TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); @@ -49,14 +49,14 @@ JMoonTool::JMoonTool(TQWidget *parent, const char *name) TQLabel *labGn = new TQLabel( "Ganymede", page ); TQLabel *labCa = new TQLabel( "Callisto", page ); - labIo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labEu->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labGn->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labCa->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labIo->setAlignment( AlignHCenter ); - labEu->setAlignment( AlignHCenter ); - labGn->setAlignment( AlignHCenter ); - labCa->setAlignment( AlignHCenter ); + labIo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labEu->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labGn->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labCa->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labIo->tqsetAlignment( AlignHCenter ); + labEu->tqsetAlignment( AlignHCenter ); + labGn->tqsetAlignment( AlignHCenter ); + labCa->tqsetAlignment( AlignHCenter ); labIo->setPaletteForegroundColor( colIo ); labEu->setPaletteForegroundColor( colEu ); diff --git a/kstars/kstars/tools/jmoontool.h b/kstars/kstars/tools/jmoontool.h index 70c33e79..7c0abee4 100644 --- a/kstars/kstars/tools/jmoontool.h +++ b/kstars/kstars/tools/jmoontool.h @@ -30,8 +30,9 @@ class KStars; class JMoonTool : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - JMoonTool(TQWidget *parent = 0, const char *name = 0); + JMoonTool(TQWidget *tqparent = 0, const char *name = 0); ~JMoonTool(); protected: diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp index dcbe36b7..d07c3e36 100644 --- a/kstars/kstars/tools/kstarsplotwidget.cpp +++ b/kstars/kstars/tools/kstarsplotwidget.cpp @@ -28,8 +28,8 @@ -KStarsPlotWidget::KStarsPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name ) - : KPlotWidget( x1, x2, y1, y2, parent, name ), +KStarsPlotWidget::KStarsPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name ) + : KPlotWidget( x1, x2, y1, y2, tqparent, name ), dXtick2(0.0), dYtick2(0.0), nmajX2(0), nminX2(0), nmajY2(0), nminY2(0), XAxisType(DOUBLE), YAxisType(DOUBLE), XAxisType_0(DOUBLE), YAxisType_0(DOUBLE), @@ -283,7 +283,7 @@ void KStarsPlotWidget::updateTickmarks() { void KStarsPlotWidget::drawBox( TQPainter *p ) { int pW = PixRect.width(), pH = PixRect.height(); - //First, fill in padding region with bgColor() to mask out-of-bounds plot data + //First, fill in padding region with bgColor() to tqmask out-of-bounds plot data p->setPen( bgColor() ); p->setBrush( bgColor() ); @@ -319,7 +319,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { } p->setPen( fgColor() ); - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); if ( LeftAxis.isVisible() || BottomAxis.isVisible() ) p->drawRect( PixRect ); //box outline @@ -358,14 +358,14 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { switch ( xAxisType() ) { case DOUBLE : { - TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); - int idot = str.find( '.' ); + TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 ); + int idot = str.tqfind( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -379,7 +379,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%02d:%02d", h, m ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -388,7 +388,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%d%c", int(lab), 176 ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -426,14 +426,14 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { switch ( yAxisType() ) { case DOUBLE : { - TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); - int idot = str.find( '.' ); + TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 ); + int idot = str.tqfind( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -447,7 +447,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%02d:%02d", h, m ); if ( py > 0 && py < pH ) { TQRect r( -3*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -456,7 +456,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%d%c", int(lab), 176 ); if ( py > 0 && py < pH ) { TQRect r( -3*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -492,14 +492,14 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { switch ( xAxisType() ) { case DOUBLE : { - TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); - int idot = str.find( '.' ); + TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 ); + int idot = str.tqfind( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -513,7 +513,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%02d:%02d", h, m ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -522,7 +522,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%d%c", int(lab), 176 ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -556,14 +556,14 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { switch ( yAxisType() ) { case DOUBLE : { - TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); - int idot = str.find( '.' ); + TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 ); + int idot = str.tqfind( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -577,7 +577,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%02d:%02d", h, m ); if ( py > 0 && py < pH ) { TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -586,7 +586,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%d%c", int(lab), 176 ); if ( py > 0 && py < pH ) { TQRect r( pW + 3*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -611,11 +611,11 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { //Draw X Axis Label(s) if ( ! BottomAxis.label().isEmpty() ) { TQRect r( 0, PixRect.height() + 2*YPADDING, PixRect.width(), YPADDING ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, BottomAxis.label() ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, BottomAxis.label() ); } if ( ! XAxisLabel2.isEmpty() ) { TQRect r( 0, -3*YPADDING, PixRect.width(), YPADDING ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, XAxisLabel2 ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, XAxisLabel2 ); } //Draw Y Axis Label(s). We need to draw the text sideways. @@ -628,7 +628,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { p->rotate( -90.0 ); TQRect r( 0, 0, PixRect.height(), XPADDING ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, LeftAxis.label() ); //draw the label, now that we are sideways + p->drawText( r, TQt::AlignCenter | TQt::DontClip, LeftAxis.label() ); //draw the label, now that we are sideways p->restore(); //restore translation/rotation state } @@ -641,7 +641,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { p->rotate( -90.0 ); TQRect r( 0, 0, PixRect.height(), XPADDING ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, YAxisLabel2 ); //draw the label, now that we are sideways + p->drawText( r, TQt::AlignCenter | TQt::DontClip, YAxisLabel2 ); //draw the label, now that we are sideways p->restore(); //restore translation/rotation state } diff --git a/kstars/kstars/tools/kstarsplotwidget.h b/kstars/kstars/tools/kstarsplotwidget.h index a3c00d88..be672454 100644 --- a/kstars/kstars/tools/kstarsplotwidget.h +++ b/kstars/kstars/tools/kstarsplotwidget.h @@ -38,10 +38,11 @@ class TQPixmap; class KStarsPlotWidget : public KPlotWidget { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - KStarsPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 ); + KStarsPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=0, const char* name=0 ); /**Destructor (empty) */ diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index bc682bbb..1cc0b8e1 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -39,11 +39,11 @@ #include -LCGenerator::LCGenerator( TQWidget* parent) - : KDialogBase( parent, "lcgenerator", false, i18n( "AAVSO Light Curve Generator"),0) , Hostprefix("http://www.aavso.org/cgi-bin/kstar.pl"), JDCutOff(2437600) +LCGenerator::LCGenerator( TQWidget* tqparent) + : KDialogBase( tqparent, "lcgenerator", false, i18n( "AAVSO Light Curve Generator"),0) , Hostprefix("http://www.aavso.org/cgi-bin/kstar.pl"), JDCutOff(2437600) { - ksw = (KStars*) parent; + ksw = (KStars*) tqparent; createGUI(); downloadJob = 0; @@ -69,10 +69,10 @@ void LCGenerator::createGUI() StarInfoBox = new TQGroupBox( page, "StarInfoBox" ); StarInfoBox->setColumnLayout(0, Qt::Vertical ); - StarInfoBox->layout()->setSpacing( 6 ); - StarInfoBox->layout()->setMargin( 11 ); - StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->layout() ); - StarInfoBoxLayout->setAlignment( Qt::AlignTop ); + StarInfoBox->tqlayout()->setSpacing( 6 ); + StarInfoBox->tqlayout()->setMargin( 11 ); + StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->tqlayout() ); + StarInfoBoxLayout->tqsetAlignment( TQt::AlignTop ); DesignHLayout = new TQHBoxLayout( 0, 0, 6, "DesignHLayout"); @@ -125,10 +125,10 @@ void LCGenerator::createGUI() DataSelectBox = new TQGroupBox( page, "DataSelectBox" ); DataSelectBox->setColumnLayout(0, Qt::Vertical ); - DataSelectBox->layout()->setSpacing( 6 ); - DataSelectBox->layout()->setMargin( 11 ); - DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->layout() ); - DataSelectBoxLayout->setAlignment( Qt::AlignTop ); + DataSelectBox->tqlayout()->setSpacing( 6 ); + DataSelectBox->tqlayout()->setMargin( 11 ); + DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->tqlayout() ); + DataSelectBoxLayout->tqsetAlignment( TQt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); VisualCheck->setChecked( TRUE ); @@ -398,7 +398,7 @@ void LCGenerator::DownloadCurve(TQString FinalStartDate, TQString FinalEndDate, KURL url(buf); TQString message = i18n( "Light Curve produced by the American Amateur Variable Star Observers" ); - // parent of imageview is KStars + // tqparent of imageview is KStars new ImageViewer(&url, message, ksw, "lightcurve"); } @@ -471,7 +471,7 @@ downloadJob = 0; void LCGenerator::closeEvent (TQCloseEvent *ev) { if (ev) // not if closeEvent (0) is called, because segfault - ev->accept(); // parent-widgets should not get this event, so it will be filtered + ev->accept(); // tqparent-widgets should not get this event, so it will be filtered //this->~LCGenerator(); // destroy the object, so the object can only allocated with operator new, not as a global/local variable } diff --git a/kstars/kstars/tools/lcgenerator.h b/kstars/kstars/tools/lcgenerator.h index 4e8e055c..6d570060 100644 --- a/kstars/kstars/tools/lcgenerator.h +++ b/kstars/kstars/tools/lcgenerator.h @@ -54,12 +54,13 @@ struct VariableStarInfo class LCGenerator : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor - *@p parent pointer to the parent widget + *@p tqparent pointer to the tqparent widget */ - LCGenerator( TQWidget* parent = 0); + LCGenerator( TQWidget* tqparent = 0); /**Destructor */ ~LCGenerator(); diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp index 750ae6d6..96cdbd02 100644 --- a/kstars/kstars/tools/modcalcangdist.cpp +++ b/kstars/kstars/tools/modcalcangdist.cpp @@ -30,7 +30,7 @@ //#include ..already included in modcalcapcoord.h -modCalcAngDist::modCalcAngDist(TQWidget *parentSplit, const char *name) : modCalcAngDistDlg(parentSplit,name) { +modCalcAngDist::modCalcAngDist(TQWidget *tqparentSplit, const char *name) : modCalcAngDistDlg(tqparentSplit,name) { ra0Box->setDegType(FALSE); ra1Box->setDegType(FALSE); @@ -98,7 +98,7 @@ void modCalcAngDist::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -110,7 +110,7 @@ void modCalcAngDist::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcangdist.h b/kstars/kstars/tools/modcalcangdist.h index c5706938..bb689596 100644 --- a/kstars/kstars/tools/modcalcangdist.h +++ b/kstars/kstars/tools/modcalcangdist.h @@ -34,6 +34,7 @@ class TQTextStream; class modCalcAngDist : public modCalcAngDistDlg { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ modCalcAngDist(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 72290976..c6d65b7c 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -1,10 +1,10 @@ modCalcAngDistDlg - + modCalcAngDistDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + tabWidget3 - + tab @@ -34,15 +34,15 @@ unnamed - + - layout8 + tqlayout8 unnamed - + origCoordBox @@ -57,7 +57,7 @@ ra0Box - + 100 0 @@ -71,7 +71,7 @@ dec0Box - + 100 0 @@ -81,7 +81,7 @@ StrongFocus - + dec0Label @@ -89,7 +89,7 @@ Declination: - + ra0Label @@ -99,7 +99,7 @@ - + origCoordBox_2 @@ -114,7 +114,7 @@ ra1Box - + 100 0 @@ -128,7 +128,7 @@ dec1Box - + 100 0 @@ -138,7 +138,7 @@ StrongFocus - + dec0Label_2 @@ -146,7 +146,7 @@ Declination: - + ra0Label_2 @@ -158,9 +158,9 @@ - + - layout7 + tqlayout7 @@ -176,7 +176,7 @@ Expanding - + 145 20 @@ -201,7 +201,7 @@ Expanding - + 146 20 @@ -226,7 +226,7 @@ Expanding - + 145 20 @@ -235,7 +235,7 @@ - + outputBox @@ -256,14 +256,14 @@ Expanding - + 102 20 - + rafLabel @@ -275,7 +275,7 @@ distBox - + 100 0 @@ -295,7 +295,7 @@ Expanding - + 70 20 @@ -314,7 +314,7 @@ Expanding - + 21 171 @@ -323,7 +323,7 @@ - + tab @@ -334,7 +334,7 @@ unnamed - + InputBox_2_2 @@ -400,7 +400,7 @@ StrongFocus - + ra1CheckBatch @@ -411,7 +411,7 @@ true - + dec1CheckBatch @@ -422,7 +422,7 @@ true - + dec0CheckBatch @@ -433,7 +433,7 @@ true - + ra0CheckBatch @@ -446,7 +446,7 @@ - + buttonGroup4 @@ -457,7 +457,7 @@ unnamed - + allRadioBatch @@ -465,7 +465,7 @@ All parameters - + inputRadioBatch @@ -478,7 +478,7 @@ - + groupBox4_2 @@ -489,7 +489,7 @@ unnamed - + InputButtonBatch @@ -500,17 +500,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -523,9 +523,9 @@ - + - layout14 + tqlayout14 @@ -541,7 +541,7 @@ Expanding - + 151 21 @@ -574,7 +574,7 @@ Expanding - + 131 21 @@ -593,7 +593,7 @@ Expanding - + 20 21 @@ -660,14 +660,14 @@ slotOutputFile() - + slotComputeDist() slotClearCoords() slotInputFile() slotOutputFile() slotRunBatch() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index 27f4bc0c..53f15753 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -28,7 +28,7 @@ #include #include -#include //needed for QTimeEdit +#include //needed for TQTimeEdit #include #include #include @@ -37,7 +37,7 @@ //#include ..already included in modcalcapcoord.h -modCalcApCoord::modCalcApCoord(TQWidget *parentSplit, const char *name) : modCalcApCoordDlg(parentSplit,name) { +modCalcApCoord::modCalcApCoord(TQWidget *tqparentSplit, const char *name) : modCalcApCoordDlg(tqparentSplit,name) { showCurrentTime(); ra0Box->setDegType(FALSE); @@ -62,9 +62,9 @@ SkyPoint modCalcApCoord::getEquCoords (void) { void modCalcApCoord::showCurrentTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); } @@ -98,7 +98,7 @@ void modCalcApCoord::slotClearCoords(){ rafBox->clearFields(); decfBox->clearFields(); epoch0Name->setText(""); - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); timBox->setTime(TQTime(0,0,0)); } @@ -111,7 +111,7 @@ void modCalcApCoord::slotComputeCoords(){ SkyPoint sp; sp = getEquCoords(); - sp.apparentCoord(jd0, jd); + sp.aptqparentCoord(jd0, jd); showEquCoords( sp ); } @@ -182,7 +182,7 @@ void modCalcApCoord::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -194,7 +194,7 @@ void modCalcApCoord::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); @@ -309,7 +309,7 @@ void modCalcApCoord::processLines( TQTextStream &istream ) { jd = KStarsDateTime(dtB,utB).djd(); jd0 = dt.djd(); sp = SkyPoint (raB, decB); - sp.apparentCoord(jd0, jd); + sp.aptqparentCoord(jd0, jd); ostream << sp.ra()->toHMSString() << sp.dec()->toDMSString() << endl; } diff --git a/kstars/kstars/tools/modcalcapcoord.h b/kstars/kstars/tools/modcalcapcoord.h index bb9452db..e258e585 100644 --- a/kstars/kstars/tools/modcalcapcoord.h +++ b/kstars/kstars/tools/modcalcapcoord.h @@ -36,6 +36,7 @@ class TQTextStream; class modCalcApCoord : public modCalcApCoordDlg { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ modCalcApCoord(TQWidget *p, const char *n); @@ -46,7 +47,7 @@ public: SkyPoint precess (dms ra0, dms dec0, long double j0, long double jf); /**Apply precession, nutation and aberration corrections to coordinates. */ - SkyPoint apparentCoordinates (dms r0, dms d0, long double j0, long double jf); + SkyPoint aptqparentCoordinates (dms r0, dms d0, long double j0, long double jf); /** Process Lines **/ // void processLines( const TQFile * f ); diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index 5ddec248..b168c36e 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -1,10 +1,10 @@ modCalcApCoordDlg - + modCalcApCoordDlg - + 0 0 @@ -13,7 +13,7 @@ - Apparent Coordinates + Aptqparent Coordinates StrongFocus @@ -22,11 +22,11 @@ unnamed - + InteractiveTab - + tab @@ -37,15 +37,15 @@ unnamed - + - layout11 + tqlayout11 unnamed - + InputBox @@ -56,7 +56,7 @@ unnamed - + dateLabel @@ -64,7 +64,7 @@ Date: - + timeLabel @@ -82,14 +82,14 @@ Fixed - + 40 20 - + timBox @@ -98,7 +98,7 @@ datBox - + 100 0 @@ -110,7 +110,7 @@ - + origCoordBox @@ -125,7 +125,7 @@ ra0Box - + 100 0 @@ -139,7 +139,7 @@ dec0Box - + 100 0 @@ -149,7 +149,7 @@ StrongFocus - + dec0Label @@ -157,7 +157,7 @@ Declination: - + ra0Label @@ -178,7 +178,7 @@ - + epoch0Label @@ -190,9 +190,9 @@ - + - layout3 + tqlayout3 @@ -208,7 +208,7 @@ Expanding - + 81 20 @@ -233,7 +233,7 @@ Expanding - + 70 20 @@ -258,7 +258,7 @@ Expanding - + 91 20 @@ -267,12 +267,12 @@ - + outputBox - Apparent Coordinates + Aptqparent Coordinates @@ -288,22 +288,22 @@ Expanding - + 102 20 - + - layout12 + tqlayout12 unnamed - + rafLabel @@ -311,7 +311,7 @@ Right ascension: - + decfLabel @@ -323,7 +323,7 @@ rafBox - + 100 0 @@ -337,7 +337,7 @@ decfBox - + 100 0 @@ -359,7 +359,7 @@ Expanding - + 70 20 @@ -378,7 +378,7 @@ Expanding - + 20 70 @@ -387,7 +387,7 @@ - + tab @@ -398,7 +398,7 @@ unnamed - + InputBox_2_2 @@ -440,7 +440,7 @@ false - + 100 0 @@ -457,7 +457,7 @@ false - + 100 0 @@ -467,7 +467,7 @@ StrongFocus - + utCheckBatch @@ -481,7 +481,7 @@ true - + utBoxBatch @@ -489,7 +489,7 @@ false - + dateCheckBatch @@ -500,7 +500,7 @@ true - + decCheckBatch @@ -511,7 +511,7 @@ true - + epochCheckBatch @@ -526,14 +526,14 @@ false - + 100 0 - + raCheckBatch @@ -546,7 +546,7 @@ - + buttonGroup4 @@ -557,7 +557,7 @@ unnamed - + allRadioBatch @@ -565,7 +565,7 @@ All parameters - + inputRadioBatch @@ -578,7 +578,7 @@ - + groupBox4_2 @@ -589,7 +589,7 @@ unnamed - + InputButtonBatch @@ -600,17 +600,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -623,9 +623,9 @@ - + - layout14 + tqlayout14 @@ -641,7 +641,7 @@ Expanding - + 151 21 @@ -674,7 +674,7 @@ Expanding - + 131 21 @@ -693,7 +693,7 @@ Expanding - + 20 31 @@ -842,7 +842,7 @@ OutputLineEditBatch runButtonBatch - + slotComputeCoords() slotRadioBatch() slotUtCheckedBatch() @@ -854,8 +854,8 @@ slotRunBatch() slotInputFile() slotOutputFile() - - + + dmsbox.h diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index a2dee393..0175edc7 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -27,7 +27,7 @@ #include "kstarsdatetime.h" #include "libkdeedu/extdate/extdatetimeedit.h" -#include //need for QTimeEdit +#include //need for TQTimeEdit #include #include #include @@ -36,7 +36,7 @@ #include -modCalcAzel::modCalcAzel(TQWidget *parentSplit, const char *name) : modCalcAzelDlg (parentSplit,name) { +modCalcAzel::modCalcAzel(TQWidget *tqparentSplit, const char *name) : modCalcAzelDlg (tqparentSplit,name) { showCurrentDateTime(); initGeo(); @@ -79,9 +79,9 @@ SkyPoint modCalcAzel::getHorCoords (void) void modCalcAzel::showCurrentDateTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -130,7 +130,7 @@ void modCalcAzel::getGeoLocation (void) void modCalcAzel::initGeo(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars geoPlace = new GeoLocation( ks->geo() ); } @@ -139,7 +139,7 @@ void modCalcAzel::initGeo(void) void modCalcAzel::showLongLat(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars longBox->show( ks->geo()->lng() ); latBox->show( ks->geo()->lat() ); longBoxBatch->show( ks->geo()->lng() ); @@ -179,7 +179,7 @@ void modCalcAzel::slotClearCoords() elBox->clearFields(); epochName->setText(""); - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); timBox->setTime(TQTime(0,0,0)); } @@ -197,7 +197,7 @@ void modCalcAzel::slotComputeCoords() if(radioApCoords->isChecked()) { sp = getEquCoords(); - sp.apparentCoord(jd0, jd); + sp.aptqparentCoord(jd0, jd); dms lat(getLatitude()); sp.EquatorialToHorizontal( &LST, &lat ); showHorCoords( sp ); @@ -328,7 +328,7 @@ void modCalcAzel::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -340,7 +340,7 @@ void modCalcAzel::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); @@ -488,7 +488,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { ostream << decB.toDMSString() << space; sp = SkyPoint (raB, decB); - sp.apparentCoord(jd0, jdf); + sp.aptqparentCoord(jd0, jdf); sp.EquatorialToHorizontal( &LST, &latB ); ostream << sp.az()->toDMSString() << space << sp.alt()->toDMSString() << endl; diff --git a/kstars/kstars/tools/modcalcazel.h b/kstars/kstars/tools/modcalcazel.h index d7dae29a..ca487e47 100644 --- a/kstars/kstars/tools/modcalcazel.h +++ b/kstars/kstars/tools/modcalcazel.h @@ -35,6 +35,7 @@ class dms; class modCalcAzel : public modCalcAzelDlg { Q_OBJECT + TQ_OBJECT public: modCalcAzel(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index 0e1bb9fc..f3c505ed 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -1,13 +1,13 @@ modCalcAzelDlg - + modCalcAzelDlg true - + 0 0 @@ -22,11 +22,11 @@ unnamed - + tabWidget3 - + tab @@ -37,7 +37,7 @@ unnamed - + inputGroupBox @@ -48,9 +48,9 @@ unnamed - + - layout20 + tqlayout20 @@ -64,7 +64,7 @@ StrongFocus - + timBox @@ -77,7 +77,7 @@ - + timLabel @@ -85,7 +85,7 @@ Universal time: - + dateLabel @@ -105,22 +105,22 @@ Fixed - + 20 20 - + - layout11 + tqlayout11 unnamed - + longLabel @@ -132,7 +132,7 @@ longBox - + 100 0 @@ -142,7 +142,7 @@ StrongFocus - + latLabel @@ -154,7 +154,7 @@ latBox - + 100 0 @@ -168,7 +168,7 @@ - + buttonGroup4_2 @@ -179,18 +179,18 @@ unnamed - + radioApCoords - Apparent coordinates + Aptqparent coordinates true - + radioHorCoords @@ -200,7 +200,7 @@ - + Layout10 @@ -214,17 +214,17 @@ 6 - + Compute - + 0 25 - + 120 32767 @@ -234,17 +234,17 @@ Convert - + Clear - + 0 25 - + 120 32767 @@ -256,15 +256,15 @@ - + - layout21 + tqlayout21 unnamed - + GroupBox2 @@ -275,7 +275,7 @@ unnamed - + raLabel @@ -290,7 +290,7 @@ true - + 100 0 @@ -300,7 +300,7 @@ StrongFocus - + decLabel @@ -312,7 +312,7 @@ decBox - + 100 0 @@ -322,7 +322,7 @@ StrongFocus - + epochName @@ -334,14 +334,14 @@ 0 - + 32767 32767 - + epochLabel @@ -361,14 +361,14 @@ Fixed - + 16 20 - + GroupBox3 @@ -383,7 +383,7 @@ azBox - + 100 0 @@ -393,7 +393,7 @@ StrongFocus - + azLabel @@ -401,7 +401,7 @@ Azimuth: - + elLabel @@ -413,7 +413,7 @@ elBox - + 100 0 @@ -437,7 +437,7 @@ Expanding - + 20 77 @@ -446,7 +446,7 @@ - + tab @@ -457,7 +457,7 @@ unnamed - + InputBox_2_2 @@ -479,7 +479,7 @@ unnamed - + utCheckBatch @@ -493,7 +493,7 @@ false - + dateCheckBatch @@ -504,7 +504,7 @@ false - + raCheckBatch @@ -515,7 +515,7 @@ true - + decCheckBatch @@ -526,7 +526,7 @@ true - + epochCheckBatch @@ -534,7 +534,7 @@ Epoch: - + utBoxBatch @@ -557,7 +557,7 @@ false - + 100 0 @@ -574,7 +574,7 @@ false - + 100 0 @@ -597,7 +597,7 @@ - + azCheckBatch @@ -615,7 +615,7 @@ true - + 100 0 @@ -632,7 +632,7 @@ false - + 100 0 @@ -649,7 +649,7 @@ false - + 100 0 @@ -659,7 +659,7 @@ StrongFocus - + latCheckBatch @@ -677,7 +677,7 @@ true - + 100 0 @@ -687,7 +687,7 @@ StrongFocus - + longCheckBatch @@ -698,7 +698,7 @@ false - + elCheckBatch @@ -713,7 +713,7 @@ dateBoxBatch - + 100 0 @@ -722,7 +722,7 @@ - + buttonGroup4 @@ -733,7 +733,7 @@ unnamed - + allRadioBatch @@ -741,7 +741,7 @@ All parameters - + inputRadioBatch @@ -754,7 +754,7 @@ - + groupBox4_2 @@ -765,7 +765,7 @@ unnamed - + InputButtonBatch @@ -776,17 +776,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -799,9 +799,9 @@ - + - layout14 + tqlayout14 @@ -817,7 +817,7 @@ Expanding - + 151 21 @@ -850,7 +850,7 @@ Expanding - + 131 21 @@ -869,7 +869,7 @@ Expanding - + 20 31 @@ -1041,7 +1041,7 @@ OutButtonBatch runButtonBatch - + slotClearCoords() slotComputeCoords() slotInputFile() @@ -1057,8 +1057,8 @@ slotAzChecked() slotElChecked() newSlot() - - + + dmsbox.h diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp index dcfba7bd..66a41bef 100644 --- a/kstars/kstars/tools/modcalcdaylength.cpp +++ b/kstars/kstars/tools/modcalcdaylength.cpp @@ -30,7 +30,7 @@ #include -modCalcDayLength::modCalcDayLength(TQWidget *parentSplit, const char *name) : modCalcDayLengthDlg(parentSplit,name) { +modCalcDayLength::modCalcDayLength(TQWidget *tqparentSplit, const char *name) : modCalcDayLengthDlg(tqparentSplit,name) { showCurrentDate(); initGeo(); show(); @@ -40,13 +40,13 @@ modCalcDayLength::~modCalcDayLength() {} void modCalcDayLength::showCurrentDate (void) { - KStarsDateTime dt( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); } void modCalcDayLength::initGeo(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars geoPlace = ks->geo(); longBox->show( geoPlace->lng() ); latBox->show( geoPlace->lat() ); @@ -71,7 +71,7 @@ void modCalcDayLength::slotClearCoords(){ elTransitBox->clearFields(); // reset to current date - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); // reset times to 00:00:00 setTimeBox->clearFields(); @@ -82,9 +82,9 @@ void modCalcDayLength::slotClearCoords(){ dayLBox->clearFields(); } -TQTime modCalcDayLength::lengthOfDay(TQTime setQTime, TQTime riseQTime){ +TQTime modCalcDayLength::lengthOfDay(TQTime setTQTime, TQTime riseTQTime){ TQTime dL(0,0,0); - int dds = riseQTime.secsTo(setQTime); + int dds = riseTQTime.secsTo(setTQTime); TQTime dLength = dL.addSecs( dds ); return dLength; @@ -96,37 +96,37 @@ void modCalcDayLength::slotComputePosTime() getGeoLocation(); KSNumbers * num = new KSNumbers(jd0); - KSSun *Sun = new KSSun(((KStars*) parent()->parent()->parent())->data()); + KSSun *Sun = new KSSun(((KStars*) tqparent()->tqparent()->tqparent())->data()); Sun->findPosition(num); - TQTime setQtime = Sun->riseSetTime( jd0 , geoPlace, false ); - TQTime riseQtime = Sun->riseSetTime( jd0 , geoPlace, true ); - TQTime transitQtime = Sun->transitTime(jd0 , geoPlace); + TQTime setTQtime = Sun->riseSetTime( jd0 , geoPlace, false ); + TQTime riseTQtime = Sun->riseSetTime( jd0 , geoPlace, true ); + TQTime transitTQtime = Sun->transitTime(jd0 , geoPlace); dms setAz = Sun->riseSetTimeAz(jd0, geoPlace, false); dms riseAz = Sun->riseSetTimeAz(jd0, geoPlace, true); dms transAlt = Sun->transitAltitude(jd0, geoPlace); - if (setQtime.isValid() ) { + if (setTQtime.isValid() ) { azSetBox->show( setAz ); elTransitBox->show( transAlt ); azRiseBox->show( riseAz ); - setTimeBox->showTime( setQtime ); - riseTimeBox->showTime( riseQtime ); - transitTimeBox->showTime( transitQtime ); + setTimeBox->showTime( setTQtime ); + riseTimeBox->showTime( riseTQtime ); + transitTimeBox->showTime( transitTQtime ); - TQTime dayLQtime = lengthOfDay (setQtime,riseQtime); + TQTime dayLTQtime = lengthOfDay (setTQtime,riseTQtime); - dayLBox->showTime( dayLQtime ); + dayLBox->showTime( dayLTQtime ); } else if (transAlt.Degrees() > 0. ) { azSetBox->setDMS(i18n("Circumpolar")); elTransitBox->show( transAlt ); azRiseBox->setDMS(i18n("Circumpolar")); - setTimeBox->showTime( setQtime ); - riseTimeBox->showTime( riseQtime ); - transitTimeBox->showTime( transitQtime ); + setTimeBox->showTime( setTQtime ); + riseTimeBox->showTime( riseTQtime ); + transitTimeBox->showTime( transitTQtime ); dayLBox->setEntry("24:00:00"); diff --git a/kstars/kstars/tools/modcalcdaylength.h b/kstars/kstars/tools/modcalcdaylength.h index 4ad88142..9565a5c4 100644 --- a/kstars/kstars/tools/modcalcdaylength.h +++ b/kstars/kstars/tools/modcalcdaylength.h @@ -30,6 +30,7 @@ class GeoLocation; class modCalcDayLength : public modCalcDayLengthDlg { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ modCalcDayLength(TQWidget *p, const char *n); @@ -44,7 +45,7 @@ public slots: private: /**@returns a SkyPoint constructed from the coordinates in the RA and Dec dmsBoxes. */ - TQTime lengthOfDay(TQTime setQTime, TQTime riseQTime); + TQTime lengthOfDay(TQTime setTQTime, TQTime riseTQTime); /**Fills the Date fields with the current values from the current date. */ void showCurrentDate(void); diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index d5d5c1f8..9059583a 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -1,10 +1,10 @@ modCalcDayLengthDlg - + modCalcDayLengthDlg - + 0 0 @@ -25,7 +25,7 @@ 6 - + InputBox @@ -36,15 +36,15 @@ unnamed - + - layout37 + tqlayout37 unnamed - + latLabel @@ -56,7 +56,7 @@ latBox - + 100 16 @@ -66,7 +66,7 @@ StrongFocus - + longLabel @@ -78,7 +78,7 @@ longBox - + 100 16 @@ -100,14 +100,14 @@ Expanding - + 60 20 - + datLabel @@ -127,7 +127,7 @@ 0 - + 120 0 @@ -147,7 +147,7 @@ Expanding - + 40 20 @@ -156,9 +156,9 @@ - + - layout3 + tqlayout3 @@ -174,7 +174,7 @@ Expanding - + 71 21 @@ -199,7 +199,7 @@ Expanding - + 51 20 @@ -224,7 +224,7 @@ Expanding - + 81 20 @@ -233,7 +233,7 @@ - + resultsBox @@ -244,9 +244,9 @@ unnamed - + - layout10 + tqlayout10 @@ -264,7 +264,7 @@ 0 - + 90 20 @@ -274,7 +274,7 @@ NoFocus - + riseTimeLabel @@ -294,7 +294,7 @@ 0 - + 90 20 @@ -304,7 +304,7 @@ NoFocus - + transitTimeLabel @@ -312,7 +312,7 @@ Noon: - + dayLLabel @@ -332,7 +332,7 @@ 0 - + 90 20 @@ -354,7 +354,7 @@ 0 - + 90 20 @@ -364,7 +364,7 @@ NoFocus - + setTimeLabel @@ -384,22 +384,22 @@ Expanding - + 20 20 - + - layout20 + tqlayout20 unnamed - + azRiseLabel @@ -407,7 +407,7 @@ Sunrise azimuth: - + azSetLabel @@ -427,7 +427,7 @@ 0 - + 100 0 @@ -437,7 +437,7 @@ NoFocus - + elTransitLabel @@ -457,7 +457,7 @@ 0 - + 100 0 @@ -479,7 +479,7 @@ 0 - + 100 0 @@ -499,7 +499,7 @@ Expanding - + 40 20 @@ -518,7 +518,7 @@ Expanding - + 30 20 @@ -537,7 +537,7 @@ Expanding - + 20 110 @@ -635,11 +635,11 @@ azSetBox azRiseBox - + slotComputePosTime() slotClearCoords() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp index c2873aa1..2f009378 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.cpp +++ b/kstars/kstars/tools/modcalceclipticcoords.cpp @@ -35,7 +35,7 @@ #include -modCalcEclCoords::modCalcEclCoords(TQWidget *parentSplit, const char *name) : modCalcEclCoordsDlg(parentSplit,name) { +modCalcEclCoords::modCalcEclCoords(TQWidget *tqparentSplit, const char *name) : modCalcEclCoordsDlg(tqparentSplit,name) { equRadio->setChecked(TRUE); raBox->setDegType(FALSE); @@ -223,7 +223,7 @@ void modCalcEclCoords::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -235,7 +235,7 @@ void modCalcEclCoords::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalceclipticcoords.h b/kstars/kstars/tools/modcalceclipticcoords.h index 4a421214..49f85888 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.h +++ b/kstars/kstars/tools/modcalceclipticcoords.h @@ -27,13 +27,14 @@ class TQString; * Class which implements the KStars calculator module to compute * geocentric ecliptic coordinates to/from geocentric equatorial coordinates. * - * Inherits QWidget + * Inherits TQWidget *@author Pablo de Vicente */ class modCalcEclCoords : public modCalcEclCoordsDlg { Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index 1a164a9b..785398d0 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -1,10 +1,10 @@ modCalcEclCoordsDlg - + modCalcEclCoordsDlg - + 0 0 @@ -19,14 +19,14 @@ unnamed - + tabWidget8 StrongFocus - + tab @@ -37,7 +37,7 @@ unnamed - + ButtonGroup1 @@ -58,14 +58,14 @@ Expanding - + 97 21 - + equRadio @@ -86,14 +86,14 @@ Expanding - + 96 21 - + eclRadio @@ -114,7 +114,7 @@ Expanding - + 97 21 @@ -123,9 +123,9 @@ - + - layout2 + tqlayout2 @@ -141,7 +141,7 @@ Expanding - + 51 21 @@ -166,7 +166,7 @@ Expanding - + 51 21 @@ -191,7 +191,7 @@ Expanding - + 71 21 @@ -200,15 +200,15 @@ - + - layout9 + tqlayout9 unnamed - + equBox @@ -231,7 +231,7 @@ 0 - + 100 0 @@ -241,7 +241,7 @@ StrongFocus - + raLabel @@ -261,7 +261,7 @@ 0 - + 100 0 @@ -271,7 +271,7 @@ StrongFocus - + decLabel @@ -279,7 +279,7 @@ Declination: - + epochLabel @@ -318,14 +318,14 @@ Fixed - + 16 20 - + groupBox7 @@ -336,15 +336,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + bgLabel @@ -352,7 +352,7 @@ Latitude: - + lgLabel @@ -372,7 +372,7 @@ 0 - + 100 0 @@ -394,7 +394,7 @@ 0 - + 100 0 @@ -416,7 +416,7 @@ Expanding - + 230 20 @@ -437,7 +437,7 @@ Expanding - + 20 110 @@ -446,7 +446,7 @@ - + tab @@ -457,7 +457,7 @@ unnamed - + InputBox_2_2_2 @@ -486,7 +486,7 @@ false - + 100 0 @@ -503,7 +503,7 @@ false - + 100 0 @@ -513,7 +513,7 @@ StrongFocus - + raCheckBatch @@ -527,7 +527,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + decCheckBatch @@ -548,7 +548,7 @@ false - + 100 0 @@ -565,7 +565,7 @@ false - + 100 0 @@ -594,7 +594,7 @@ 1950.0 - + epochCheckBatch @@ -611,7 +611,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + eclLongCheckBatch @@ -628,7 +628,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + eclLatCheckBatch @@ -647,7 +647,7 @@ - + buttonFieldsGroup @@ -658,7 +658,7 @@ unnamed - + allRadioBatch @@ -666,7 +666,7 @@ All parameters - + inputRadioBatch @@ -679,7 +679,7 @@ - + groupFilesBox @@ -690,7 +690,7 @@ unnamed - + InputButtonBatch @@ -701,17 +701,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -724,9 +724,9 @@ - + - layout22_3 + tqlayout22_3 @@ -742,7 +742,7 @@ Expanding - + 151 21 @@ -775,7 +775,7 @@ Expanding - + 131 21 @@ -794,7 +794,7 @@ Expanding - + 31 16 @@ -891,7 +891,7 @@ slotOutputFile() - + slotComputeCoords() slotClearCoords() slotEclLatCheckedBatch() @@ -902,8 +902,8 @@ slotInputFile() slotOutputFile() slotRunBatch() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index ba749698..3abbc019 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -33,8 +33,8 @@ #include #include -modCalcEquinox::modCalcEquinox(TQWidget *parentSplit, const char *name) - : modCalcEquinoxDlg (parentSplit,name) { +modCalcEquinox::modCalcEquinox(TQWidget *tqparentSplit, const char *name) + : modCalcEquinoxDlg (tqparentSplit,name) { showCurrentYear(); show(); } @@ -56,15 +56,15 @@ int modCalcEquinox::getYear (TQString eName) void modCalcEquinox::showCurrentYear (void) { - KStarsDateTime dt( KStarsDateTime::currentDateTime() ); - yearEdit->setText( TQString( "%1").arg( dt.date().year() ) ); + KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); + yearEdit->setText( TQString( "%1").tqarg( dt.date().year() ) ); } void modCalcEquinox::slotComputeEquinoxesAndSolstices (void) { long double julianDay = 0., jdf = 0.; float deltaJd; - KStarsData *kd = (KStarsData*) parent()->parent()->parent(); + KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); KSSun *Sun = new KSSun(kd); int year0 = getYear( yearEdit->text() ); @@ -104,7 +104,7 @@ void modCalcEquinox::showStartDateTime(long double jd) void modCalcEquinox::showSeasonDuration(float deltaJd) { - seasonDuration->setText( TQString( "%1").arg( deltaJd ) ); + seasonDuration->setText( TQString( "%1").tqarg( deltaJd ) ); } void modCalcEquinox::slotYearCheckedBatch(){ @@ -138,7 +138,7 @@ void modCalcEquinox::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -150,7 +150,7 @@ void modCalcEquinox::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); @@ -174,7 +174,7 @@ void modCalcEquinox::processLines( TQTextStream &istream ) { int yearB; int i = 0; long double jdsp = 0., jdsu = 0., jdau = 0., jdwin = 0., jdsp1 = 0.; - KStarsData *kd = (KStarsData*) parent()->parent()->parent(); + KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); KSSun *Sun = new KSSun(kd); while ( ! istream.eof() ) { diff --git a/kstars/kstars/tools/modcalcequinox.h b/kstars/kstars/tools/modcalcequinox.h index 71a42818..2480f9cd 100644 --- a/kstars/kstars/tools/modcalcequinox.h +++ b/kstars/kstars/tools/modcalcequinox.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef MODCALCEQUINOX_H -#define MODCALCEQUINOX_H +#ifndef MODCALCETQUINOX_H +#define MODCALCETQUINOX_H #include #include @@ -32,6 +32,7 @@ class TQTextStream; class modCalcEquinox : public modCalcEquinoxDlg { Q_OBJECT + TQ_OBJECT public: modCalcEquinox(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index 025802ba..3866c300 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -1,10 +1,10 @@ modCalcEquinoxDlg - + modCalcEquinoxDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + tabWidget3 - + tab @@ -34,7 +34,7 @@ unnamed - + groupBox6 @@ -61,14 +61,14 @@ Expanding - + 70 21 - + Spring Equinox @@ -103,14 +103,14 @@ Expanding - + 20 21 - + textLabel1 @@ -133,7 +133,7 @@ Expanding - + 30 31 @@ -142,9 +142,9 @@ - + - layout2 + tqlayout2 @@ -160,7 +160,7 @@ Expanding - + 81 20 @@ -185,7 +185,7 @@ Expanding - + 51 20 @@ -210,7 +210,7 @@ Expanding - + 91 21 @@ -219,7 +219,7 @@ - + groupBox7 @@ -238,7 +238,7 @@ NoFocus - + textLabel3 @@ -246,7 +246,7 @@ Duration of the season: - + textLabel2 @@ -271,7 +271,7 @@ Expanding - + 41 237 @@ -280,7 +280,7 @@ - + tab @@ -291,7 +291,7 @@ unnamed - + InputBox_2_2 @@ -313,7 +313,7 @@ unnamed - + yearCheckBatch @@ -334,7 +334,7 @@ Expanding - + 111 21 @@ -351,7 +351,7 @@ - + buttonFieldsGroup @@ -362,7 +362,7 @@ unnamed - + allRadioBatch @@ -370,7 +370,7 @@ All parameters - + inputRadioBatch @@ -383,7 +383,7 @@ - + groupFilesBox @@ -394,7 +394,7 @@ unnamed - + InputButtonBatch @@ -405,17 +405,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -428,9 +428,9 @@ - + - layout22 + tqlayout22 @@ -446,7 +446,7 @@ Expanding - + 151 21 @@ -479,7 +479,7 @@ Expanding - + 131 21 @@ -498,7 +498,7 @@ Expanding - + 41 71 @@ -559,13 +559,13 @@ slotRunBatch() - + slotComputeEquinoxesAndSolstices() slotInputFile() slotOutputFile() slotRunBatch() - - + + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp index 18638a6c..1f371d42 100644 --- a/kstars/kstars/tools/modcalcgalcoord.cpp +++ b/kstars/kstars/tools/modcalcgalcoord.cpp @@ -34,7 +34,7 @@ #include -modCalcGalCoord::modCalcGalCoord(TQWidget *parentSplit, const char *name) : modCalcGalCoordDlg(parentSplit,name) { +modCalcGalCoord::modCalcGalCoord(TQWidget *tqparentSplit, const char *name) : modCalcGalCoordDlg(tqparentSplit,name) { equRadio->setChecked(TRUE); raBox->setDegType(FALSE); @@ -225,7 +225,7 @@ void modCalcGalCoord::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -237,7 +237,7 @@ void modCalcGalCoord::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcgalcoord.h b/kstars/kstars/tools/modcalcgalcoord.h index b8b918b5..21fbb289 100644 --- a/kstars/kstars/tools/modcalcgalcoord.h +++ b/kstars/kstars/tools/modcalcgalcoord.h @@ -25,7 +25,7 @@ * Class which implements the KStars calculator module to compute * Galactic coordinates to/from Equatorial coordinates. * - * Inherits QWidget + * Inherits TQWidget *@author Pablo de Vicente *@version 0.9 */ @@ -33,6 +33,7 @@ class modCalcGalCoord : public modCalcGalCoordDlg { Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index dfb59183..08d1bde5 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -1,10 +1,10 @@ modCalcGalCoordDlg - + modCalcGalCoordDlg - + 0 0 @@ -19,14 +19,14 @@ unnamed - + tabWidget8 StrongFocus - + tab @@ -37,7 +37,7 @@ unnamed - + ButtonGroup1 @@ -58,14 +58,14 @@ Expanding - + 97 21 - + equRadio @@ -86,14 +86,14 @@ Expanding - + 96 21 - + galRadio @@ -114,7 +114,7 @@ Expanding - + 97 21 @@ -123,9 +123,9 @@ - + - layout2 + tqlayout2 @@ -141,7 +141,7 @@ Expanding - + 51 21 @@ -166,7 +166,7 @@ Expanding - + 51 21 @@ -191,7 +191,7 @@ Expanding - + 71 21 @@ -200,15 +200,15 @@ - + - layout22 + tqlayout22 unnamed - + equBox @@ -231,7 +231,7 @@ 0 - + 100 0 @@ -241,7 +241,7 @@ StrongFocus - + raLabel @@ -261,7 +261,7 @@ 0 - + 100 0 @@ -271,7 +271,7 @@ StrongFocus - + epochLabel @@ -279,7 +279,7 @@ Epoch: - + decLabel @@ -318,14 +318,14 @@ Fixed - + 15 20 - + groupBox7 @@ -336,15 +336,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + bgLabel @@ -352,7 +352,7 @@ Latitude: - + lgLabel @@ -372,7 +372,7 @@ 0 - + 100 0 @@ -394,7 +394,7 @@ 0 - + 100 0 @@ -420,7 +420,7 @@ Expanding - + 20 160 @@ -429,7 +429,7 @@ - + tab @@ -440,7 +440,7 @@ unnamed - + InputBox_2_2_2 @@ -469,7 +469,7 @@ false - + 100 0 @@ -486,7 +486,7 @@ false - + 100 0 @@ -515,7 +515,7 @@ 1950.0 - + raCheckBatch @@ -529,7 +529,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + decCheckBatch @@ -543,7 +543,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + epochCheckBatch @@ -560,7 +560,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + galLongCheckBatch @@ -577,7 +577,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + galLatCheckBatch @@ -601,7 +601,7 @@ false - + 100 0 @@ -618,7 +618,7 @@ false - + 100 0 @@ -630,7 +630,7 @@ - + buttonFieldsGroup @@ -641,7 +641,7 @@ unnamed - + allRadioBatch @@ -649,7 +649,7 @@ All parameters - + inputRadioBatch @@ -662,7 +662,7 @@ - + groupFilesBox @@ -673,7 +673,7 @@ unnamed - + InputButtonBatch @@ -684,17 +684,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -707,9 +707,9 @@ - + - layout22_3 + tqlayout22_3 @@ -725,7 +725,7 @@ Expanding - + 151 21 @@ -758,7 +758,7 @@ Expanding - + 131 21 @@ -777,7 +777,7 @@ Expanding - + 31 71 @@ -902,7 +902,7 @@ OutButtonBatch runButtonBatch - + slotComputeCoords() slotClearCoords() slotInputFile() @@ -913,8 +913,8 @@ slotGalLatCheckedBatch() slotGalLongCheckedBatch() slotRunBatch() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index dd03ccd2..1cda2504 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -37,7 +37,7 @@ #include -modCalcGeodCoord::modCalcGeodCoord(TQWidget *parentSplit, const char *name) : modCalcGeodCoordDlg(parentSplit,name) { +modCalcGeodCoord::modCalcGeodCoord(TQWidget *tqparentSplit, const char *name) : modCalcGeodCoordDlg(tqparentSplit,name) { static const char *ellipsoidList[] = { "IAU76", "GRS80", "MERIT83", "WGS84", "IERS89"}; @@ -58,7 +58,7 @@ modCalcGeodCoord::~modCalcGeodCoord(){ void modCalcGeodCoord::showLongLat(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars lonGeoBox->show( ks->geo()->lng() ); latGeoBox->show( ks->geo()->lat() ); altGeoBox->setText( TQString("0.0") ); @@ -236,7 +236,7 @@ void modCalcGeodCoord::slotRunBatch(void) { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -248,7 +248,7 @@ void modCalcGeodCoord::slotRunBatch(void) { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcgeodcoord.h b/kstars/kstars/tools/modcalcgeodcoord.h index 2d8fd186..d9c3015d 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.h +++ b/kstars/kstars/tools/modcalcgeodcoord.h @@ -24,7 +24,7 @@ * Class which implements the KStars calculator module to compute * Geodetic coordinates to/from Cartesian coordinates. * - * Inherits QVBox + * Inherits TQVBox *@author Pablo de Vicente *@version 0.9 */ @@ -38,6 +38,7 @@ class GeoLocation; class modCalcGeodCoord : public modCalcGeodCoordDlg { Q_OBJECT + TQ_OBJECT public: modCalcGeodCoord(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index 890eb4c0..85896689 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -1,10 +1,10 @@ modCalcGeodCoordDlg - + modCalcGeodCoordDlg - + 0 0 @@ -19,14 +19,14 @@ unnamed - + tabWidget StrongFocus - + tab @@ -37,15 +37,15 @@ unnamed - + - layout31 + tqlayout31 unnamed - + InputBox @@ -56,15 +56,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + cartRadio @@ -72,7 +72,7 @@ Cartesian - + spheRadio @@ -90,7 +90,7 @@ - + groupBox11 @@ -110,9 +110,9 @@ - + - layout2 + tqlayout2 @@ -128,7 +128,7 @@ Expanding - + 81 20 @@ -153,7 +153,7 @@ Expanding - + 51 20 @@ -178,7 +178,7 @@ Expanding - + 91 21 @@ -187,15 +187,15 @@ - + - layout32 + tqlayout32 unnamed - + cartBox @@ -206,7 +206,7 @@ unnamed - + yLabel @@ -214,7 +214,7 @@ Y (km): - + zLabel @@ -222,7 +222,7 @@ Z (km): - + xLabel @@ -247,7 +247,7 @@ - + spheBox @@ -262,7 +262,7 @@ lonGeoBox - + 70 0 @@ -276,7 +276,7 @@ latGeoBox - + 70 0 @@ -286,7 +286,7 @@ StrongFocus - + latLabel @@ -294,7 +294,7 @@ Latitude: - + longLabel @@ -302,7 +302,7 @@ Longitude: - + TextLabel3_2 @@ -332,7 +332,7 @@ Expanding - + 20 120 @@ -341,7 +341,7 @@ - + tab @@ -352,7 +352,7 @@ unnamed - + InputBox_2_2 @@ -428,7 +428,7 @@ false - + longCheckBatch @@ -439,7 +439,7 @@ true - + latCheckBatch @@ -450,7 +450,7 @@ true - + elevCheckBatch @@ -461,7 +461,7 @@ true - + xCheckBatch @@ -475,7 +475,7 @@ false - + yCheckBatch @@ -489,7 +489,7 @@ false - + zCheckBatch @@ -505,7 +505,7 @@ - + buttonFieldsGroup @@ -516,7 +516,7 @@ unnamed - + allRadioBatch @@ -524,7 +524,7 @@ All parameters - + inputRadioBatch @@ -537,7 +537,7 @@ - + groupFilesBox @@ -548,7 +548,7 @@ unnamed - + InputButtonBatch @@ -559,17 +559,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -582,9 +582,9 @@ - + - layout22 + tqlayout22 @@ -600,7 +600,7 @@ Expanding - + 151 21 @@ -633,7 +633,7 @@ Expanding - + 131 21 @@ -652,7 +652,7 @@ Expanding - + 20 41 @@ -787,7 +787,7 @@ OutputLineEditBatch runButtonBatch - + slotComputeGeoCoords() slotClearGeoCoords() slotInputFile() @@ -799,8 +799,8 @@ slotXCheckedBatch() slotYCheckedBatch() slotZCheckedBatch() - - + + kcombobox.h klineedit.h diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 99271d34..4bacb940 100644 --- a/kstars/kstars/tools/modcalcjd.cpp +++ b/kstars/kstars/tools/modcalcjd.cpp @@ -22,7 +22,7 @@ #include "geolocation.h" #include "libkdeedu/extdate/extdatetimeedit.h" -#include //need for QTimeEdit +#include //need for TQTimeEdit #include #include #include @@ -32,7 +32,7 @@ #define MJD0 2400000.5 -modCalcJD::modCalcJD(TQWidget *parentSplit, const char *name) : modCalcJdDlg(parentSplit,name) { +modCalcJD::modCalcJD(TQWidget *tqparentSplit, const char *name) : modCalcJdDlg(tqparentSplit,name) { showCurrentTime(); show(); @@ -95,15 +95,15 @@ void modCalcJD::slotClearTime (void) { JdName->setText (""); MjdName->setText (""); - datBox->setDate( ExtDate::currentDate() ); + datBox->setDate( ExtDate::tqcurrentDate() ); timBox->setTime(TQTime(0,0,0)); } void modCalcJD::showCurrentTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); computeFromCalendar(); diff --git a/kstars/kstars/tools/modcalcjd.h b/kstars/kstars/tools/modcalcjd.h index c7505b7a..bbd08e69 100644 --- a/kstars/kstars/tools/modcalcjd.h +++ b/kstars/kstars/tools/modcalcjd.h @@ -27,7 +27,7 @@ * Class for KStars module which computes JD, MJD and Date/Time from the * any of the other entries. * - * Inherits QVBox + * Inherits TQVBox *@author Pablo de Vicente *@version 0.9 */ @@ -39,6 +39,7 @@ class KStarsDateTime; class modCalcJD : public modCalcJdDlg { Q_OBJECT + TQ_OBJECT public: modCalcJD(TQWidget *p, const char *n); ~modCalcJD(); diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index 6550c546..d289bb83 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -1,10 +1,10 @@ modCalcJdDlg - + modCalcJdDlg - + 0 0 @@ -19,7 +19,7 @@ unnamed - + InputBox @@ -38,15 +38,15 @@ unnamed - + - layout9 + tqlayout9 unnamed - + JdRadio @@ -62,7 +62,7 @@ Julian day - + MjdRadio @@ -78,7 +78,7 @@ Modified Julian day - + DateRadio @@ -98,15 +98,15 @@ - + - layout37 + tqlayout37 unnamed - + JdBox @@ -117,7 +117,7 @@ unnamed - + JdLabel @@ -129,7 +129,7 @@ JdName - + 130 0 @@ -138,7 +138,7 @@ - + MjdBox @@ -149,7 +149,7 @@ unnamed - + MjdLabel @@ -161,7 +161,7 @@ MjdName - + 130 0 @@ -172,7 +172,7 @@ - + Datebox @@ -193,14 +193,14 @@ Expanding - + 16 20 - + timeLabel @@ -208,11 +208,11 @@ UT: - + timBox - + 100 0 @@ -229,14 +229,14 @@ Expanding - + 16 20 - + dateLabel @@ -256,7 +256,7 @@ 0 - + 110 0 @@ -273,7 +273,7 @@ Expanding - + 16 20 @@ -282,9 +282,9 @@ - + - layout7 + tqlayout7 @@ -300,7 +300,7 @@ Expanding - + 23 20 @@ -333,7 +333,7 @@ Expanding - + 39 21 @@ -352,13 +352,13 @@ 0 - + 0 25 - + 32767 30 @@ -378,7 +378,7 @@ Expanding - + 37 20 @@ -397,13 +397,13 @@ 0 - + 0 25 - + 32767 30 @@ -423,7 +423,7 @@ Expanding - + 38 20 @@ -442,7 +442,7 @@ Expanding - + 20 30 @@ -494,12 +494,12 @@ slotComputeTime() - + slotClearTime() slotComputeTime() showCurrentTime() - - + + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index e9053bd5..7324fbb2 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -38,7 +38,7 @@ #include -modCalcPlanets::modCalcPlanets(TQWidget *parentSplit, const char *name) : modCalcPlanetsDlg (parentSplit,name) { +modCalcPlanets::modCalcPlanets(TQWidget *tqparentSplit, const char *name) : modCalcPlanetsDlg (tqparentSplit,name) { showCurrentDateTime(); showLongLat(); raBox->setDegType(FALSE); @@ -50,8 +50,8 @@ modCalcPlanets::~modCalcPlanets(){ void modCalcPlanets::showCurrentDateTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); dateBox->setDate( dt.date() ); timeBox->setTime( dt.time() ); @@ -68,7 +68,7 @@ KStarsDateTime modCalcPlanets::getDateTime (void) void modCalcPlanets::showLongLat(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars longBox->show( ks->geo()->lng() ); latBox->show( ks->geo()->lat() ); @@ -90,7 +90,7 @@ GeoLocation modCalcPlanets::getObserverPosition (void) void modCalcPlanets::slotComputePosition (void) { - KStarsData *kd = (KStarsData*) parent()->parent()->parent(); + KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); KStarsDateTime dt = getDateTime(); long double julianDay = dt.djd(); GeoLocation position( getObserverPosition() ); @@ -310,7 +310,7 @@ void modCalcPlanets::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -320,7 +320,7 @@ void modCalcPlanets::slotRunBatch() { processLines(istream); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); @@ -366,7 +366,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { ExtDate dtB; dms longB, latB, hlongB, hlatB, glongB, glatB, raB, decB, azmB, altB; double rSunB(0.0), rEarthB(0.0); - KStarsData *kd = (KStarsData*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars PlanetCatalog PCat( kd ); PCat.initialize(); @@ -397,9 +397,9 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if (fields.count() != numberOfRequiredFields ) { lineIsValid = false; - kdWarning() << i18n( "Incorrect number of fields in line %1: " ).arg(nline) - << i18n( "Present fields %1. " ).arg(fields.count()) - << i18n( "Required fields %1. " ).arg(numberOfRequiredFields) << endl; + kdWarning() << i18n( "Incorrect number of fields in line %1: " ).tqarg(nline) + << i18n( "Present fields %1. " ).tqarg(fields.count()) + << i18n( "Required fields %1. " ).tqarg(numberOfRequiredFields) << endl; nline++; continue; } @@ -419,7 +419,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if (j == 11) { kdWarning() << i18n("Unknown planet ") << fields[i] - << i18n(" in line %1: ").arg(nline) << endl; + << i18n(" in line %1: ").tqarg(nline) << endl; continue; } i++; @@ -441,7 +441,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if(utCheckBatch->isChecked() ) { utB = TQTime::fromString( fields[i] ); if ( !utB.isValid() ) { - kdWarning() << i18n( "Line %1 contains an invalid time" ).arg(nline) << endl; + kdWarning() << i18n( "Line %1 contains an invalid time" ).tqarg(nline) << endl; lineIsValid=false; nline++; continue; @@ -461,7 +461,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if(dateCheckBatch->isChecked() ) { dtB = ExtDate::fromString( fields[i], Qt::ISODate ); if ( !dtB.isValid() ) { - kdWarning() << i18n( "Line %1 contains an invalid date: " ).arg(nline) << + kdWarning() << i18n( "Line %1 contains an invalid date: " ).tqarg(nline) << fields[i] << endl ; lineIsValid=false; nline++; diff --git a/kstars/kstars/tools/modcalcplanets.h b/kstars/kstars/tools/modcalcplanets.h index 359a7074..50c64d8b 100644 --- a/kstars/kstars/tools/modcalcplanets.h +++ b/kstars/kstars/tools/modcalcplanets.h @@ -38,6 +38,7 @@ class KSPluto; class modCalcPlanets : public modCalcPlanetsDlg { Q_OBJECT + TQ_OBJECT public: modCalcPlanets(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 3788816f..061c035a 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -1,10 +1,10 @@ modCalcPlanetsDlg - + modCalcPlanetsDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + Interactive_Mode - + tab @@ -34,7 +34,7 @@ unnamed - + groupBox1 @@ -45,9 +45,9 @@ unnamed - + - layout13 + tqlayout13 @@ -63,14 +63,14 @@ Expanding - + 101 21 - + textLabel1 @@ -78,7 +78,7 @@ Solar system body: - + Mercury @@ -148,7 +148,7 @@ Expanding - + 151 21 @@ -157,17 +157,17 @@ - + - layout14 + tqlayout14 unnamed - + - layout20 + tqlayout20 @@ -177,7 +177,7 @@ dateBox - + 120 0 @@ -187,7 +187,7 @@ StrongFocus - + timeBox @@ -199,14 +199,14 @@ 0 - + 100 0 - + timLabel @@ -214,7 +214,7 @@ Universal time: - + dateLabel @@ -234,22 +234,22 @@ Expanding - + 50 20 - + - layout11 + tqlayout11 unnamed - + longLabel @@ -261,7 +261,7 @@ longBox - + 100 0 @@ -271,7 +271,7 @@ StrongFocus - + latLabel @@ -283,7 +283,7 @@ latBox - + 100 0 @@ -305,7 +305,7 @@ Expanding - + 40 20 @@ -316,15 +316,15 @@ - + - layout13 + tqlayout13 unnamed - + groupBox3 @@ -335,9 +335,9 @@ unnamed - + - layout11 + tqlayout11 @@ -347,14 +347,14 @@ raBox - + 100 0 - + textLabel9 @@ -362,7 +362,7 @@ Right ascension: - + textLabel10 @@ -374,7 +374,7 @@ decBox - + 100 0 @@ -393,7 +393,7 @@ Expanding - + 20 20 @@ -402,7 +402,7 @@ - + groupBox4 @@ -413,15 +413,15 @@ unnamed - + - layout12 + tqlayout12 unnamed - + textLabel11 @@ -433,14 +433,14 @@ altBox - + 100 0 - + textLabel12 @@ -452,7 +452,7 @@ azBox - + 100 0 @@ -471,7 +471,7 @@ Expanding - + 40 20 @@ -482,7 +482,7 @@ - + groupBox2 @@ -493,9 +493,9 @@ unnamed - + - layout8 + tqlayout8 @@ -513,7 +513,7 @@ 0 - + 100 0 @@ -523,7 +523,7 @@ NoFocus - + textLabel8 @@ -535,14 +535,14 @@ helLongBox - + 100 0 - + textLabel4 @@ -554,14 +554,14 @@ helLatBox - + 100 0 - + textLabel5 @@ -581,22 +581,22 @@ Expanding - + 40 20 - + - layout9 + tqlayout9 unnamed - + textLabel8_2 @@ -616,7 +616,7 @@ 0 - + 100 0 @@ -626,7 +626,7 @@ NoFocus - + textLabel6 @@ -638,7 +638,7 @@ geoLongBox - + 100 0 @@ -649,14 +649,14 @@ geoLatBox - + 100 0 - + textLabel7 @@ -676,7 +676,7 @@ Expanding - + 40 20 @@ -685,9 +685,9 @@ - + - layout1 + tqlayout1 @@ -703,14 +703,14 @@ Expanding - + 111 20 - + computeButton @@ -728,14 +728,14 @@ Expanding - + 61 21 - + clearButton @@ -753,7 +753,7 @@ Expanding - + 91 20 @@ -772,7 +772,7 @@ Expanding - + 21 60 @@ -781,7 +781,7 @@ - + tab @@ -792,7 +792,7 @@ unnamed - + InputBox_2_2 @@ -814,7 +814,7 @@ unnamed - + utBoxBatch @@ -829,7 +829,7 @@ true - + 100 0 @@ -839,7 +839,7 @@ StrongFocus - + dateCheckBatch @@ -857,14 +857,14 @@ true - + 100 0 - + latCheckBatch @@ -882,7 +882,7 @@ true - + 100 0 @@ -892,7 +892,7 @@ StrongFocus - + longCheckBatch @@ -903,7 +903,7 @@ false - + utCheckBatch @@ -917,7 +917,7 @@ false - + planetCheckBatch @@ -931,7 +931,7 @@ false - + Mercury @@ -993,7 +993,7 @@ - + InputBox_2_2_2 @@ -1015,7 +1015,7 @@ unnamed - + helEclCheckBatch @@ -1029,7 +1029,7 @@ false - + equGeoCheckBatch @@ -1040,7 +1040,7 @@ true - + topoCheckBatch @@ -1051,7 +1051,7 @@ false - + geoEclCheckBatch @@ -1064,7 +1064,7 @@ - + buttonGroup4_2 @@ -1075,7 +1075,7 @@ unnamed - + allRadioBatch @@ -1083,7 +1083,7 @@ All parameters - + inputRadioBatch @@ -1096,7 +1096,7 @@ - + groupBox4_2 @@ -1107,7 +1107,7 @@ unnamed - + InputButtonBatch @@ -1118,17 +1118,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -1141,9 +1141,9 @@ - + - layout14_2 + tqlayout14_2 @@ -1159,7 +1159,7 @@ Expanding - + 151 21 @@ -1192,7 +1192,7 @@ Expanding - + 131 21 @@ -1211,7 +1211,7 @@ Expanding - + 20 21 @@ -1358,7 +1358,7 @@ OutButtonBatch runButtonBatch - + slotComputePosition() slotClear() slotInputFile() @@ -1369,8 +1369,8 @@ slotLatCheckedBatch() slotRunBatch() slotPlanetsCheckedBatch() - - + + dmsbox.h diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index ddf71e2e..df2d1424 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -31,7 +31,7 @@ #include #include -modCalcPrec::modCalcPrec(TQWidget *parentSplit, const char *name) : modCalcPrecDlg(parentSplit,name) { +modCalcPrec::modCalcPrec(TQWidget *tqparentSplit, const char *name) : modCalcPrecDlg(tqparentSplit,name) { ra0Box->setDegType(FALSE); rafBox->setDegType(FALSE); @@ -57,13 +57,13 @@ SkyPoint modCalcPrec::getEquCoords (void) { TQString modCalcPrec:: showCurrentEpoch () { double epoch = setCurrentEpoch(); - TQString eName = TQString("%1").arg(epoch,7,'f',2); + TQString eName = TQString("%1").tqarg(epoch,7,'f',2); return eName; } double modCalcPrec::setCurrentEpoch () { - return KStarsDateTime::currentDateTime().epoch(); + return KStarsDateTime::tqcurrentDateTime().epoch(); } double modCalcPrec::getEpoch (TQString eName) { @@ -176,7 +176,7 @@ void modCalcPrec::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -188,7 +188,7 @@ void modCalcPrec::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcprec.h b/kstars/kstars/tools/modcalcprec.h index bf01d8bd..2ef5e394 100644 --- a/kstars/kstars/tools/modcalcprec.h +++ b/kstars/kstars/tools/modcalcprec.h @@ -38,6 +38,7 @@ class SkyPoint; class modCalcPrec : public modCalcPrecDlg { Q_OBJECT + TQ_OBJECT public: modCalcPrec(TQWidget *p, const char *n); ~modCalcPrec(); diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index ae895f9d..f2c126ce 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -1,10 +1,10 @@ modCalcPrecDlg - + modCalcPrecDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + tabWidget3 - + tab @@ -34,7 +34,7 @@ unnamed - + InputBox @@ -55,22 +55,22 @@ Expanding - + 98 20 - + - layout25 + tqlayout25 unnamed - + epoch0Label @@ -94,7 +94,7 @@ StrongFocus - + ra0Label @@ -112,7 +112,7 @@ epoch0Name - + dec0Label @@ -120,7 +120,7 @@ Declination: - + epochfLabel @@ -140,7 +140,7 @@ Expanding - + 98 20 @@ -149,9 +149,9 @@ - + - layout2 + tqlayout2 @@ -167,7 +167,7 @@ Expanding - + 91 20 @@ -192,7 +192,7 @@ Expanding - + 51 20 @@ -217,7 +217,7 @@ Expanding - + 91 21 @@ -236,14 +236,14 @@ Fixed - + 20 20 - + outputBox @@ -264,22 +264,22 @@ Expanding - + 90 20 - + - layout26 + tqlayout26 unnamed - + rafLabel @@ -287,7 +287,7 @@ Right ascension: - + decfLabel @@ -323,7 +323,7 @@ Expanding - + 90 20 @@ -342,7 +342,7 @@ Expanding - + 20 70 @@ -351,7 +351,7 @@ - + tab @@ -362,7 +362,7 @@ unnamed - + InputBox_2_2 @@ -406,7 +406,7 @@ StrongFocus - + decCheckBatch @@ -417,7 +417,7 @@ true - + epochCheckBatch @@ -425,7 +425,7 @@ Input epoch: - + targetEpochCheckBatch @@ -459,7 +459,7 @@ - + raCheckBatch @@ -472,7 +472,7 @@ - + buttonGroup4_2 @@ -483,7 +483,7 @@ unnamed - + allRadioBatch @@ -491,7 +491,7 @@ All parameters - + inputRadioBatch @@ -504,7 +504,7 @@ - + groupBox4_2 @@ -515,7 +515,7 @@ unnamed - + InputButtonBatch @@ -526,17 +526,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -549,9 +549,9 @@ - + - layout14_2 + tqlayout14_2 @@ -567,7 +567,7 @@ Expanding - + 151 21 @@ -600,7 +600,7 @@ Expanding - + 131 21 @@ -619,7 +619,7 @@ Expanding - + 21 30 @@ -729,7 +729,7 @@ OutputLineEditBatch runButtonBatch_2 - + slotComputeCoords() slotClearCoords() slotRaCheckedBatch() @@ -741,8 +741,8 @@ slotInputFile() slotOutputFile() slotRunBatch() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index 33cc03c9..e925b2b5 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include //need for QTimeEdit +#include //need for TQTimeEdit #include #include #include @@ -32,7 +32,7 @@ #include "simclock.h" #include "libkdeedu/extdate/extdatetimeedit.h" -modCalcSidTime::modCalcSidTime(TQWidget *parentSplit, const char *name) : modCalcSidTimeDlg (parentSplit,name) { +modCalcSidTime::modCalcSidTime(TQWidget *tqparentSplit, const char *name) : modCalcSidTimeDlg (tqparentSplit,name) { showCurrentTimeAndLong(); show(); @@ -44,8 +44,8 @@ modCalcSidTime::~modCalcSidTime(void) { void modCalcSidTime::showCurrentTimeAndLong (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); - // modCalcSidTimeDlg -> QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); + // modCalcSidTimeDlg -> TQSplitter->AstroCalc->KStars showUT( ks->data()->ut().time() ); datBox->setDate( ks->data()->ut().date() ); @@ -99,7 +99,7 @@ dms modCalcSidTime::getLongitude( void ) } void modCalcSidTime::slotClearFields(){ - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); TQTime time(0,0,0); UtBox->setTime(time); StBox->setTime(time); @@ -192,7 +192,7 @@ void modCalcSidTime::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -204,7 +204,7 @@ void modCalcSidTime::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcsidtime.h b/kstars/kstars/tools/modcalcsidtime.h index 08e5497c..ef146c53 100644 --- a/kstars/kstars/tools/modcalcsidtime.h +++ b/kstars/kstars/tools/modcalcsidtime.h @@ -37,6 +37,7 @@ class ExtDate; class modCalcSidTime : public modCalcSidTimeDlg { Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui index eea8681c..ebc55464 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -1,10 +1,10 @@ modCalcSidTimeDlg - + modCalcSidTimeDlg - + 0 0 @@ -22,11 +22,11 @@ unnamed - + tabWidget2 - + tab @@ -37,15 +37,15 @@ unnamed - + - layout47 + tqlayout47 unnamed - + InputBox @@ -56,7 +56,7 @@ unnamed - + UtRadio @@ -67,7 +67,7 @@ true - + StRadio @@ -80,7 +80,7 @@ - + longdataBox @@ -91,7 +91,7 @@ unnamed - + dateBox @@ -99,7 +99,7 @@ Date: - + longLabel @@ -111,7 +111,7 @@ longBox - + 100 0 @@ -125,7 +125,7 @@ datBox - + 100 0 @@ -139,9 +139,9 @@ - + - layout3 + tqlayout3 @@ -157,7 +157,7 @@ Expanding - + 41 21 @@ -182,7 +182,7 @@ Expanding - + 101 21 @@ -207,7 +207,7 @@ Expanding - + 41 20 @@ -216,15 +216,15 @@ - + - layout47 + tqlayout47 unnamed - + UtimeBox @@ -245,14 +245,14 @@ Expanding - + 40 20 - + UtLabel @@ -260,7 +260,7 @@ UT: - + UtBox @@ -275,7 +275,7 @@ Expanding - + 30 20 @@ -284,7 +284,7 @@ - + St0Box @@ -305,14 +305,14 @@ Expanding - + 40 20 - + StLabel @@ -320,7 +320,7 @@ ST: - + StBox @@ -335,7 +335,7 @@ Expanding - + 30 20 @@ -356,7 +356,7 @@ Expanding - + 20 204 @@ -365,7 +365,7 @@ - + tab @@ -376,7 +376,7 @@ unnamed - + InputBox_2_2_2 @@ -391,7 +391,7 @@ 0 - + 90 0 @@ -404,15 +404,15 @@ unnamed - + - layout30 + tqlayout30 unnamed - + longCheckBatch @@ -426,7 +426,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + utCheckBatch @@ -440,7 +440,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + utBoxBatch @@ -452,7 +452,7 @@ false - + 100 0 @@ -474,16 +474,16 @@ Expanding - + 16 20 - + - layout32 + tqlayout32 @@ -501,19 +501,19 @@ 0 - + 100 0 - + stBoxBatch - + stCheckBatch @@ -530,7 +530,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + dateCheckBatch @@ -559,7 +559,7 @@ Expanding - + 40 20 @@ -568,7 +568,7 @@ - + buttonFieldsGroup @@ -579,7 +579,7 @@ unnamed - + allRadioBatch @@ -587,7 +587,7 @@ All parameters - + inputRadioBatch @@ -600,7 +600,7 @@ - + groupFilesBox @@ -611,7 +611,7 @@ unnamed - + InputButtonBatch @@ -622,17 +622,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -645,9 +645,9 @@ - + - layout22_3 + tqlayout22_3 @@ -663,7 +663,7 @@ Expanding - + 151 21 @@ -696,7 +696,7 @@ Expanding - + 131 21 @@ -715,7 +715,7 @@ Expanding - + 31 16 @@ -849,7 +849,7 @@ OutButtonBatch runButtonBatch - + slotComputeTime() slotClearFields() slotLongChecked() @@ -859,8 +859,8 @@ slotRunBatch() slotInputFile() slotOutputFile() - - + + dmsbox.h diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index 412e1d72..9b352d58 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -28,7 +28,7 @@ #include "kstarsdatetime.h" #include "libkdeedu/extdate/extdatetimeedit.h" -#include //need for QTimeEdit +#include //need for TQTimeEdit #include #include #include @@ -37,7 +37,7 @@ #include -modCalcVlsr::modCalcVlsr(TQWidget *parentSplit, const char *name) : modCalcVlsrDlg (parentSplit,name) { +modCalcVlsr::modCalcVlsr(TQWidget *tqparentSplit, const char *name) : modCalcVlsrDlg (tqparentSplit,name) { showCurrentDateTime(); initGeo(); @@ -141,9 +141,9 @@ void modCalcVlsr::getGeoLocation (void) void modCalcVlsr::showCurrentDateTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -154,7 +154,7 @@ void modCalcVlsr::showCurrentDateTime (void) // SIRVE para algo? void modCalcVlsr::initGeo(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars geoPlace = new GeoLocation( ks->geo() ); } @@ -163,7 +163,7 @@ void modCalcVlsr::initGeo(void) void modCalcVlsr::showLongLat(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars longBox->show( ks->geo()->lng() ); latBox->show( ks->geo()->lat() ); longBoxBatch->show( ks->geo()->lng() ); @@ -212,7 +212,7 @@ void modCalcVlsr::slotClearCoords() vGeoBox->setText(""); vTopoBox->setText(""); - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); timBox->setTime(TQTime(0,0,0)); } @@ -373,7 +373,7 @@ void modCalcVlsr::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -385,7 +385,7 @@ void modCalcVlsr::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcvlsr.h b/kstars/kstars/tools/modcalcvlsr.h index 614e321a..0f046005 100644 --- a/kstars/kstars/tools/modcalcvlsr.h +++ b/kstars/kstars/tools/modcalcvlsr.h @@ -38,6 +38,7 @@ class dms; class modCalcVlsr : public modCalcVlsrDlg { Q_OBJECT + TQ_OBJECT public: modCalcVlsr(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index 80311fb8..e4d5c042 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -1,10 +1,10 @@ modCalcVlsrDlg - + modCalcVlsrDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + tabWidget3 - + tab @@ -34,7 +34,7 @@ unnamed - + inputGroupBox @@ -45,9 +45,9 @@ unnamed - + - layout7 + tqlayout7 @@ -63,14 +63,14 @@ Expanding - + 20 21 - + timBox @@ -93,7 +93,7 @@ Expanding - + 20 21 @@ -108,7 +108,7 @@ StrongFocus - + dateLabel @@ -116,7 +116,7 @@ Date: - + timLabel @@ -136,16 +136,16 @@ Fixed - + 20 20 - + - layout8 + tqlayout8 @@ -155,7 +155,7 @@ heightBox - + 1000 32767 @@ -169,7 +169,7 @@ longBox - + 100 0 @@ -179,7 +179,7 @@ StrongFocus - + latLabel @@ -187,7 +187,7 @@ Latitude: - + longLabel @@ -195,7 +195,7 @@ Longitude: - + textLabel1_2 @@ -207,7 +207,7 @@ latBox - + 100 0 @@ -221,9 +221,9 @@ - + - layout14 + tqlayout14 @@ -239,14 +239,14 @@ Expanding - + 120 31 - + GroupBox2 @@ -257,7 +257,7 @@ unnamed - + raLabel @@ -272,7 +272,7 @@ true - + 100 0 @@ -282,7 +282,7 @@ StrongFocus - + decLabel @@ -294,7 +294,7 @@ decBox - + 100 0 @@ -304,7 +304,7 @@ StrongFocus - + epochName @@ -316,14 +316,14 @@ 0 - + 32767 32767 - + epochLabel @@ -343,7 +343,7 @@ Fixed - + 100 20 @@ -352,15 +352,15 @@ - + - layout15 + tqlayout15 unnamed - + groupBox8 @@ -376,7 +376,7 @@ vlsrBox - + azLabel @@ -389,7 +389,7 @@ vHelioBox - + textLabel1 @@ -402,7 +402,7 @@ vGeoBox - + textLabel2 @@ -410,7 +410,7 @@ Geocentric velocity: - + textLabel3 @@ -435,14 +435,14 @@ Expanding - + 30 21 - + buttonGroup6 @@ -453,7 +453,7 @@ unnamed - + radioVlsr @@ -464,7 +464,7 @@ true - + radioVhelio @@ -472,7 +472,7 @@ Heliocentric - + radioVgeo @@ -480,7 +480,7 @@ Geocentric - + radioVtopo @@ -492,7 +492,7 @@ - + Layout10 @@ -506,17 +506,17 @@ 6 - + Compute - + 0 25 - + 120 32767 @@ -526,17 +526,17 @@ Convert - + Clear - + 0 25 - + 120 32767 @@ -558,7 +558,7 @@ Expanding - + 21 20 @@ -567,7 +567,7 @@ - + tab @@ -578,7 +578,7 @@ unnamed - + InputBox_2_2 @@ -600,7 +600,7 @@ unnamed - + decCheckBatch @@ -611,7 +611,7 @@ true - + epochCheckBatch @@ -619,7 +619,7 @@ Epoch: - + dateCheckBatch @@ -630,7 +630,7 @@ false - + utCheckBatch @@ -644,7 +644,7 @@ false - + raCheckBatch @@ -655,7 +655,7 @@ true - + utBoxBatch @@ -675,7 +675,7 @@ dateBoxBatch - + 100 0 @@ -689,7 +689,7 @@ false - + 100 0 @@ -706,7 +706,7 @@ false - + 100 0 @@ -736,7 +736,7 @@ true - + 100 0 @@ -746,7 +746,7 @@ StrongFocus - + longCheckBatch @@ -764,7 +764,7 @@ true - + 100 0 @@ -774,7 +774,7 @@ StrongFocus - + latCheckBatch @@ -785,7 +785,7 @@ false - + heightCheckBatch @@ -796,7 +796,7 @@ false - + vlsrCheckBatch @@ -807,7 +807,7 @@ false - + helioVCheckBatch @@ -815,7 +815,7 @@ Heliocentric v.: - + geoVCheckBatch @@ -823,7 +823,7 @@ Geocentric v.: - + topoVCheckBatch @@ -841,24 +841,24 @@ heightBoxBatch - + vhelioBoxBatch - + vgeoBoxBatch - + vtopoBoxBatch - + buttonGroup4 @@ -869,7 +869,7 @@ unnamed - + allRadioBatch @@ -877,7 +877,7 @@ All parameters - + inputRadioBatch @@ -890,7 +890,7 @@ - + groupBox4_2 @@ -901,7 +901,7 @@ unnamed - + InputButtonBatch @@ -912,17 +912,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -935,9 +935,9 @@ - + - layout14 + tqlayout14 @@ -953,7 +953,7 @@ Expanding - + 151 21 @@ -986,7 +986,7 @@ Expanding - + 131 21 @@ -1005,7 +1005,7 @@ Expanding - + 20 50 @@ -1014,7 +1014,7 @@ - + TabPage @@ -1171,7 +1171,7 @@ runButtonBatch kTextBrowser1 - + slotComputeVelocities() slotClearCoords() slotUtChecked() @@ -1186,8 +1186,8 @@ slotInputFile() slotOutputFile() slotRunBatch() - - + + klineedit.h diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index fbd1702c..163040b9 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -53,9 +53,9 @@ #include "devicemanager.h" #include "indistd.h" -ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) +ObservingList::ObservingList( KStars *_ks, TQWidget* tqparent ) : KDialogBase( KDialogBase::Plain, i18n( "Observing List" ), - Close, Close, parent, "observinglist", false ), ks( _ks ), LogObject(0), oCurrent(0), + Close, Close, tqparent, "observinglist", false ), ks( _ks ), LogObject(0), oCurrent(0), noNameStars(0), isModified(false), bIsLarge(true) { TQFrame *page = plainPage(); @@ -121,7 +121,7 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) ui->NotesEdit->setEnabled( false ); } -bool ObservingList::contains( const SkyObject *q ) { +bool ObservingList::tqcontains( const SkyObject *q ) { for ( SkyObject* o = obsList.first(); o; o = obsList.next() ) { if ( o == q ) return true; } @@ -144,7 +144,7 @@ void ObservingList::slotAddObject( SkyObject *obj ) { for ( SkyObject *o = obsList.first(); o; o = obsList.next() ) { if ( obj == o ) { //FIXME STRINGS FREEZE - //ks->statusBar()->changeItem( i18n( "%1 is already in the observing list." ).arg( obj->name() ), 0 ); + //ks->statusBar()->changeItem( i18n( "%1 is already in the observing list." ).tqarg( obj->name() ), 0 ); return; } } @@ -164,7 +164,7 @@ void ObservingList::slotAddObject( SkyObject *obj ) { ui->TinyTable->insertItem( obj->translatedName() ); //Note addition in statusbar - ks->statusBar()->changeItem( i18n( "Added %1 to observing list." ).arg( obj->name() ), 0 ); + ks->statusBar()->changeItem( i18n( "Added %1 to observing list." ).tqarg( obj->name() ), 0 ); } void ObservingList::slotRemoveObject( SkyObject *o ) { @@ -200,7 +200,7 @@ void ObservingList::slotRemoveObject( SkyObject *o ) { } if ( ! objectFound ) { - kdDebug() << i18n( "Cannot remove Object %1; not found in table." ).arg(o->translatedName()) << endl; + kdDebug() << i18n( "Cannot remove Object %1; not found in table." ).tqarg(o->translatedName()) << endl; } else { //Remove object from TinyTable for ( uint i=0; i < ui->TinyTable->count(); i++ ) { @@ -268,7 +268,7 @@ void ObservingList::slotNewSelection() { } if ( ! found ) { - kdDebug() << i18n( "Object %1 not found in obsList." ).arg( newName ) << endl; + kdDebug() << i18n( "Object %1 not found in obsList." ).tqarg( newName ) << endl; } else if ( newName != i18n( "star" ) ) { //Display the object's current user notes in the NotesEdit //First, save the last object's user log to disk, if necessary @@ -280,9 +280,9 @@ void ObservingList::slotNewSelection() { ui->NotesLabel->setEnabled( true ); ui->NotesEdit->setEnabled( true ); - ui->NotesLabel->setText( i18n( "observing notes for %1:" ).arg( LogObject->translatedName() ) ); + ui->NotesLabel->setText( i18n( "observing notes for %1:" ).tqarg( LogObject->translatedName() ) ); if ( LogObject->userLog.isEmpty() ) { - ui->NotesEdit->setText( i18n("Record here observation logs and/or data on %1.").arg( LogObject->translatedName() ) ); + ui->NotesEdit->setText( i18n("Record here observation logs and/or data on %1.").tqarg( LogObject->translatedName() ) ); } else { ui->NotesEdit->setText( LogObject->userLog ); } @@ -345,8 +345,8 @@ void ObservingList::slotSlewToObject() int selectedCoord(0); SkyPoint sp; - // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element - // i.e. the first telescope we find! + // Find the first device with ETQUATORIAL_EOD_COORD or ETQUATORIAL_COORD and with SLEW element + // i.e. the first telescope we tqfind! INDIMenu *imenu = ks->getINDIMenu(); @@ -357,10 +357,10 @@ void ObservingList::slotSlewToObject() { indidev = imenu->mgr.at(i)->indi_dev.at(j); indidev->stdDev->currentObject = NULL; - prop = indidev->findProp("EQUATORIAL_EOD_COORD"); + prop = indidev->findProp("ETQUATORIAL_EOD_COORD"); if (prop == NULL) { - prop = indidev->findProp("EQUATORIAL_COORD"); + prop = indidev->findProp("ETQUATORIAL_COORD"); if (prop == NULL) { prop = indidev->findProp("HORIZONTAL_COORD"); @@ -378,7 +378,7 @@ void ObservingList::slotSlewToObject() if (ConnectEle->state == PS_OFF) { - KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").arg(indidev->label)); + KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").tqarg(indidev->label)); return; } @@ -393,7 +393,7 @@ void ObservingList::slotSlewToObject() if (!DecEle) continue; break; - // Horizontal + //Qt::Horizontal case 1: if (prop->perm == PP_RO) continue; AzEle = prop->findElement("AZ"); @@ -430,10 +430,10 @@ void ObservingList::slotSlewToObject() sp.set (ks->map()->clickedPoint()->ra(), ks->map()->clickedPoint()->dec()); if (useJ2000) - sp.apparentCoord(ks->data()->ut().djd(), (long double) J2000); + sp.aptqparentCoord(ks->data()->ut().djd(), (long double) J2000); - RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second())); - DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec())); + RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second())); + DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec())); break; @@ -449,8 +449,8 @@ void ObservingList::slotSlewToObject() sp.setAlt(*ks->map()->clickedPoint()->alt()); } - AzEle->write_w->setText(TQString("%1:%2:%3").arg(sp.az()->degree()).arg(sp.az()->arcmin()).arg(sp.az()->arcsec())); - AltEle->write_w->setText(TQString("%1:%2:%3").arg(sp.alt()->degree()).arg(sp.alt()->arcmin()).arg(sp.alt()->arcsec())); + AzEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.az()->degree()).tqarg(sp.az()->arcmin()).tqarg(sp.az()->arcsec())); + AltEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.alt()->degree()).tqarg(sp.alt()->arcmin()).tqarg(sp.alt()->arcsec())); break; } @@ -490,7 +490,7 @@ void ObservingList::slotAVT() { void ObservingList::slotClose() { //Save the current User log text if ( oCurrent && ! ui->NotesEdit->text().isEmpty() && ui->NotesEdit->text() - != i18n("Record here observation logs and/or data on %1.").arg( oCurrent->name()) ) { + != i18n("Record here observation logs and/or data on %1.").tqarg( oCurrent->name()) ) { oCurrent->saveUserLog( ui->NotesEdit->text() ); } @@ -500,7 +500,7 @@ void ObservingList::slotClose() { void ObservingList::saveCurrentUserLog() { if ( ! ui->NotesEdit->text().isEmpty() && ui->NotesEdit->text() != - i18n("Record here observation logs and/or data on %1.").arg( LogObject->translatedName() ) ) { + i18n("Record here observation logs and/or data on %1.").tqarg( LogObject->translatedName() ) ) { LogObject->saveUserLog( ui->NotesEdit->text() ); ui->NotesEdit->clear(); @@ -528,7 +528,7 @@ void ObservingList::slotOpenList() { } if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1" ).arg( f.name() ); + TQString message = i18n( "Could not open file %1" ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); return; } @@ -627,7 +627,7 @@ void ObservingList::slotSaveList() { TQFile f( FileName ); if ( !f.open( IO_WriteOnly) ) { - TQString message = i18n( "Could not open file %1. Try a different filename?" ).arg( f.name() ); + TQString message = i18n( "Could not open file %1. Try a different filename?" ).tqarg( f.name() ); if ( KMessageBox::warningYesNo( 0, message, i18n( "Could Not Open File" ), i18n("Try Different"), i18n("Do Not Try") ) == KMessageBox::Yes ) { FileName == ""; diff --git a/kstars/kstars/tools/observinglist.h b/kstars/kstars/tools/observinglist.h index e2beaba6..a1602f1f 100644 --- a/kstars/kstars/tools/observinglist.h +++ b/kstars/kstars/tools/observinglist.h @@ -58,11 +58,12 @@ class TQStringList; class ObservingList : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**@short Cunstructor */ - ObservingList( KStars *_ks, TQWidget* parent = 0 ); + ObservingList( KStars *_ks, TQWidget* tqparent = 0 ); /**@short Destuctor (empty) */ ~ObservingList() {} @@ -70,7 +71,7 @@ public: /**@return true if the object is in the observing list *@p o pointer to the object to test. */ - bool contains( const SkyObject *o ); + bool tqcontains( const SkyObject *o ); SkyObject* first() { return obsList.first(); } SkyObject* next() { return obsList.next(); } diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index 040f6970..909cc564 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -1,10 +1,10 @@ ObservingListUI - + ObservingListUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout68 + tqlayout68 @@ -39,13 +39,13 @@ 0 - + 32 32 - + 32 32 @@ -73,13 +73,13 @@ 0 - + 32 32 - + 32 32 @@ -107,13 +107,13 @@ 0 - + 32 32 - + 32 32 @@ -141,13 +141,13 @@ 0 - + 32 32 - + 32 32 @@ -173,7 +173,7 @@ Expanding - + 350 20 @@ -192,13 +192,13 @@ 0 - + 32 32 - + 32 32 @@ -216,9 +216,9 @@ - + - layout4 + tqlayout4 @@ -350,7 +350,7 @@ Expanding - + 40 20 @@ -359,7 +359,7 @@ - + TableStack @@ -371,7 +371,7 @@ 1 - + WStackPage @@ -462,7 +462,7 @@ - + WStackPage @@ -488,7 +488,7 @@ 4 - + 0 100 @@ -498,7 +498,7 @@ - + NotesLabel @@ -518,7 +518,7 @@ observing notes for object: - + AlignVCenter @@ -534,13 +534,13 @@ 1 - + 0 100 - + 32767 160 @@ -554,7 +554,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp index 7dbbbc3d..9a3c57d8 100644 --- a/kstars/kstars/tools/obslistwizard.cpp +++ b/kstars/kstars/tools/obslistwizard.cpp @@ -34,10 +34,10 @@ #include "obslistwizard.h" -ObsListWizard::ObsListWizard( TQWidget *parent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n("Observing List Wizard"), Ok|Cancel, Ok, parent, name ) +ObsListWizard::ObsListWizard( TQWidget *tqparent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n("Observing List Wizard"), Ok|Cancel, Ok, tqparent, name ) { - ksw = (KStars*)parent; + ksw = (KStars*)tqparent; TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); @@ -195,32 +195,32 @@ void ObsListWizard::slotShowStackWidget( TQListViewItem *i ) if ( i ) { TQString t = i->text(0); - if ( t.contains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage ); - if ( t.contains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage ); - if ( t.contains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage ); - if ( t.contains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage ); - if ( t.contains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage ); -// if ( t.contains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage ); - if ( t.contains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage ); + if ( t.tqcontains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage ); + if ( t.tqcontains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage ); + if ( t.tqcontains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage ); + if ( t.tqcontains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage ); + if ( t.tqcontains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage ); +// if ( t.tqcontains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage ); + if ( t.tqcontains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage ); } } void ObsListWizard::slotDeepSkyButton() { olw->TypeList->selectAll( false ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Open Clusters" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Globular Clusters" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Planetary Nebulae" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Galaxies" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Open Clusters" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Galaxies" ) ), true ); } void ObsListWizard::slotSolarSystemButton() { olw->TypeList->selectAll( false ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Comets" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Asteroids" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Comets" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Asteroids" ) ), true ); } void ObsListWizard::slotChangeLocation() @@ -235,23 +235,23 @@ void ObsListWizard::slotChangeLocation() void ObsListWizard::slotUpdateObjectCount() { ObjectCount = 0; - if ( olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) ObjectCount += StarCount; - if ( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) ObjectCount += PlanetCount; - if ( olw->TypeList->findItem( i18n( "Comets" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Comets" ) )->isSelected() ) ObjectCount += CometCount; - if ( olw->TypeList->findItem( i18n( "Asteroids" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Asteroids" ) )->isSelected() ) ObjectCount += AsteroidCount; - if ( olw->TypeList->findItem( i18n( "Galaxies" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Galaxies" ) )->isSelected() ) ObjectCount += GalaxyCount; - if ( olw->TypeList->findItem( i18n( "Open Clusters" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Open Clusters" ) )->isSelected() ) ObjectCount += OpenClusterCount; - if ( olw->TypeList->findItem( i18n( "Globular Clusters" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) )->isSelected() ) ObjectCount += GlobClusterCount; - if ( olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) ObjectCount += GasNebCount; - if ( olw->TypeList->findItem( i18n( "Planetary Nebulae" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) )->isSelected() ) ObjectCount += PlanNebCount; applyFilters( false ); //false = only adjust counts, do not build list @@ -307,7 +307,7 @@ void ObsListWizard::applyFilters( bool doBuildList ) //Stars int starIndex(ksw->data()->starList.count()); - if ( olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) { + if ( olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) { if ( maglimit < 100. ) { //Stars are sorted by mag, so use binary search algo to find index of faintest mag int low(0), high(ksw->data()->starList.count()-1), middle; @@ -338,7 +338,7 @@ void ObsListWizard::applyFilters( bool doBuildList ) } //Sun, Moon, Planets - if ( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) { + if ( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) { applyRegionFilter( (SkyObject*)ksw->data()->PCat->planetSun(), doBuildList ); applyRegionFilter( (SkyObject*)ksw->data()->Moon, doBuildList ); applyRegionFilter( (SkyObject*)ksw->data()->PCat->findByName("Mercury"), doBuildList ); @@ -354,12 +354,12 @@ void ObsListWizard::applyFilters( bool doBuildList ) //Deep sky objects for ( SkyObject *o = (SkyObject*)(ksw->data()->deepSkyList.first()); o; o = (SkyObject*)(ksw->data()->deepSkyList.next()) ) { //Skip unselected object types - if ( (o->type() == SkyObject::STAR || o->type() == SkyObject::CATALOG_STAR) && ! olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) continue; - if ( o->type() == SkyObject::OPEN_CLUSTER && ! olw->TypeList->findItem( i18n( "Open Clusters" ) )->isSelected() ) continue; - if ( o->type() == SkyObject::GLOBULAR_CLUSTER && ! olw->TypeList->findItem( i18n( "Globular Clusters" ) )->isSelected() ) continue; - if ( (o->type() == SkyObject::GASEOUS_NEBULA || o->type() == SkyObject::SUPERNOVA_REMNANT) && ! olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) continue; - if ( o->type() == SkyObject::PLANETARY_NEBULA && ! olw->TypeList->findItem( i18n( "Planetary Nebulae" ) )->isSelected() ) continue; - if ( o->type() == SkyObject::GALAXY && ! olw->TypeList->findItem( i18n( "Galaxies" ) )->isSelected() ) continue; + if ( (o->type() == SkyObject::STAR || o->type() == SkyObject::CATALOG_STAR) && ! olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) continue; + if ( o->type() == SkyObject::OPEN_CLUSTER && ! olw->TypeList->tqfindItem( i18n( "Open Clusters" ) )->isSelected() ) continue; + if ( o->type() == SkyObject::GLOBULAR_CLUSTER && ! olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) )->isSelected() ) continue; + if ( (o->type() == SkyObject::GASEOUS_NEBULA || o->type() == SkyObject::SUPERNOVA_REMNANT) && ! olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) continue; + if ( o->type() == SkyObject::PLANETARY_NEBULA && ! olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) )->isSelected() ) continue; + if ( o->type() == SkyObject::GALAXY && ! olw->TypeList->tqfindItem( i18n( "Galaxies" ) )->isSelected() ) continue; if ( o->type() == SkyObject::TYPE_UNKNOWN ) continue; if ( olw->SelectByMag->isChecked() ) { @@ -380,7 +380,7 @@ void ObsListWizard::applyFilters( bool doBuildList ) } //Comets - if ( olw->TypeList->findItem( i18n( "Comets" ) )->isSelected() ) { + if ( olw->TypeList->tqfindItem( i18n( "Comets" ) )->isSelected() ) { for ( SkyObject *o = (SkyObject*)(ksw->data()->cometList.first()); o; o = (SkyObject*)(ksw->data()->cometList.next()) ) { //comets don't have magnitudes at this point, so skip mag check applyRegionFilter( o, doBuildList ); @@ -388,7 +388,7 @@ void ObsListWizard::applyFilters( bool doBuildList ) } //Asteroids - if ( olw->TypeList->findItem( i18n( "Asteroids" ) )->isSelected() ) { + if ( olw->TypeList->tqfindItem( i18n( "Asteroids" ) )->isSelected() ) { for ( SkyObject *o = (SkyObject*)(ksw->data()->asteroidList.first()); o; o = (SkyObject*)(ksw->data()->asteroidList.next()) ) { if ( olw->SelectByMag->isChecked() ) { @@ -411,14 +411,14 @@ void ObsListWizard::applyFilters( bool doBuildList ) //Update the object count label if ( doBuildList ) ObjectCount = obsList().count(); - olw->CountLabel->setText( i18n("Current selection: %1 objects").arg( ObjectCount ) ); + olw->CountLabel->setText( i18n("Current selection: %1 objects").tqarg( ObjectCount ) ); } void ObsListWizard::applyRegionFilter( SkyObject *o, bool doBuildList, bool doAdjustCount ) { //select by constellation if ( olw->SelectByConstellation->isChecked() ) { TQString c( o->constellation( ksw->data()->csegmentList, ksw->data()->cnameList ) ); - TQListBoxItem *it = olw->ConstellationList->findItem( c ); + TQListBoxItem *it = olw->ConstellationList->tqfindItem( c ); if ( it && it->isSelected() ) { if ( doBuildList ) obsList().append ( o ); diff --git a/kstars/kstars/tools/obslistwizard.h b/kstars/kstars/tools/obslistwizard.h index bbf7bbd7..0551ebfa 100644 --- a/kstars/kstars/tools/obslistwizard.h +++ b/kstars/kstars/tools/obslistwizard.h @@ -31,10 +31,11 @@ class TQListViewItem; class ObsListWizard : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**@short Constructor */ - ObsListWizard( TQWidget *parent = 0, const char *name = 0 ); + ObsListWizard( TQWidget *tqparent = 0, const char *name = 0 ); /**@short Destructor */ ~ObsListWizard(); diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index a501e152..6349a985 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -1,10 +1,10 @@ ObsListWizardUI - + ObsListWizardUI - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout79 + tqlayout79 unnamed - + - layout55 + tqlayout55 unnamed - + textLabel1 @@ -115,15 +115,15 @@ - + - layout12 + tqlayout12 unnamed - + textLabel1_2 @@ -139,11 +139,11 @@ Filter arguments: - + FilterStack - + ObjTypePage @@ -154,7 +154,7 @@ unnamed - + textLabel2 @@ -162,9 +162,9 @@ Select object types: - + - layout13 + tqlayout13 @@ -223,9 +223,9 @@ Multi - + - layout12 + tqlayout12 @@ -273,7 +273,7 @@ Expanding - + 20 90 @@ -286,7 +286,7 @@ - + ConstellationPage @@ -297,7 +297,7 @@ unnamed - + SelectByConstellation @@ -318,7 +318,7 @@ - + RectRegionPage @@ -329,7 +329,7 @@ unnamed - + SelectByRect @@ -340,15 +340,15 @@ - + - layout48 + tqlayout48 unnamed - + textLabel4_2_2 @@ -371,7 +371,7 @@ 0 - + 0 20 @@ -393,14 +393,14 @@ 0 - + 0 20 - + textLabel4 @@ -416,7 +416,7 @@ RA: - + textLabel4_3 @@ -432,7 +432,7 @@ Dec: - + textLabel4_2 @@ -455,7 +455,7 @@ 0 - + 0 20 @@ -477,7 +477,7 @@ 0 - + 0 20 @@ -496,7 +496,7 @@ Expanding - + 20 215 @@ -505,7 +505,7 @@ - + CircRegionPage @@ -516,7 +516,7 @@ unnamed - + SelectByCirc @@ -527,15 +527,15 @@ - + - layout9 + tqlayout9 unnamed - + textLabel1_4 @@ -543,7 +543,7 @@ Center RA: - + textLabel2_3 @@ -551,7 +551,7 @@ Center Dec: - + textLabel3_3 @@ -574,7 +574,7 @@ 0 - + 0 20 @@ -596,7 +596,7 @@ 0 - + 0 20 @@ -629,7 +629,7 @@ Expanding - + 20 170 @@ -638,7 +638,7 @@ - + ObsDatePage @@ -649,7 +649,7 @@ unnamed - + SelectByDate @@ -657,9 +657,9 @@ Select objects observ&able on: - + - layout6 + tqlayout6 @@ -669,7 +669,7 @@ Date - + 160 0 @@ -686,7 +686,7 @@ Expanding - + 40 20 @@ -695,15 +695,15 @@ - + - layout4 + tqlayout4 unnamed - + textLabel2_2 @@ -719,7 +719,7 @@ from - + LocationLabel @@ -734,9 +734,9 @@ - + - layout5_2 + tqlayout5_2 @@ -752,7 +752,7 @@ Expanding - + 40 20 @@ -780,7 +780,7 @@ Expanding - + 40 20 @@ -799,7 +799,7 @@ Expanding - + 20 176 @@ -808,7 +808,7 @@ - + MagLimitPage @@ -819,7 +819,7 @@ unnamed - + SelectByMag @@ -827,9 +827,9 @@ Select objects &brighter than: - + - layout36 + tqlayout36 @@ -843,7 +843,7 @@ false - + textLabel4_4 @@ -861,7 +861,7 @@ Expanding - + 295 20 @@ -870,7 +870,7 @@ - + ExcludeNoMag @@ -895,7 +895,7 @@ have &no magnitude Expanding - + 20 179 @@ -904,7 +904,7 @@ have &no magnitude - + RegionPage @@ -915,7 +915,7 @@ have &no magnitude unnamed - + textLabel3 @@ -930,7 +930,7 @@ c. select objects in a circular region Choose one of these sub-items to select from a region on the sky. - + AlignTop @@ -941,7 +941,7 @@ select from a region on the sky. - + CountLabel @@ -1012,7 +1012,7 @@ select from a region on the sky. 789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f - + klistview.h klistbox.h diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui index acae2c0d..0a5ff0fb 100644 --- a/kstars/kstars/tools/optionstreeview.ui +++ b/kstars/kstars/tools/optionstreeview.ui @@ -1,10 +1,10 @@ OptionsTreeView - + OptionsTreeView - + 0 0 @@ -60,9 +60,9 @@ OptionsList - + - layout3 + tqlayout3 @@ -78,14 +78,14 @@ Expanding - + 80 20 - + buttonOk @@ -96,7 +96,7 @@ true - + buttonCancel @@ -130,7 +130,7 @@ accept() - + klistview.h diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index cd0aba3d..706ab7df 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -35,8 +35,8 @@ #define AUMAX 48 -PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) - : KDialogBase( KDialogBase::Plain, i18n("Solar System Viewer"), Close, Close, parent, name ), PCat( ((KStars*)parent)->data() ), scale(1.0), isClockRunning(false), tmr(this) +PlanetViewer::PlanetViewer(TQWidget *tqparent, const char *name) + : KDialogBase( KDialogBase::Plain, i18n("Solar System Viewer"), Close, Close, tqparent, name ), PCat( ((KStars*)tqparent)->data() ), scale(1.0), isClockRunning(false), tmr(this) { TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); @@ -49,7 +49,7 @@ PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) pw->timeStep->tsbox()->setValue( 1 ); //start with 1-day timestep pw->RunButton->setPixmap( KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); - pw->dateBox->setDate( ((KStars*)parent)->data()->lt().date() ); + pw->dateBox->setDate( ((KStars*)tqparent)->data()->lt().date() ); vlay->addWidget( pw ); resize( 500, 500 ); @@ -68,7 +68,7 @@ PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) setCenterPlanet(""); PCat.initialize(); - ut = ((KStars*)parent)->data()->ut(); + ut = ((KStars*)tqparent)->data()->ut(); KSNumbers num( ut.djd() ); PCat.findPosition( &num, 0, 0 ); //NULL args: don't need geocent. coords. @@ -168,7 +168,7 @@ void PlanetViewer::updatePlanets() { } void PlanetViewer::slotToday() { - KStars *ks = (KStars*)parent(); + KStars *ks = (KStars*)tqparent(); pw->dateBox->setDate( ks->data()->lt().date() ); } @@ -231,17 +231,17 @@ void PlanetViewer::keyPressEvent( TQKeyEvent *e ) { PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget *par, const char *name ) : KStarsPlotWidget( x1, x2, y1, y2, par, name ), mouseButtonDown(false), oldx(0), oldy(0) { - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)topLevelWidget(); + pv = (PlanetViewer*)tqtopLevelWidget(); } -PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) : - KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, parent, name ), +PVPlotWidget::PVPlotWidget( TQWidget *tqparent, const char *name ) : + KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, tqparent, name ), mouseButtonDown(false), oldx(0), oldy(0) { - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)topLevelWidget(); + pv = (PlanetViewer*)tqtopLevelWidget(); } PVPlotWidget::~ PVPlotWidget() {} @@ -416,7 +416,7 @@ void PVPlotWidget::mouseMoveEvent( TQMouseEvent *e ) { setLimits( xc - 0.5*dataWidth(), xc + 0.5*dataWidth(), yc - 0.5*dataHeight(), yc + 0.5*dataHeight() ); update(); - kapp->processEvents(20); + kapp->tqprocessEvents(20); } oldx = e->x(); diff --git a/kstars/kstars/tools/planetviewer.h b/kstars/kstars/tools/planetviewer.h index b212a630..9bffc9ba 100644 --- a/kstars/kstars/tools/planetviewer.h +++ b/kstars/kstars/tools/planetviewer.h @@ -34,8 +34,9 @@ class PlanetViewer : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PlanetViewer(TQWidget *parent = 0, const char *name = 0); + PlanetViewer(TQWidget *tqparent = 0, const char *name = 0); ~PlanetViewer(); TQString centerPlanet() const { return CenterPlanet; } @@ -77,10 +78,11 @@ private: class PVPlotWidget : public KStarsPlotWidget { Q_OBJECT + TQ_OBJECT public: PVPlotWidget( double x1, double x2, double y1, double y2, - TQWidget *parent=0, const char *name=0 ); - PVPlotWidget( TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); + PVPlotWidget( TQWidget *tqparent=0, const char *name=0 ); ~PVPlotWidget(); public slots: diff --git a/kstars/kstars/tools/planetviewerui.ui b/kstars/kstars/tools/planetviewerui.ui index 77f3e085..0174ca8e 100644 --- a/kstars/kstars/tools/planetviewerui.ui +++ b/kstars/kstars/tools/planetviewerui.ui @@ -1,10 +1,10 @@ PlanetViewerUI - + PlanetViewerUI - + 0 0 @@ -24,9 +24,9 @@ map - + - layout2 + tqlayout2 @@ -44,7 +44,7 @@ 0 - + 34 34 @@ -69,7 +69,7 @@ Expanding - + 120 20 @@ -151,7 +151,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + kpushbutton.h timestepbox.h diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index b7538432..31667d00 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -100,14 +100,14 @@ #include "timestepbox.h" #include "libkdeedu/extdate/extdatewidget.h" -ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n( "Script Builder" ), Close, Close, parent, name ), +ScriptBuilder::ScriptBuilder( TQWidget *tqparent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n( "Script Builder" ), Close, Close, tqparent, name ), UnsavedChanges(false), currentFileURL(), currentDir( TQDir::homeDirPath() ), currentScriptName(), currentAuthor() { TQFrame *page = plainPage(); - ks = (KStars*)parent; + ks = (KStars*)tqparent; TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); sb = new ScriptBuilderUI( page ); vlay->addWidget( sb ); @@ -118,7 +118,7 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) //Initialize function templates and descriptions KStarsFunctionList.append( new ScriptFunction( "lookTowards", i18n( "Point the display at the specified location. %1 can be the name of an object, a cardinal point on the compass, or 'zenith'." ), - false, "TQString", "dir" ) ); + false, TQSTRING_OBJECT_NAME_STRING, "dir" ) ); KStarsFunctionList.append( new ScriptFunction( "setRaDec", i18n( "Point the display at the specified RA/Dec coordinates. %1 is expressed in Hours; %2 is expressed in Degrees." ), false, "double", "ra", "double", "dec" ) ); KStarsFunctionList.append( new ScriptFunction( "setAltAz", i18n( "Point the display at the specified Alt/Az coordinates. %1 and %2 are expressed in Degrees." ), @@ -131,14 +131,14 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) false, "int", "year", "int", "month", "int", "day", "int", "hour", "int", "minute", "int", "second" ) ); KStarsFunctionList.append( new ScriptFunction( "waitFor", i18n( "Pause script execution for %1 seconds." ), false, "double", "sec" ) ); KStarsFunctionList.append( new ScriptFunction( "waitForKey", i18n( "Halt script execution until the key %1 is pressed. Only single-key strokes are possible; use 'space' for the spacebar." ), - false, "TQString", "key" ) ); + false, TQSTRING_OBJECT_NAME_STRING, "key" ) ); KStarsFunctionList.append( new ScriptFunction( "setTracking", i18n( "Set whether the display is tracking the current location." ), false, "bool", "track" ) ); - KStarsFunctionList.append( new ScriptFunction( "changeViewOption", i18n( "Change view option named %1 to value %2." ), false, "TQString", "opName", "TQString", "opValue" ) ); + KStarsFunctionList.append( new ScriptFunction( "changeViewOption", i18n( "Change view option named %1 to value %2." ), false, TQSTRING_OBJECT_NAME_STRING, "opName", TQSTRING_OBJECT_NAME_STRING, "opValue" ) ); KStarsFunctionList.append( new ScriptFunction( "setGeoLocation", i18n( "Set the geographic location to the city specified by %1, %2 and %3." ), - false, "TQString", "cityName", "TQString", "provinceName", "TQString", "countryName" ) ); - KStarsFunctionList.append( new ScriptFunction( "setColor", i18n( "Set the color named %1 to the value %2." ), false, "TQString", "colorName", "TQString", "value" ) ); - KStarsFunctionList.append( new ScriptFunction( "loadColorScheme", i18n( "Load the color scheme named %1." ), false, "TQString", "name" ) ); - KStarsFunctionList.append( new ScriptFunction( "exportImage", i18n( "Export the sky image to the file %1, with width %2 and height %3." ), false, "TQString", "fileName", "int", "width", "int", "height" ) ); + false, TQSTRING_OBJECT_NAME_STRING, "cityName", TQSTRING_OBJECT_NAME_STRING, "provinceName", TQSTRING_OBJECT_NAME_STRING, "countryName" ) ); + KStarsFunctionList.append( new ScriptFunction( "setColor", i18n( "Set the color named %1 to the value %2." ), false, TQSTRING_OBJECT_NAME_STRING, "colorName", TQSTRING_OBJECT_NAME_STRING, "value" ) ); + KStarsFunctionList.append( new ScriptFunction( "loadColorScheme", i18n( "Load the color scheme named %1." ), false, TQSTRING_OBJECT_NAME_STRING, "name" ) ); + KStarsFunctionList.append( new ScriptFunction( "exportImage", i18n( "Export the sky image to the file %1, with width %2 and height %3." ), false, TQSTRING_OBJECT_NAME_STRING, "fileName", "int", "width", "int", "height" ) ); KStarsFunctionList.append( new ScriptFunction( "printImage", i18n( "Print the sky image to a printer or file. If %1 is true, it will show the print dialog. If %2 is true, it will use the Star Chart color scheme for printing." ), false, "bool", "usePrintDialog", "bool", "useChartColors" ) ); KStarsFunctionList.append( new ScriptFunction( "stop", i18n( "Halt the simulation clock." ), true ) ); KStarsFunctionList.append( new ScriptFunction( "start", i18n( "Start the simulation clock." ), true ) ); @@ -147,71 +147,71 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) // INDI fuctions ScriptFunction *startINDIFunc(NULL), *shutdownINDIFunc(NULL), *switchINDIFunc(NULL), *setINDIPortFunc(NULL), *setINDIScopeActionFunc(NULL), *setINDITargetCoordFunc(NULL), *setINDITargetNameFunc(NULL), *setINDIGeoLocationFunc(NULL), *setINDIUTCFunc(NULL), *setINDIActionFunc(NULL), *waitForINDIActionFunc(NULL), *setINDIFocusSpeedFunc(NULL), *startINDIFocusFunc(NULL), *setINDIFocusTimeoutFunc(NULL), *setINDICCDTempFunc(NULL), *setINDIFilterNumFunc(NULL), *setINDIFrameTypeFunc(NULL), *startINDIExposureFunc(NULL); - startINDIFunc = new ScriptFunction( "startINDI", i18n("Establish an INDI device either in local mode or server mode."), false, "TQString", "deviceName", "bool", "useLocal"); + startINDIFunc = new ScriptFunction( "startINDI", i18n("Establish an INDI device either in local mode or server mode."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "bool", "useLocal"); INDIFunctionList.append ( startINDIFunc ); - shutdownINDIFunc = new ScriptFunction( "shutdownINDI", i18n("Shutdown an INDI device."), false, "TQString", "deviceName"); + shutdownINDIFunc = new ScriptFunction( "shutdownINDI", i18n("Shutdown an INDI device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName"); INDIFunctionList.append ( shutdownINDIFunc); - switchINDIFunc = new ScriptFunction( "switchINDI", i18n("Connect or Disconnect an INDI device."), false, "TQString", "deviceName", "bool", "turnOn"); + switchINDIFunc = new ScriptFunction( "switchINDI", i18n("Connect or Disconnect an INDI device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "bool", "turnOn"); switchINDIFunc->setINDIProperty("CONNECTION"); INDIFunctionList.append ( switchINDIFunc); - setINDIPortFunc = new ScriptFunction( "setINDIPort", i18n("Set INDI's device connection port."), false, "TQString", "deviceName", "TQString", "port"); + setINDIPortFunc = new ScriptFunction( "setINDIPort", i18n("Set INDI's device connection port."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "port"); setINDIPortFunc->setINDIProperty("DEVICE_PORT"); INDIFunctionList.append ( setINDIPortFunc); - setINDIScopeActionFunc = new ScriptFunction( "setINDIScopeAction", i18n("Set the telescope action. Available actions are SLEW, TRACK, SYNC, PARK, and ABORT."), false, "TQString", "deviceName", "TQString", "action"); + setINDIScopeActionFunc = new ScriptFunction( "setINDIScopeAction", i18n("Set the telescope action. Available actions are SLEW, TRACK, SYNC, PARK, and ABORT."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "action"); setINDIScopeActionFunc->setINDIProperty("CHECK"); INDIFunctionList.append( setINDIScopeActionFunc); - setINDITargetCoordFunc = new ScriptFunction ( "setINDITargetCoord", i18n( "Set the telescope target coordinates to the RA/Dec coordinates. RA is expressed in Hours; DEC is expressed in Degrees." ), false, "TQString", "deviceName", "double", "RA", "double", "DEC" ); - setINDITargetCoordFunc->setINDIProperty("EQUATORIAL_EOD_COORD"); + setINDITargetCoordFunc = new ScriptFunction ( "setINDITargetCoord", i18n( "Set the telescope target coordinates to the RA/Dec coordinates. RA is expressed in Hours; DEC is expressed in Degrees." ), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "RA", "double", "DEC" ); + setINDITargetCoordFunc->setINDIProperty("ETQUATORIAL_EOD_COORD"); INDIFunctionList.append ( setINDITargetCoordFunc ); - setINDITargetNameFunc = new ScriptFunction( "setINDITargetName", i18n("Set the telescope target coorinates to the RA/Dec coordinates of the selected object."), false, "TQString", "deviceName", "TQString", "objectName"); - setINDITargetNameFunc->setINDIProperty("EQUATORIAL_EOD_COORD"); + setINDITargetNameFunc = new ScriptFunction( "setINDITargetName", i18n("Set the telescope target coorinates to the RA/Dec coordinates of the selected object."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "objectName"); + setINDITargetNameFunc->setINDIProperty("ETQUATORIAL_EOD_COORD"); INDIFunctionList.append( setINDITargetNameFunc); - setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, "TQString", "deviceName", "double", "long", "double", "lat"); + setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "long", "double", "lat"); setINDIGeoLocationFunc->setINDIProperty("GEOGRAPHIC_COORD"); INDIFunctionList.append( setINDIGeoLocationFunc); - setINDIUTCFunc = new ScriptFunction ( "setINDIUTC", i18n("Set the device UTC time in ISO 8601 format YYYY/MM/DDTHH:MM:SS."), false, "TQString", "deviceName", "TQString", "UTCDateTime"); + setINDIUTCFunc = new ScriptFunction ( "setINDIUTC", i18n("Set the device UTC time in ISO 8601 format YYYY/MM/DDTHH:MM:SS."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "UTCDateTime"); setINDIUTCFunc->setINDIProperty("TIME"); INDIFunctionList.append( setINDIUTCFunc); - setINDIActionFunc = new ScriptFunction( "setINDIAction", i18n("Activate an INDI action. The action is the name of any INDI switch property element supported by the device."), false, "TQString", "deviceName", "TQString", "actionName"); + setINDIActionFunc = new ScriptFunction( "setINDIAction", i18n("Activate an INDI action. The action is the name of any INDI switch property element supported by the device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "actionName"); INDIFunctionList.append( setINDIActionFunc); - waitForINDIActionFunc = new ScriptFunction ("waitForINDIAction", i18n("Pause script execution until action returns with OK status. The action can be the name of any INDI property supported by the device."), false, "TQString", "deviceName", "TQString", "actionName"); + waitForINDIActionFunc = new ScriptFunction ("waitForINDIAction", i18n("Pause script execution until action returns with OK status. The action can be the name of any INDI property supported by the device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "actionName"); INDIFunctionList.append( waitForINDIActionFunc ); - setINDIFocusSpeedFunc = new ScriptFunction ("setINDIFocusSpeed", i18n("Set the telescope focuser speed. Set speed to 0 to halt the focuser. 1-3 correspond to slow, medium, and fast speeds respectively."), false, "TQString", "deviceName", "unsigned int", "speed"); + setINDIFocusSpeedFunc = new ScriptFunction ("setINDIFocusSpeed", i18n("Set the telescope focuser speed. Set speed to 0 to halt the focuser. 1-3 correspond to slow, medium, and fast speeds respectively."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "unsigned int", "speed"); setINDIFocusSpeedFunc->setINDIProperty("FOCUS_SPEED"); INDIFunctionList.append( setINDIFocusSpeedFunc ); - startINDIFocusFunc = new ScriptFunction ("startINDIFocus", i18n("Start moving the focuser in the direction Dir, and for the duration specified by setINDIFocusTimeout."), false, "TQString", "deviceName", "TQString", "Dir"); + startINDIFocusFunc = new ScriptFunction ("startINDIFocus", i18n("Start moving the focuser in the direction Dir, and for the duration specified by setINDIFocusTimeout."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "Dir"); startINDIFocusFunc->setINDIProperty("FOCUS_MOTION"); INDIFunctionList.append( startINDIFocusFunc); - setINDIFocusTimeoutFunc = new ScriptFunction ( "setINDIFocusTimeout", i18n("Set the telescope focuser timer in seconds. This is the duration of any focusing procedure performed by calling startINDIFocus."), false, "TQString", "deviceName", "int", "timeout"); + setINDIFocusTimeoutFunc = new ScriptFunction ( "setINDIFocusTimeout", i18n("Set the telescope focuser timer in seconds. This is the duration of any focusing procedure performed by calling startINDIFocus."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "timeout"); setINDIFocusTimeoutFunc->setINDIProperty("FOCUS_TIMER"); INDIFunctionList.append( setINDIFocusTimeoutFunc); - setINDICCDTempFunc = new ScriptFunction( "setINDICCDTemp", i18n("Set the target CCD chip temperature."), false, "TQString", "deviceName", "int", "temp"); + setINDICCDTempFunc = new ScriptFunction( "setINDICCDTemp", i18n("Set the target CCD chip temperature."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "temp"); setINDICCDTempFunc->setINDIProperty("CCD_TEMPERATURE"); INDIFunctionList.append( setINDICCDTempFunc); - setINDIFilterNumFunc = new ScriptFunction( "setINDIFilterNum", i18n("Set the target filter position."), false, "TQString", "deviceName", "int", "filter_num"); + setINDIFilterNumFunc = new ScriptFunction( "setINDIFilterNum", i18n("Set the target filter position."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "filter_num"); setINDIFilterNumFunc->setINDIProperty("FILTER_SLOT"); INDIFunctionList.append ( setINDIFilterNumFunc); - setINDIFrameTypeFunc = new ScriptFunction( "setINDIFrameType", i18n("Set the CCD camera frame type. Available options are FRAME_LIGHT, FRAME_BIAS, FRAME_DARK, and FRAME_FLAT."), false, "TQString", "deviceName", "TQString", "type"); + setINDIFrameTypeFunc = new ScriptFunction( "setINDIFrameType", i18n("Set the CCD camera frame type. Available options are FRAME_LIGHT, FRAME_BIAS, FRAME_DARK, and FRAME_FLAT."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "type"); setINDIFrameTypeFunc->setINDIProperty("FRAME_TYPE"); INDIFunctionList.append( setINDIFrameTypeFunc); - startINDIExposureFunc = new ScriptFunction ( "startINDIExposure", i18n("Start Camera/CCD exposure. The duration is in seconds."), false, "TQString", "deviceName", "int", "timeout"); + startINDIExposureFunc = new ScriptFunction ( "startINDIExposure", i18n("Start Camera/CCD exposure. The duration is in seconds."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "timeout"); startINDIExposureFunc->setINDIProperty("CCD_EXPOSE_DURATION"); INDIFunctionList.append( startINDIExposureFunc); @@ -646,10 +646,10 @@ void ScriptBuilder::initViewOptions() { argChangeViewOption->OptionName->insertItem( "HideGrid" ); opsSkymap = new TQListViewItem( otv->OptionsList, i18n( "Skymap Options" ) ); - new TQListViewItem( opsSkymap, "UseAltAz", i18n( "Use Horizontal coordinates? (otherwise, use Equatorial)" ), i18n( "bool" ) ); + new TQListViewItem( opsSkymap, "UseAltAz", i18n( "UseQt::Horizontal coordinates? (otherwise, use Equatorial)" ), i18n( "bool" ) ); new TQListViewItem( opsSkymap, "ZoomFactor", i18n( "Set the Zoom Factor" ), i18n( "double" ) ); new TQListViewItem( opsSkymap, "FOV Size", i18n( "Select angular size for the FOV symbol (in arcmin)" ), i18n( "double" ) ); - new TQListViewItem( opsSkymap, "FOV Shape", i18n( "Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)" ), i18n( "int" ) ); + new TQListViewItem( opsSkymap, "FOV Shape", i18n( "Select tqshape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)" ), i18n( "int" ) ); new TQListViewItem( opsSkymap, "FOV Color", i18n( "Select color for the FOV symbol" ), i18n( "string" ) ); new TQListViewItem( opsSkymap, "AnimateSlewing", i18n( "Use animated slewing? (otherwise, \"snap\" to new focus)" ), i18n( "bool" ) ); new TQListViewItem( opsSkymap, "UseRefraction", i18n( "Correct for atmospheric refraction?" ), i18n( "bool" ) ); @@ -709,7 +709,7 @@ void ScriptBuilder::initViewOptions() { while ( !stream.eof() ) { line = stream.readLine(); - argLoadColorScheme->SchemeList->insertItem( line.left( line.find( ':' ) ) ); + argLoadColorScheme->SchemeList->insertItem( line.left( line.tqfind( ':' ) ) ); } file.close(); } @@ -759,7 +759,7 @@ void ScriptBuilder::slotOpen() { TQFile f( fname ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1." ).arg( f.name() ); + TQString message = i18n( "Could not open file %1." ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); currentFileURL = ""; return; @@ -770,7 +770,7 @@ void ScriptBuilder::slotOpen() { f.close(); } else if ( ! currentFileURL.url().isEmpty() ) { - TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); currentFileURL = ""; } @@ -803,9 +803,9 @@ void ScriptBuilder::slotSave() { //Warn user if file exists if (TQFile::exists(currentFileURL.path())) { - int r=KMessageBox::warningContinueCancel(static_cast(parent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg(currentFileURL.fileName()), + "Overwrite it?" ).tqarg(currentFileURL.fileName()), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); @@ -819,7 +819,7 @@ void ScriptBuilder::slotSave() { TQFile f( fname ); if ( !f.open( IO_WriteOnly) ) { - TQString message = i18n( "Could not open file %1." ).arg( f.name() ); + TQString message = i18n( "Could not open file %1." ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); currentFileURL = ""; return; @@ -834,7 +834,7 @@ void ScriptBuilder::slotSave() { if ( tmpfile.name() == fname ) { //need to upload to remote location if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( currentFileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } @@ -842,7 +842,7 @@ void ScriptBuilder::slotSave() { setUnsavedChanges( false ); } else { - TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); currentFileURL = ""; } @@ -885,7 +885,7 @@ void ScriptBuilder::slotRunScript() { TQFile f( fname ); if ( f.exists() ) f.remove(); if ( !f.open( IO_WriteOnly) ) { - TQString message = i18n( "Could not open file %1." ).arg( f.name() ); + TQString message = i18n( "Could not open file %1." ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); currentFileURL = ""; return; @@ -903,7 +903,7 @@ void ScriptBuilder::slotRunScript() { if ( ! p.start( KProcess::DontCare ) ) kdDebug() << "Process did not start." << endl; - while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes. //delete temp file if ( f.exists() ) f.remove(); @@ -920,9 +920,9 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { ostream << "#!/bin/bash" << endl; ostream << "#KStars DCOP script: " << currentScriptName << endl; ostream << "#by " << currentAuthor << endl; - ostream << "#last modified: " << KStarsDateTime::currentDateTime().toString() << endl; + ostream << "#last modified: " << KStarsDateTime::tqcurrentDateTime().toString() << endl; ostream << "#" << endl; - ostream << "KSTARS=`dcopfind -a 'kstars*'`" << endl; + ostream << "KSTARS=`dcoptqfind -a 'kstars*'`" << endl; ostream << "MAIN=KStarsInterface" << endl; ostream << "CLOCK=clock#1" << endl; @@ -935,7 +935,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { ostream << mainpre << sf->scriptLine() << endl; if (sb->AppendINDIWait->isChecked() && !sf->INDIProperty().isEmpty()) { - // Special case for telescope action, we need to know the parent property + // Special case for telescope action, we need to know the tqparent property if (sf->INDIProperty() == "CHECK") { if (sf->argVal(1) == "SLEW" || sf->argVal(1) == "TRACK" || sf->argVal(1) == "SYNC") @@ -946,7 +946,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { sf->setINDIProperty("PARK"); } - if ( sf->argVal(0).contains(" ")) + if ( sf->argVal(0).tqcontains(" ")) ostream << mainpre << "waitForINDIAction " << "\"" << sf->argVal(0) << "\" " << sf->INDIProperty() << endl; else ostream << mainpre << "waitForINDIAction " << sf->argVal(0) << " " << sf->INDIProperty() << endl; @@ -965,11 +965,11 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { line = istream.readLine(); //look for name of script - if ( line.contains( "#KStars DCOP script: " ) ) + if ( line.tqcontains( "#KStars DCOP script: " ) ) currentScriptName = line.mid( 21 ).stripWhiteSpace(); //look for author of scriptbuilder - if ( line.contains( "#by " ) ) + if ( line.tqcontains( "#by " ) ) currentAuthor = line.mid( 4 ).stripWhiteSpace(); //Actual script functions @@ -977,7 +977,7 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { //is ClockFunction? bool clockfcn( false ); - if ( line.contains( "$CLOCK" ) ) clockfcn = true; + if ( line.tqcontains( "$CLOCK" ) ) clockfcn = true; //remove leading dcop prefix line = line.mid( 20 ); @@ -990,7 +990,7 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { // Initially, any read script is valid! ScriptList.current()->setValid(true); } - else kdWarning() << i18n( "Could not parse script. Line was: %1" ).arg( line ) << endl; + else kdWarning() << i18n( "Could not parse script. Line was: %1" ).tqarg( line ) << endl; } // end if left(4) == "dcop" } // end while !eof() @@ -1322,7 +1322,7 @@ void ScriptBuilder::slotArgWidget() { if (ok) month = sf->argVal(1).toInt(&ok); if (ok) day = sf->argVal(2).toInt(&ok); if (ok) argSetLocalTime->DateBox->setDate( ExtDate( year, month, day ) ); - else argSetLocalTime->DateBox->setDate( ExtDate::currentDate() ); + else argSetLocalTime->DateBox->setDate( ExtDate::tqcurrentDate() ); hour = sf->argVal(3).toInt(&ok); if ( sf->argVal(3).isEmpty() ) ok = false; @@ -1369,7 +1369,7 @@ void ScriptBuilder::slotArgWidget() { } else if ( sf->name() == "loadColorScheme" ) { sb->ArgStack->raiseWidget( argLoadColorScheme ); - argLoadColorScheme->SchemeList->setCurrentItem( argLoadColorScheme->SchemeList->findItem( sf->argVal(0).remove('\"'), 0 ) ); + argLoadColorScheme->SchemeList->setCurrentItem( argLoadColorScheme->SchemeList->tqfindItem( sf->argVal(0).remove('\"'), 0 ) ); } else if ( sf->name() == "stop" ) { sb->ArgStack->raiseWidget( argBlank ); @@ -1820,7 +1820,7 @@ void ScriptBuilder::slotFindCity() { sf->setArg( 1, ld.selectedProvinceName() ); sf->setArg( 2, ld.selectedCountryName() ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl; } } } @@ -1869,7 +1869,7 @@ void ScriptBuilder::slotLookToward() { sf->setArg( 0, argLookToward->FocusEdit->currentText() ); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "lookTowards" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "lookTowards" ) << endl; } } @@ -1885,7 +1885,7 @@ void ScriptBuilder::slotRa() { if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 0, TQString( "%1" ).arg( ra.Hours() ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( ra.Hours() ) ); if ( ! sf->argVal(1).isEmpty() ) sf->setValid( true ); } else { @@ -1893,7 +1893,7 @@ void ScriptBuilder::slotRa() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setRaDec" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setRaDec" ) << endl; } } @@ -1909,7 +1909,7 @@ void ScriptBuilder::slotDec() { if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 1, TQString( "%1" ).arg( dec.Degrees() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( dec.Degrees() ) ); if ( ! sf->argVal(0).isEmpty() ) sf->setValid( true ); } else { @@ -1917,7 +1917,7 @@ void ScriptBuilder::slotDec() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setRaDec" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setRaDec" ) << endl; } } @@ -1932,14 +1932,14 @@ void ScriptBuilder::slotAz() { dms az = argSetAltAz->AzBox->createDms(true, &ok); if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 1, TQString( "%1" ).arg( az.Degrees() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( az.Degrees() ) ); if ( ! sf->argVal(0).isEmpty() ) sf->setValid( true ); } else { sf->setArg( 1, "" ); sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setAltAz" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setAltAz" ) << endl; } } @@ -1955,14 +1955,14 @@ void ScriptBuilder::slotAlt() { if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 0, TQString( "%1" ).arg( alt.Degrees() ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( alt.Degrees() ) ); if ( ! sf->argVal(1).isEmpty() ) sf->setValid( true ); } else { sf->setArg( 0, "" ); sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setAltAz" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setAltAz" ) << endl; } } @@ -1974,12 +1974,12 @@ void ScriptBuilder::slotChangeDate() { ExtDate date = argSetLocalTime->DateBox->date(); - sf->setArg( 0, TQString( "%1" ).arg( date.year() ) ); - sf->setArg( 1, TQString( "%1" ).arg( date.month() ) ); - sf->setArg( 2, TQString( "%1" ).arg( date.day() ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( date.year() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( date.month() ) ); + sf->setArg( 2, TQString( "%1" ).tqarg( date.day() ) ); if ( ! sf->argVal(3).isEmpty() ) sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setLocalTime" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setLocalTime" ) << endl; } } @@ -1991,12 +1991,12 @@ void ScriptBuilder::slotChangeTime() { TQTime time = argSetLocalTime->TimeBox->time(); - sf->setArg( 3, TQString( "%1" ).arg( time.hour() ) ); - sf->setArg( 4, TQString( "%1" ).arg( time.minute() ) ); - sf->setArg( 5, TQString( "%1" ).arg( time.second() ) ); + sf->setArg( 3, TQString( "%1" ).tqarg( time.hour() ) ); + sf->setArg( 4, TQString( "%1" ).tqarg( time.minute() ) ); + sf->setArg( 5, TQString( "%1" ).tqarg( time.second() ) ); if ( ! sf->argVal(0).isEmpty() ) sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setLocalTime" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setLocalTime" ) << endl; } } @@ -2010,13 +2010,13 @@ void ScriptBuilder::slotWaitFor() { if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 0, TQString( "%1" ).arg( delay ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( delay ) ); sf->setValid( true ); } else { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitFor" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitFor" ) << endl; } } @@ -2037,7 +2037,7 @@ void ScriptBuilder::slotWaitForKey() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitForKey" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitForKey" ) << endl; } } @@ -2050,7 +2050,7 @@ void ScriptBuilder::slotTracking() { sf->setArg( 0, ( argSetTracking->CheckTrack->isChecked() ? i18n( "true" ) : i18n( "false" ) ) ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setTracking" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setTracking" ) << endl; } } @@ -2069,7 +2069,7 @@ void ScriptBuilder::slotViewOption() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "changeViewOption" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "changeViewOption" ) << endl; } } @@ -2089,7 +2089,7 @@ void ScriptBuilder::slotChangeCity() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl; } } @@ -2109,7 +2109,7 @@ void ScriptBuilder::slotChangeProvince() { //might not be invalid } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl; } } @@ -2129,7 +2129,7 @@ void ScriptBuilder::slotChangeCountry() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl; } } @@ -2139,10 +2139,10 @@ void ScriptBuilder::slotTimeScale() { if ( sf->name() == "setClockScale" ) { setUnsavedChanges( true ); - sf->setArg( 0, TQString( "%1" ).arg( argTimeScale->TimeScale->tsbox()->timeScale() ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( argTimeScale->TimeScale->tsbox()->timeScale() ) ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setClockScale" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setClockScale" ) << endl; } } @@ -2159,7 +2159,7 @@ void ScriptBuilder::slotZoom() { sf->setValid( true ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "zoom" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "zoom" ) << endl; } } @@ -2170,11 +2170,11 @@ void ScriptBuilder::slotExportImage() { setUnsavedChanges( true ); sf->setArg( 0, argExportImage->ExportFileName->url() ); - sf->setArg( 1, TQString("%1").arg( argExportImage->ExportWidth->value() ) ); - sf->setArg( 2, TQString("%1").arg( argExportImage->ExportHeight->value() ) ); + sf->setArg( 1, TQString("%1").tqarg( argExportImage->ExportWidth->value() ) ); + sf->setArg( 2, TQString("%1").tqarg( argExportImage->ExportHeight->value() ) ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "exportImage" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "exportImage" ) << endl; } } @@ -2188,7 +2188,7 @@ void ScriptBuilder::slotPrintImage() { sf->setArg( 1, ( argPrintImage->UseChartColors->isChecked() ? i18n( "true" ) : i18n( "false" ) ) ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "exportImage" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "exportImage" ) << endl; } } @@ -2205,7 +2205,7 @@ void ScriptBuilder::slotChangeColorName() { sf->setArg( 1, cname ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setColor" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setColor" ) << endl; } } @@ -2221,7 +2221,7 @@ void ScriptBuilder::slotChangeColor() { sf->setArg( 1, cname ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setColor" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setColor" ) << endl; } } @@ -2234,7 +2234,7 @@ void ScriptBuilder::slotLoadColorScheme(TQListBoxItem */*i*/) { sf->setArg( 0, "\"" + argLoadColorScheme->SchemeList->currentText() + "\"" ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "loadColorScheme" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "loadColorScheme" ) << endl; } } @@ -2263,7 +2263,7 @@ void ScriptBuilder::slotINDIStartDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDI" ) << endl; } } @@ -2282,7 +2282,7 @@ void ScriptBuilder::slotINDIStartDeviceMode() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDI" ) << endl; } } @@ -2308,7 +2308,7 @@ void ScriptBuilder::slotINDIShutdown() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "shutdownINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "shutdownINDI" ) << endl; } } @@ -2334,7 +2334,7 @@ void ScriptBuilder::slotINDISwitchDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "switchdownINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "switchdownINDI" ) << endl; } } @@ -2356,7 +2356,7 @@ void ScriptBuilder::slotINDISwitchDeviceConnection() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "switchINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "switchINDI" ) << endl; } } @@ -2384,7 +2384,7 @@ void ScriptBuilder::slotINDISetPortDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIPort" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIPort" ) << endl; } @@ -2412,7 +2412,7 @@ void ScriptBuilder::slotINDISetPortDevicePort() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIPort" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIPort" ) << endl; } } @@ -2438,7 +2438,7 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetCoord" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetCoord" ) << endl; } } @@ -2459,10 +2459,10 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceRA() dms ra = argSetTargetCoordINDI->RaBox->createDms(false, &ok); if ( ok ) { - if (sf->argVal(1) != TQString( "%1" ).arg( ra.Hours() )) + if (sf->argVal(1) != TQString( "%1" ).tqarg( ra.Hours() )) setUnsavedChanges( true ); - sf->setArg( 1, TQString( "%1" ).arg( ra.Hours() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( ra.Hours() ) ); if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(2).isEmpty() )) sf->setValid( true ); else sf->setValid(false); @@ -2471,7 +2471,7 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceRA() sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetCoord" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetCoord" ) << endl; } } @@ -2492,10 +2492,10 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceDEC() dms dec = argSetTargetCoordINDI->DecBox->createDms(true, &ok); if ( ok ) { - if (sf->argVal(2) != TQString( "%1" ).arg( dec.Degrees() )) + if (sf->argVal(2) != TQString( "%1" ).tqarg( dec.Degrees() )) setUnsavedChanges( true ); - sf->setArg( 2, TQString( "%1" ).arg( dec.Degrees() ) ); + sf->setArg( 2, TQString( "%1" ).tqarg( dec.Degrees() ) ); if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(1).isEmpty() )) sf->setValid( true ); else sf->setValid(false); @@ -2504,7 +2504,7 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceDEC() sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetCoord" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetCoord" ) << endl; } } @@ -2531,7 +2531,7 @@ void ScriptBuilder::slotINDISetTargetNameDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetName" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetName" ) << endl; } } @@ -2558,7 +2558,7 @@ void ScriptBuilder::slotINDISetTargetNameObjectName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetName" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetName" ) << endl; } } @@ -2585,7 +2585,7 @@ void ScriptBuilder::slotINDISetActionDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIAction") << endl; } } @@ -2611,7 +2611,7 @@ void ScriptBuilder::slotINDISetActionName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIAction") << endl; } } @@ -2638,7 +2638,7 @@ void ScriptBuilder::slotINDIWaitForActionDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitForINDIAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitForINDIAction") << endl; } } @@ -2664,7 +2664,7 @@ void ScriptBuilder::slotINDIWaitForActionName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitForINDIAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitForINDIAction") << endl; } } @@ -2685,12 +2685,12 @@ void ScriptBuilder::slotINDISetFocusSpeedDeviceName() setUnsavedChanges( true ); sf->setArg(0, argSetFocusSpeedINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argSetFocusSpeedINDI->speedIN->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFocusSpeedINDI->speedIN->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusSpeed") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusSpeed") << endl; } } @@ -2705,13 +2705,13 @@ void ScriptBuilder::slotINDISetFocusSpeed() if (sf->argVal(1).toInt() != argSetFocusSpeedINDI->speedIN->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argSetFocusSpeedINDI->speedIN->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFocusSpeedINDI->speedIN->value())); if ((! sf->argVal(0).isEmpty())) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusSpeed") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusSpeed") << endl; } } @@ -2737,7 +2737,7 @@ void ScriptBuilder::slotINDIStartFocusDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "StartINDIFocus") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "StartINDIFocus") << endl; } } @@ -2758,7 +2758,7 @@ void ScriptBuilder::slotINDIStartFocusDirection() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDIFocus") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDIFocus") << endl; } } @@ -2779,12 +2779,12 @@ void ScriptBuilder::slotINDISetFocusTimeoutDeviceName() setUnsavedChanges( true ); sf->setArg(0, argSetFocusTimeoutINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argSetFocusTimeoutINDI->timeOut->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFocusTimeoutINDI->timeOut->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusTimeout") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusTimeout") << endl; } } @@ -2798,13 +2798,13 @@ void ScriptBuilder::slotINDISetFocusTimeout() if (sf->argVal(1).toInt() != argSetFocusTimeoutINDI->timeOut->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argSetFocusTimeoutINDI->timeOut->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFocusTimeoutINDI->timeOut->value())); if (! sf->argVal(0).isEmpty()) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusTimeout") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusTimeout") << endl; } } @@ -2830,7 +2830,7 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIGeoLocation" ) << endl; } } @@ -2851,10 +2851,10 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLong() dms longitude = argSetGeoLocationINDI->longBox->createDms(true, &ok); if ( ok ) { - if (sf->argVal(1) != TQString( "%1" ).arg( longitude.Degrees())) + if (sf->argVal(1) != TQString( "%1" ).tqarg( longitude.Degrees())) setUnsavedChanges( true ); - sf->setArg( 1, TQString( "%1" ).arg( longitude.Degrees() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( longitude.Degrees() ) ); if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(2).isEmpty() )) sf->setValid( true ); else sf->setValid(false); @@ -2863,7 +2863,7 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLong() sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIGeoLocation" ) << endl; } } @@ -2884,10 +2884,10 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLat() dms latitude = argSetGeoLocationINDI->latBox->createDms(true, &ok); if ( ok ) { - if (sf->argVal(2) != TQString( "%1" ).arg( latitude.Degrees())) + if (sf->argVal(2) != TQString( "%1" ).tqarg( latitude.Degrees())) setUnsavedChanges( true ); - sf->setArg( 2, TQString( "%1" ).arg( latitude.Degrees() ) ); + sf->setArg( 2, TQString( "%1" ).tqarg( latitude.Degrees() ) ); if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(1).isEmpty() )) sf->setValid( true ); else sf->setValid(false); @@ -2896,7 +2896,7 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLat() sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIGeoLocation" ) << endl; } } @@ -2917,12 +2917,12 @@ void ScriptBuilder::slotINDIStartExposureDeviceName() setUnsavedChanges( true ); sf->setArg(0, argStartExposureINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argStartExposureINDI->timeOut->value())); + sf->setArg(1, TQString("%1").tqarg(argStartExposureINDI->timeOut->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDIExposure") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDIExposure") << endl; } } @@ -2937,13 +2937,13 @@ void ScriptBuilder::slotINDIStartExposureTimeout() if (sf->argVal(1).toInt() != argStartExposureINDI->timeOut->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argStartExposureINDI->timeOut->value())); + sf->setArg(1, TQString("%1").tqarg(argStartExposureINDI->timeOut->value())); if (! sf->argVal(0).isEmpty()) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDIExposure") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDIExposure") << endl; } } @@ -2970,7 +2970,7 @@ void ScriptBuilder::slotINDISetUTCDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIUTC" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIUTC" ) << endl; } @@ -2998,7 +2998,7 @@ void ScriptBuilder::slotINDISetUTC() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIUTC" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIUTC" ) << endl; } } @@ -3026,7 +3026,7 @@ void ScriptBuilder::slotINDISetScopeActionDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIScopeAction" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIScopeAction" ) << endl; } } @@ -3048,7 +3048,7 @@ void ScriptBuilder::slotINDISetScopeAction() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIScopeAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIScopeAction") << endl; } } @@ -3075,7 +3075,7 @@ void ScriptBuilder::slotINDISetFrameTypeDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFrameType" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFrameType" ) << endl; } } @@ -3096,7 +3096,7 @@ void ScriptBuilder::slotINDISetFrameType() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFrameType") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFrameType") << endl; } } @@ -3117,12 +3117,12 @@ void ScriptBuilder::slotINDISetCCDTempDeviceName() setUnsavedChanges( true ); sf->setArg(0, argSetCCDTempINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argSetCCDTempINDI->temp->value())); + sf->setArg(1, TQString("%1").tqarg(argSetCCDTempINDI->temp->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDICCDTemp") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDICCDTemp") << endl; } } @@ -3137,13 +3137,13 @@ void ScriptBuilder::slotINDISetCCDTemp() if (sf->argVal(1).toInt() != argSetCCDTempINDI->temp->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argSetCCDTempINDI->temp->value())); + sf->setArg(1, TQString("%1").tqarg(argSetCCDTempINDI->temp->value())); if (! sf->argVal(0).isEmpty()) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDICCDTemp") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDICCDTemp") << endl; } } @@ -3165,12 +3165,12 @@ void ScriptBuilder::slotINDISetFilterNumDeviceName() setUnsavedChanges( true ); sf->setArg(0, argSetFilterNumINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argSetFilterNumINDI->filter_num->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFilterNumINDI->filter_num->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFilterNum") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFilterNum") << endl; } } @@ -3185,13 +3185,13 @@ void ScriptBuilder::slotINDISetFilterNum() if (sf->argVal(1).toInt() != argSetFilterNumINDI->filter_num->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argSetFilterNumINDI->filter_num->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFilterNumINDI->filter_num->value())); if (! sf->argVal(0).isEmpty()) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFilterNum") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFilterNum") << endl; } diff --git a/kstars/kstars/tools/scriptbuilder.h b/kstars/kstars/tools/scriptbuilder.h index 0a532911..888028bd 100644 --- a/kstars/kstars/tools/scriptbuilder.h +++ b/kstars/kstars/tools/scriptbuilder.h @@ -68,8 +68,9 @@ class ArgSetFilterNumINDI; class ScriptBuilder : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ScriptBuilder( TQWidget *parent, const char *name=0 ); + ScriptBuilder( TQWidget *tqparent, const char *name=0 ); ~ScriptBuilder(); bool unsavedChanges() const { return UnsavedChanges; } @@ -168,7 +169,7 @@ private: ScriptBuilderUI *sb; - KStars *ks; //parent needed for sub-dialogs + KStars *ks; //tqparent needed for sub-dialogs TQPtrList KStarsFunctionList; TQPtrList INDIFunctionList; TQPtrList ScriptList; diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index 9de4797f..ad92aa6e 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -1,10 +1,10 @@ ScriptBuilderUI - + ScriptBuilderUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout5 + tqlayout5 @@ -39,13 +39,13 @@ 0 - + 32 32 - + 32 32 @@ -73,13 +73,13 @@ 0 - + 32 32 - + 32 32 @@ -107,13 +107,13 @@ 0 - + 32 32 - + 32 32 @@ -141,13 +141,13 @@ 0 - + 32 32 - + 32 32 @@ -167,13 +167,13 @@ RunButton - + 32 32 - + 32 32 @@ -199,7 +199,7 @@ Expanding - + 490 20 @@ -208,7 +208,7 @@ - + splitter1 @@ -221,7 +221,7 @@ Horizontal - + groupBox2 @@ -238,9 +238,9 @@ unnamed - + - layout6 + tqlayout6 @@ -265,9 +265,9 @@ This shows the list of commands present in the current working script. Highlighting any command will present a widget where you can specify its arguments below. Use the action buttons at right to copy, remove, or change the position of the selected command. - + - layout5 + tqlayout5 @@ -277,13 +277,13 @@ AddButton - + 32 32 - + 32 32 @@ -304,13 +304,13 @@ RemoveButton - + 32 32 - + 32 32 @@ -330,13 +330,13 @@ CopyButton - + 32 32 - + 32 32 @@ -356,13 +356,13 @@ UpButton - + 32 32 - + 32 32 @@ -382,13 +382,13 @@ DownButton - + 32 32 - + 32 32 @@ -414,7 +414,7 @@ Expanding - + 20 118 @@ -425,7 +425,7 @@ - + FuncArgBox @@ -437,7 +437,7 @@ 1 - + 200 140 @@ -450,7 +450,7 @@ unnamed - + ArgStack @@ -462,7 +462,7 @@ 1 - + page @@ -475,7 +475,7 @@ - + FunctionBrowser @@ -500,7 +500,7 @@ unnamed - + splitter7 @@ -552,23 +552,23 @@ - + - layout11 + tqlayout11 unnamed - + - layout10 + tqlayout10 unnamed - + AppendINDIWait @@ -579,7 +579,7 @@ false - + ReuseINDIDeviceName @@ -602,7 +602,7 @@ Expanding - + 91 20 @@ -613,7 +613,7 @@ - + slotAddFunction() slotMoveFunctionUp() slotMoveFunctionDown() @@ -626,8 +626,8 @@ slotCopyFunction() slotRemoveFunction() slotRunScript() - - + + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/tools/scriptfunction.cpp b/kstars/kstars/tools/scriptfunction.cpp index c95594f5..4a3b70f2 100644 --- a/kstars/kstars/tools/scriptfunction.cpp +++ b/kstars/kstars/tools/scriptfunction.cpp @@ -40,42 +40,42 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn, Description = ""; Description += ""; - Description += "

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

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

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

    "; //before adding description, replace any '%n' instances with the corresponding //argument name in color. For now, assume that the %n's occur in order, with no skips. //Also assume that '%' is *only* used to indicate argument instances - int narg = desc.contains( '%' ); + int narg = desc.tqcontains( '%' ); switch (narg ) { case 1: - Description += desc.arg( paramStyle.arg( an1 ) ); + Description += desc.tqarg( paramStyle.tqarg( an1 ) ); break; case 2: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ); break; case 3: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ) - .arg( paramStyle.arg( an3 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ) + .tqarg( paramStyle.tqarg( an3 ) ); break; case 4: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ) - .arg( paramStyle.arg( an3 ) ) - .arg( paramStyle.arg( an4 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ) + .tqarg( paramStyle.tqarg( an3 ) ) + .tqarg( paramStyle.tqarg( an4 ) ); break; case 5: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ) - .arg( paramStyle.arg( an3 ) ) - .arg( paramStyle.arg( an4 ) ) - .arg( paramStyle.arg( an5 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ) + .tqarg( paramStyle.tqarg( an3 ) ) + .tqarg( paramStyle.tqarg( an4 ) ) + .tqarg( paramStyle.tqarg( an5 ) ); break; case 6: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ) - .arg( paramStyle.arg( an3 ) ) - .arg( paramStyle.arg( an4 ) ) - .arg( paramStyle.arg( an5 ) ) - .arg( paramStyle.arg( an6 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ) + .tqarg( paramStyle.tqarg( an3 ) ) + .tqarg( paramStyle.tqarg( an4 ) ) + .tqarg( paramStyle.tqarg( an5 ) ) + .tqarg( paramStyle.tqarg( an6 ) ); break; default: Description += desc; @@ -206,7 +206,7 @@ TQString ScriptFunction::scriptLine() const { unsigned int i=0; while ( ! ArgName[i].isEmpty() && i < 6 ) { // Wrap arg in quotes if it contains a space - if ( ArgVal[i].contains(" ") ) { + if ( ArgVal[i].tqcontains(" ") ) { out += " \"" + ArgVal[i] + "\""; } else { out += " " + ArgVal[i]; diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui index bc493ad3..a7f4198f 100644 --- a/kstars/kstars/tools/scriptnamedialog.ui +++ b/kstars/kstars/tools/scriptnamedialog.ui @@ -1,10 +1,10 @@ ScriptNameDialog - + ScriptNameDialog - + 0 0 @@ -22,9 +22,9 @@ unnamed - + - layout3 + tqlayout3 @@ -41,7 +41,7 @@ Enter a name for the script. This is not the file name, just a short descriptive line of text. - + textLabel1 @@ -55,7 +55,7 @@ Script name: - + textLabel2 @@ -73,9 +73,9 @@ - + - layout2 + tqlayout2 @@ -91,14 +91,14 @@ Expanding - + 330 20 - + OKButton @@ -109,7 +109,7 @@ true - + CancelButton @@ -149,7 +149,7 @@ reject() - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp index 584c7dfc..73d3d8a1 100644 --- a/kstars/kstars/tools/wutdialog.cpp +++ b/kstars/kstars/tools/wutdialog.cpp @@ -81,8 +81,8 @@ WUTDialog::WUTDialog(KStars *ks) : TQString sGeo = geo->translatedName(); if ( ! geo->translatedProvince().isEmpty() ) sGeo += ", " + geo->translatedProvince(); sGeo += ", " + geo->translatedCountry(); - WUT->LocationLabel->setText( i18n( "at %1" ).arg( sGeo ) ); - WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString( Qt::LocalDate ) ) ); + WUT->LocationLabel->setText( i18n( "at %1" ).tqarg( sGeo ) ); + WUT->DateLabel->setText( i18n( "The night of %1" ).tqarg( Evening.date().toString( Qt::LocalDate ) ) ); initCategories(); @@ -164,9 +164,9 @@ void WUTDialog::init() { sDuration = TQString().sprintf( "%02d:%02d", hDur, mDur ); } - WUT->SunSetLabel->setText( i18n( "Sunset: %1" ).arg(sSet) ); - WUT->SunRiseLabel->setText( i18n( "Sunrise: %1" ).arg(sRise) ); - WUT->NightDurationLabel->setText( i18n( "Night duration: %1 hours" ).arg( sDuration ) ); + WUT->SunSetLabel->setText( i18n( "Sunset: %1" ).tqarg(sSet) ); + WUT->SunRiseLabel->setText( i18n( "Sunrise: %1" ).tqarg(sRise) ); + WUT->NightDurationLabel->setText( i18n( "Night duration: %1 hours" ).tqarg( sDuration ) ); // moon almanac information KSMoon *oMoon = (KSMoon*) kstars->data()->Moon; @@ -189,10 +189,10 @@ void WUTDialog::init() { sSet = moonSet.addSecs(30).toString("hh:mm"); } - WUT->MoonRiseLabel->setText( i18n( "Moon rises at: %1" ).arg( sRise ) ); - WUT->MoonSetLabel->setText( i18n( "Moon sets at: %1" ).arg( sSet ) ); + WUT->MoonRiseLabel->setText( i18n( "Moon rises at: %1" ).tqarg( sRise ) ); + WUT->MoonSetLabel->setText( i18n( "Moon sets at: %1" ).tqarg( sSet ) ); oMoon->findPhase( oSun ); - WUT->MoonIllumLabel->setText( oMoon->phaseName() + TQString( " (%1%)" ).arg( + WUT->MoonIllumLabel->setText( oMoon->phaseName() + TQString( " (%1%)" ).tqarg( int(100.0*oMoon->illum() ) ) ); //Restore Sun's and Moon's coordinates, and recompute Moon's original Phase @@ -242,7 +242,7 @@ void WUTDialog::appendToList(SkyObjectName *o) { void WUTDialog::slotLoadList(int i) { WUT->ObjectListBox->clear(); - setCursor(TQCursor(Qt::WaitCursor)); + setCursor(TQCursor(TQt::WaitCursor)); TQPtrList invisibleList; for (SkyObjectName *oname=lists.visibleList[i].first(); oname; oname=lists.visibleList[i].next()) { bool visible = true; @@ -265,7 +265,7 @@ void WUTDialog::slotLoadList(int i) { lists.visibleList[i].removeRef(o); } } - setCursor(TQCursor(Qt::ArrowCursor)); + setCursor(TQCursor(TQt::ArrowCursor)); lists.initialized[i] = true; // highlight first item @@ -352,9 +352,9 @@ void WUTDialog::slotDisplayObject(TQListBoxItem *item) { WUT->DetailButton->setEnabled( true ); } - WUT->ObjectRiseLabel->setText( i18n( "Rises at: %1" ).arg( sRise ) ); - WUT->ObjectTransitLabel->setText( i18n( "Transits at: %1" ).arg( sTransit ) ); - WUT->ObjectSetLabel->setText( i18n( "Sets at: %1" ).arg( sSet ) ); + WUT->ObjectRiseLabel->setText( i18n( "Rises at: %1" ).tqarg( sRise ) ); + WUT->ObjectTransitLabel->setText( i18n( "Transits at: %1" ).tqarg( sTransit ) ); + WUT->ObjectSetLabel->setText( i18n( "Sets at: %1" ).tqarg( sSet ) ); } void WUTDialog::slotCenter() { @@ -403,7 +403,7 @@ void WUTDialog::slotChangeDate() { Evening = T0.addSecs( -6*3600 ); EveningUT = geo->LTtoUT( Evening ); - WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString() ) ); + WUT->DateLabel->setText( i18n( "The night of %1" ).tqarg( Evening.date().toString() ) ); int i = WUT->CategoryListBox->currentItem(); init(); @@ -421,7 +421,7 @@ void WUTDialog::slotChangeLocation() { TomorrowUT = geo->LTtoUT( Tomorrow ); EveningUT = geo->LTtoUT( Evening ); - WUT->LocationLabel->setText( i18n( "at %1" ).arg( geo->fullName() ) ); + WUT->LocationLabel->setText( i18n( "at %1" ).tqarg( geo->fullName() ) ); int i = WUT->CategoryListBox->currentItem(); init(); diff --git a/kstars/kstars/tools/wutdialog.h b/kstars/kstars/tools/wutdialog.h index 409fa4d5..012cd2a7 100644 --- a/kstars/kstars/tools/wutdialog.h +++ b/kstars/kstars/tools/wutdialog.h @@ -41,6 +41,7 @@ class TQFrame; class WUTDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui index 824ffe20..46ce9902 100644 --- a/kstars/kstars/tools/wutdialogui.ui +++ b/kstars/kstars/tools/wutdialogui.ui @@ -1,10 +1,10 @@ WUTDialogUI - + WUTDialogUI - + 0 0 @@ -19,35 +19,35 @@ unnamed - + - layout25 + tqlayout25 unnamed - + - layout24 + tqlayout24 unnamed - + - layout23 + tqlayout23 unnamed - + LocationLabel - + 200 0 @@ -78,7 +78,7 @@ Expanding - + 30 20 @@ -95,18 +95,18 @@ Expanding - + 20 20 - + DateLabel - + 200 0 @@ -123,9 +123,9 @@ - + - layout13 + tqlayout13 @@ -141,14 +141,14 @@ Expanding - + 108 20 - + textLabel14 @@ -160,9 +160,9 @@ - + - layout9 + tqlayout9 @@ -226,7 +226,7 @@ - + groupBox2 @@ -237,11 +237,11 @@ unnamed - + SunRiseLabel - + 0 20 @@ -257,11 +257,11 @@ Displays the time of sunrise for the selected date. - + MoonRiseLabel - + 0 20 @@ -277,11 +277,11 @@ Displays the time at which the moon rises on the selected date. - + MoonSetLabel - + 0 20 @@ -297,11 +297,11 @@ Displays the time at which the moon sets on the selected date. - + SunSetLabel - + 0 20 @@ -317,11 +317,11 @@ Displays the time of sunset for the selected date. - + NightDurationLabel - + 0 20 @@ -337,11 +337,11 @@ Displays the duration between sunset and sunrise for the selected date. - + MoonIllumLabel - + 0 20 @@ -359,9 +359,9 @@ - + - layout10 + tqlayout10 @@ -377,14 +377,14 @@ Expanding - + 164 12 - + textLabel15 @@ -402,7 +402,7 @@ ObjectListBox - + 150 0 @@ -415,7 +415,7 @@ Objects listed here are above the horizon on the selected date, and have the object type which is highlighted in the "Choose a Category" list. - + ObjectBox @@ -426,42 +426,42 @@ unnamed - + ObjectRiseLabel Rises at: 22:12 - + AlignVCenter Displays the time at which the highlighted object rises above the horizon on the selected date. - + ObjectTransitLabel Transits at: 03:45 - + AlignVCenter Displays the time at which the highlighted object transits across the local meridian on the selected date. - + ObjectSetLabel Sets at: 08:22 - + AlignVCenter @@ -478,7 +478,7 @@ Fixed - + 20 40 @@ -519,7 +519,7 @@ CategoryListBox - + 100 0 @@ -532,7 +532,7 @@ Select an item in the Categories list to display objects in that category which are above the horizon on the selected date. - + textLabel16 @@ -552,7 +552,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/ktouch/ChangeLog b/ktouch/ChangeLog index 52a4a866..f8d02b6a 100644 --- a/ktouch/ChangeLog +++ b/ktouch/ChangeLog @@ -13,7 +13,7 @@ color scheme includes now keyboard and slide line colors, new option to have common slide line colors in configuration (request: #90548) - * Bugfix: several keyboard layouts were wrong (showing the + * Bugfix: several keyboard tqlayouts were wrong (showing the wrong colors and were therefore misleading), a few have been already fixed and the others temporarily removed from the install section of the make files @@ -33,7 +33,7 @@ (bug report: * Feature: default keyboard is selected based on KDE locale (requests: #54379, #99947) - * Feature: quick select lists of training lectures/keyboard layouts are now + * Feature: quick select lists of training lectures/keyboard tqlayouts are now sorted alphabetically * Bugfix: trailing spaces are removed from lines when lecture is read (bug: #107080) @@ -55,7 +55,7 @@ * Bugfix: fixed false error on reading single-level-lectures (bug: #120414) * Feature: lines with spaces at the end are trimmed (whitespace removed) * Feature: line length limit increased to 300 (request: #116838) - * Added: added new/fixed keyboard layouts + * Added: added new/fixed keyboard tqlayouts (requests: #40962, #85584, #119670) 2006-03-27 Andreas Nicolai @@ -81,7 +81,7 @@ * Bugfixes: sliding line typing limit, removed mid-level advance (due to popular request) reset session stats in every new level - * Added: new keyboard layout for switzerland-german keyboards + * Added: new keyboard tqlayout for switzerland-german keyboards 2004-11-02 Andreas Nicolai * Added: checks in the quick-select menues @@ -126,7 +126,7 @@ 2004-04-02 Andreas Nicolai (develop) - * Fixed a bug in ktouch.cpp (wrong slots type) + * Fixed a bug in ktouch.cpp (wrong Q_SLOTS type) * Cleaned up some files 2003-05-19 Haavard Froeiland @@ -240,7 +240,7 @@ (new version) * ktouch 0.60 is out * new features: - Change between different keyboard layouts. Supported keyboard's is English, German and Norwegian. + Change between different keyboard tqlayouts. Supported keyboard's is English, German and Norwegian. 2000-05-09 Haavard Froeiland diff --git a/ktouch/extras/training-gen/perl/dk.config b/ktouch/extras/training-gen/perl/dk.config index 409a07ca..46d7edd6 100644 --- a/ktouch/extras/training-gen/perl/dk.config +++ b/ktouch/extras/training-gen/perl/dk.config @@ -16,4 +16,4 @@ wn cæ x ,. -ABCDEFGHIJKLMNOPQRSTUVWYZÆØÅ \ No newline at end of file +ABCDEFGHIJKLMNOPTQRSTUVWYZÆØÅ \ No newline at end of file diff --git a/ktouch/extras/training-gen/perl/en.config b/ktouch/extras/training-gen/perl/en.config index bb5df1ae..cca13468 100644 --- a/ktouch/extras/training-gen/perl/en.config +++ b/ktouch/extras/training-gen/perl/en.config @@ -12,4 +12,4 @@ qu wn cx yz -ABCDEFGHIJKLMNOPQRSTUVWXYZ +ABCDEFGHIJKLMNOPTQRSTUVWXYZ diff --git a/ktouch/extras/training-gen/perl/es.config b/ktouch/extras/training-gen/perl/es.config index 49b8b32d..1efd7b72 100644 --- a/ktouch/extras/training-gen/perl/es.config +++ b/ktouch/extras/training-gen/perl/es.config @@ -14,4 +14,4 @@ qu wnñ cx yz -ABCDEFGHIJKLMNOPQRSTUVWXYZ +ABCDEFGHIJKLMNOPTQRSTUVWXYZ diff --git a/ktouch/extras/training-gen/python/ktouchgen.py b/ktouch/extras/training-gen/python/ktouchgen.py index 97083c01..47cd54d5 100644 --- a/ktouch/extras/training-gen/python/ktouchgen.py +++ b/ktouch/extras/training-gen/python/ktouchgen.py @@ -35,7 +35,7 @@ from whrandom import randint, random import string -from string import join, maketrans, translate, count, strip, lower, find, upper +from string import join, maketrans, translate, count, strip, lower, tqfind, upper import time import sys import ConfigParser @@ -173,7 +173,7 @@ def main(argv): # Parse the configfile # Creates a List Levelops with [(Options), ] - # Optiontuple contains (lchars, title, rows) + # Optiontuple tqcontains (lchars, title, rows) conf = ConfigParser.ConfigParser() try: file = open(argv[2],'r') diff --git a/ktouch/keyboards/be.keyboard b/ktouch/keyboards/be.keyboard index 3995e5fd..6de3fa0c 100644 --- a/ktouch/keyboards/be.keyboard +++ b/ktouch/keyboards/be.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. #################################################### @@ -38,7 +38,7 @@ ControlKey 8 BackSpace 130 0 20 10 # # NormalKey: These keys are the keys that are visible on the keyboard. To # get the character (unicod) you don't have to press anything else -# but the key. The FingerKey unicode number tells the program +# but the key. The FingerKey tqunicode number tells the program # which finger has to be moved to press this key. # # Unicode KeyText x y FingerKey @@ -90,8 +90,8 @@ NormalKey 61 = 113 30 109 # # HiddenKey: These are actually not "hidden" keys as such, but the characters # that are obtained by pressing a key and a certain modifier key. -# Define the character via its unicode and then also -# the unicode for the base character on the key to be pressed. +# Define the character via its tqunicode and then also +# the tqunicode for the base character on the key to be pressed. # Also define the character/key of the finger that needs to # press the key and the modifier key that needs to be highlighted. # diff --git a/ktouch/keyboards/bg.keyboard b/ktouch/keyboards/bg.keyboard index 87a71a62..57c0f657 100644 --- a/ktouch/keyboards/bg.keyboard +++ b/ktouch/keyboards/bg.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/de.keyboard b/ktouch/keyboards/de.keyboard index 170fe821..10d7ac7e 100644 --- a/ktouch/keyboards/de.keyboard +++ b/ktouch/keyboards/de.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for german keybord layout +# Keybord tqlayout file for german keybord tqlayout # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/de.neo.keyboard b/ktouch/keyboards/de.neo.keyboard index 9f2c883e..6fce086a 100644 --- a/ktouch/keyboards/de.neo.keyboard +++ b/ktouch/keyboards/de.neo.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/de.swiss.keyboard b/ktouch/keyboards/de.swiss.keyboard index 95c494db..d02d2826 100644 --- a/ktouch/keyboards/de.swiss.keyboard +++ b/ktouch/keyboards/de.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for german kaybord layout +# Keybord tqlayout file for german kaybord tqlayout # Adaptiert für schweizedeutsche Tastatur 17.9.04 Hansueli Eggimann # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. diff --git a/ktouch/keyboards/dk.keyboard b/ktouch/keyboards/dk.keyboard index 7b781aa8..23f7128e 100644 --- a/ktouch/keyboards/dk.keyboard +++ b/ktouch/keyboards/dk.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Danish kaybord +# Keybord tqlayout file for Danish kaybord # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/dvorak_fr.keyboard b/ktouch/keyboards/dvorak_fr.keyboard index 6b90ed3e..f80bdffe 100644 --- a/ktouch/keyboards/dvorak_fr.keyboard +++ b/ktouch/keyboards/dvorak_fr.keyboard @@ -1,7 +1,7 @@ # -*- coding: utf-8; -*- #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # Matthieu MOY, December 7th 2004 diff --git a/ktouch/keyboards/ee.keyboard b/ktouch/keyboards/ee.keyboard index bd2a880e..7e79a353 100644 --- a/ktouch/keyboards/ee.keyboard +++ b/ktouch/keyboards/ee.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/en.dvorak.keyboard b/ktouch/keyboards/en.dvorak.keyboard index d191f544..295d4f43 100644 --- a/ktouch/keyboards/en.dvorak.keyboard +++ b/ktouch/keyboards/en.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/en.keyboard b/ktouch/keyboards/en.keyboard index c0e9f2d1..84a3f31b 100644 --- a/ktouch/keyboards/en.keyboard +++ b/ktouch/keyboards/en.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. #################################################### @@ -38,7 +38,7 @@ ControlKey 8 BackSpace 140 0 10 10 # # NormalKey: These keys are the keys that are visible on the keyboard. To # get the character (unicod) you don't have to press anything else -# but the key. The FingerKey unicode number tells the program +# but the key. The FingerKey tqunicode number tells the program # which finger has to be moved to press this key. # # Unicode KeyText x y FingerKey @@ -89,8 +89,8 @@ NormalKey 47 / 113 30 59 # # HiddenKey: These are actually not "hidden" keys as such, but the characters # that are obtained by pressing a key and a certain modifier key. -# Define the character via its unicode and then also -# the unicode for the base character on the key to be pressed. +# Define the character via its tqunicode and then also +# the tqunicode for the base character on the key to be pressed. # Also define the character/key of the finger that needs to # press the key and the modifier key that needs to be highlighted. # diff --git a/ktouch/keyboards/es.dvorak.keyboard b/ktouch/keyboards/es.dvorak.keyboard index 2dd84046..56da935b 100644 --- a/ktouch/keyboards/es.dvorak.keyboard +++ b/ktouch/keyboards/es.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/es.keyboard b/ktouch/keyboards/es.keyboard index 5211488e..cae885f8 100644 --- a/ktouch/keyboards/es.keyboard +++ b/ktouch/keyboards/es.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/fi.keyboard b/ktouch/keyboards/fi.keyboard index 9edcd996..10775703 100644 --- a/ktouch/keyboards/fi.keyboard +++ b/ktouch/keyboards/fi.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/fr.a.keyboard b/ktouch/keyboards/fr.a.keyboard index d18e4cfb..0916da15 100644 --- a/ktouch/keyboards/fr.a.keyboard +++ b/ktouch/keyboards/fr.a.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/fr.keyboard b/ktouch/keyboards/fr.keyboard index edfcf537..81f54847 100644 --- a/ktouch/keyboards/fr.keyboard +++ b/ktouch/keyboards/fr.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/fr.swiss.keyboard b/ktouch/keyboards/fr.swiss.keyboard index ba89c072..e56f6bf6 100644 --- a/ktouch/keyboards/fr.swiss.keyboard +++ b/ktouch/keyboards/fr.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for swiss french keybord layout +# Keybord tqlayout file for swiss french keybord tqlayout #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/he.keyboard b/ktouch/keyboards/he.keyboard index e03f5bd1..f09db772 100644 --- a/ktouch/keyboards/he.keyboard +++ b/ktouch/keyboards/he.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Hebrew +# Keybord tqlayout file for Hebrew #################################################### # # diff --git a/ktouch/keyboards/hu.keyboard b/ktouch/keyboards/hu.keyboard index afd77ef1..bdf90711 100644 --- a/ktouch/keyboards/hu.keyboard +++ b/ktouch/keyboards/hu.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Hungarian keybord layout file +# Hungarian keybord tqlayout file # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/it.keyboard b/ktouch/keyboards/it.keyboard index 3f9c5828..1d99b944 100644 --- a/ktouch/keyboards/it.keyboard +++ b/ktouch/keyboards/it.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/la.keyboard b/ktouch/keyboards/la.keyboard index 55d6c6cd..0094f924 100644 --- a/ktouch/keyboards/la.keyboard +++ b/ktouch/keyboards/la.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Latin keyboard +# Keybord tqlayout file for Latin keyboard #################################################### # # diff --git a/ktouch/keyboards/nb.keyboard b/ktouch/keyboards/nb.keyboard index ca4f503d..13448d50 100644 --- a/ktouch/keyboards/nb.keyboard +++ b/ktouch/keyboards/nb.keyboard @@ -1,11 +1,11 @@ #################################################### # KTouch -# Keybord layout file for Norwegian keyboard +# Keybord tqlayout file for Norwegian keyboard # Encoding: UTF-8 (save as UTF-8 from editor) # Made by Axel Bojer by manipulating the danish file # Edit this file with tabs set to 8 characters. # The Unicode characters are found in an extensive list -# over html codes -- see http://www.fileformat.info/info/unicode/ +# over html codes -- see http://www.fileformat.info/info/tqunicode/ # # Refer to file en.keyboard for details. #################################################### diff --git a/ktouch/keyboards/nn.keyboard b/ktouch/keyboards/nn.keyboard index 79e9675b..c6592195 100644 --- a/ktouch/keyboards/nn.keyboard +++ b/ktouch/keyboards/nn.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Norwegian kaybord +# Keybord tqlayout file for Norwegian kaybord #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/pl.keyboard b/ktouch/keyboards/pl.keyboard index 8c5c3590..fbb3961a 100644 --- a/ktouch/keyboards/pl.keyboard +++ b/ktouch/keyboards/pl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Polish (utf-8) +# Keybord tqlayout file for Polish (utf-8) # Mikolaj Machowski # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. diff --git a/ktouch/keyboards/pt.br.keyboard b/ktouch/keyboards/pt.br.keyboard index be9af86f..fe0e7bd9 100644 --- a/ktouch/keyboards/pt.br.keyboard +++ b/ktouch/keyboards/pt.br.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for brazilian keyboard +# Keybord tqlayout file for brazilian keyboard #################################################### # # diff --git a/ktouch/keyboards/pt.keyboard b/ktouch/keyboards/pt.keyboard index 287c431d..0309d97f 100644 --- a/ktouch/keyboards/pt.keyboard +++ b/ktouch/keyboards/pt.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for portuguese keyboard +# Keybord tqlayout file for portuguese keyboard #################################################### # # diff --git a/ktouch/keyboards/ru.2.keyboard b/ktouch/keyboards/ru.2.keyboard index a3cf2039..c2645a1a 100644 --- a/ktouch/keyboards/ru.2.keyboard +++ b/ktouch/keyboards/ru.2.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/ru.3.keyboard b/ktouch/keyboards/ru.3.keyboard index 24d925a1..af32a33a 100644 --- a/ktouch/keyboards/ru.3.keyboard +++ b/ktouch/keyboards/ru.3.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Russian +# Keybord tqlayout file for Russian # Miha Ulanov (mulanov@mail.ru) # Code=UTF-8 #################################################### diff --git a/ktouch/keyboards/ru.basic.keyboard b/ktouch/keyboards/ru.basic.keyboard index df3cfb77..15fa4ce8 100644 --- a/ktouch/keyboards/ru.basic.keyboard +++ b/ktouch/keyboards/ru.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian basic keyboard layout file for KTouch. +# Russian basic keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/ru.keyboard b/ktouch/keyboards/ru.keyboard index 651addf8..f249ad83 100644 --- a/ktouch/keyboards/ru.keyboard +++ b/ktouch/keyboards/ru.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian Windows keyboard layout file for KTouch. +# Russian Windows keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/ru.typewriter.keyboard b/ktouch/keyboards/ru.typewriter.keyboard index 67f16032..c57e17ac 100644 --- a/ktouch/keyboards/ru.typewriter.keyboard +++ b/ktouch/keyboards/ru.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian typewriter keyboard layout file for KTouch. +# Russian typewriter keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/ru.winkeys.keyboard b/ktouch/keyboards/ru.winkeys.keyboard index 5d412f99..024d1c2c 100644 --- a/ktouch/keyboards/ru.winkeys.keyboard +++ b/ktouch/keyboards/ru.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian winkeys keyboard layout file for KTouch. +# Russian winkeys keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/sl.keyboard b/ktouch/keyboards/sl.keyboard index 2f482f39..6918a8ae 100644 --- a/ktouch/keyboards/sl.keyboard +++ b/ktouch/keyboards/sl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for slovenian keybord layout +# Keybord tqlayout file for slovenian keybord tqlayout # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/sv.dvorak.keyboard b/ktouch/keyboards/sv.dvorak.keyboard index acb0acab..e81e1c0b 100644 --- a/ktouch/keyboards/sv.dvorak.keyboard +++ b/ktouch/keyboards/sv.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Swedish Dvorak Keybord layout file +# Swedish Dvorak Keybord tqlayout file #################################################### # # Ascii KeyText x y diff --git a/ktouch/keyboards/sv.keyboard b/ktouch/keyboards/sv.keyboard index 597a315d..9e9ba96c 100644 --- a/ktouch/keyboards/sv.keyboard +++ b/ktouch/keyboards/sv.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for swedish keybord layout +# Keybord tqlayout file for swedish keybord tqlayout # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/tr.f.keyboard b/ktouch/keyboards/tr.f.keyboard index 92c08944..1953e9d4 100644 --- a/ktouch/keyboards/tr.f.keyboard +++ b/ktouch/keyboards/tr.f.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Turkish F Keybord layout file +# Turkish F Keybord tqlayout file #################################################### # This file distributed without any expressed or implied warranty # Written by Nilgün Belma Bugüner , 2005 diff --git a/ktouch/keyboards/tr.q.keyboard b/ktouch/keyboards/tr.q.keyboard index 2fb7e1c2..cfdac334 100644 --- a/ktouch/keyboards/tr.q.keyboard +++ b/ktouch/keyboards/tr.q.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/uk.basic.keyboard b/ktouch/keyboards/uk.basic.keyboard index 6ea507c4..c1807e27 100644 --- a/ktouch/keyboards/uk.basic.keyboard +++ b/ktouch/keyboards/uk.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian basic keyboard layout file for KTouch. +# Ukrainian basic keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/uk.typewriter.keyboard b/ktouch/keyboards/uk.typewriter.keyboard index 129ac807..08c88015 100644 --- a/ktouch/keyboards/uk.typewriter.keyboard +++ b/ktouch/keyboards/uk.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian typewriter keyboard layout file for KTouch. +# Ukrainian typewriter keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/uk.winkeys.keyboard b/ktouch/keyboards/uk.winkeys.keyboard index d378df30..47d09711 100644 --- a/ktouch/keyboards/uk.winkeys.keyboard +++ b/ktouch/keyboards/uk.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian winkeys keyboard layout file for KTouch. +# Ukrainian winkeys keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/ktouch.lsm b/ktouch/ktouch.lsm index ab0235d1..9bd6c444 100644 --- a/ktouch/ktouch.lsm +++ b/ktouch/ktouch.lsm @@ -7,7 +7,7 @@ Description: A education program to learn to touch-type. It provieds fingers on the keyboard. It also shows the user which finger to move to press the next key. It automatically adjusts to different levels depending on the speed. It has support - for different keyboard layouts(languages). + for different keyboard tqlayouts(languages). Keywords: touch typing education training Author: haavard@users.sourceforge.net (Haavard Froeiland) Maintained-by: ghorwin@users.sourceforge.net (Andreas Nicolai) diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 632aabe1..4480b80c 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -22,7 +22,7 @@ #include #include #include -//#include +//#include // KDE Header #include @@ -64,7 +64,7 @@ KTouch::KTouch() m_keyboardWidget(NULL), m_trainer(NULL) { - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); setInputMethodEnabled(true); // Set global KTouchPtr to the main KTouch Object @@ -75,7 +75,7 @@ KTouch::KTouch() setupActions(); // create the GUI reading the ui.rc file if (!initialGeometrySet()) - resize( TQSize(700, 510).expandedTo(minimumSizeHint())); + resize( TQSize(700, 510).expandedTo(tqminimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); // Read user statistics @@ -107,7 +107,7 @@ KTouch::KTouch() if (Prefs::currentLectureFile().isNull() || !m_lecture.loadXML(this, Prefs::currentLectureFile() )) { - Prefs::setCurrentLectureFile(TQString::null); + Prefs::setCurrentLectureFile(TQString()); m_defaultLectureAction->setCurrentItem(-1); } else { @@ -177,12 +177,12 @@ void KTouch::keyPressEvent(TQKeyEvent *keyEvent) { m_trainer->continueTraining(); } if (keyEvent->text().length() > 1) { - kdDebug() << "[KTouch::keyPressEvent] text = '" << keyEvent->text() << "'" << endl; + kdDebug() << "[KTouch::keyPressEvent] text = '" << keyEvent->text().data() << "'" << endl; } - TQChar key = keyEvent->text().at(0); // get first unicode character + TQChar key = keyEvent->text().at(0); // get first tqunicode character // HACK : manually filter out known dead keys // bool has_dead_key = true; - switch (key.unicode()) { + switch (key.tqunicode()) { case 94 : m_lastDeadKey = TQChar(uint(94)); break; case 176 : m_lastDeadKey = TQChar(uint(176)); break; case 180 : m_lastDeadKey = TQChar(uint(180)); break; @@ -285,7 +285,7 @@ void KTouch::configCommonColorsToggled(bool on) { // The action File->Open lecture... void KTouch::fileOpenLecture() { trainingPause(); - KURL tmp = KFileDialog::getOpenURL(TQString::null, TQString::null, this, i18n("Select Training Lecture File") ); + KURL tmp = KFileDialog::getOpenURL(TQString(), TQString(), this, i18n("Select Training Lecture File") ); if (!tmp.isEmpty()) { // first store training statistics m_trainer->storeTrainingStatistics(); @@ -431,16 +431,16 @@ void KTouch::optionsPreferences() { dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_layout"); m_pageColors = new KTouchPrefColorsLayout(0, "Colors"); dialog->addPage(m_pageColors, i18n("Color Settings"), "package_graphics"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(applyPreferences())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(applyPreferences())); // TODO : Connect some other buttons/check boxes of the dialog connect(m_pageGeneral->kcfg_OverrideLectureFont, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configOverrideLectureFontToggled(bool))); + TQT_TQOBJECT(this), TQT_SLOT(configOverrideLectureFontToggled(bool))); connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configOverrideKeyboardFontToggled(bool))); + TQT_TQOBJECT(this), TQT_SLOT(configOverrideKeyboardFontToggled(bool))); connect(m_pageTraining->kcfg_AutoLevelChange, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configAutoLevelChangeToggled(bool))); + TQT_TQOBJECT(this), TQT_SLOT(configAutoLevelChangeToggled(bool))); connect(m_pageColors->kcfg_CommonTypingLineColors, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configCommonColorsToggled(bool))); + TQT_TQOBJECT(this), TQT_SLOT(configCommonColorsToggled(bool))); // call the functions to enable/disable controls depending on settings configOverrideLectureFontToggled(Prefs::overrideLectureFont()); configOverrideKeyboardFontToggled(Prefs::overrideKeyboardFont()); @@ -459,18 +459,18 @@ void KTouch::changeStatusbarStats(unsigned int level_correct, unsigned int level unsigned int session_correct, unsigned int session_total, unsigned int session_words) { statusBar()->changeItem(i18n( "Level: Correct/Total chars: %1/%2 Words: %3") - .arg(level_correct).arg(level_total).arg(level_words), 1); + .tqarg(level_correct).tqarg(level_total).tqarg(level_words), 1); statusBar()->changeItem(i18n( "Session: Correct/Total chars: %1/%2 Words: %3") - .arg(session_correct).arg(session_total).arg(session_words), 2); + .tqarg(session_correct).tqarg(session_total).tqarg(session_words), 2); } // ---------------------------------------------------------------------------- void KTouch::changeKeyboard(int num) { if (static_cast(num)>=m_keyboardFiles.count()) return; Prefs::setCurrentKeyboardFile( m_keyboardFiles[num] ); -// kdDebug() << "[KTouch::changeKeyboard] new keyboard layout = " << Prefs::currentKeyboardFile() << endl; +// kdDebug() << "[KTouch::changeKeyboard] new keyboard tqlayout = " << Prefs::currentKeyboardFile() << endl; m_keyboardLayoutAction->setCurrentItem(num); - // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen layout file is corrupt + // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen tqlayout file is corrupt m_keyboardWidget->applyPreferences(this, false); } // ---------------------------------------------------------------------------- @@ -489,7 +489,7 @@ void KTouch::changeLecture(int num) { KTouchLecture l; TQString fileName = m_lectureFiles[num]; if (!l.loadXML(this, KURL::fromPathOrURL(fileName))) { - KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").arg(fileName) ); + KMessageBox::sorry(0, i18n("Could not tqfind/open the lecture file '%1'.").tqarg(fileName) ); m_defaultLectureAction->setCurrentItem(-1); } else { @@ -608,11 +608,11 @@ void KTouch::init() { //kdDebug() << "[KTouch::init] populating file lists..." << endl; updateFileLists(); // create lists with default lecture/keyboard/examination files/colour scheme files //kdDebug() << "[KTouch::init] " << m_lectureFiles.count() << " lectures available" << endl; - //kdDebug() << "[KTouch::init] " << m_keyboardFiles.count() << " keyboard layouts available" << endl; + //kdDebug() << "[KTouch::init] " << m_keyboardFiles.count() << " keyboard tqlayouts available" << endl; //kdDebug() << "[KTouch::init] " << m_examinationFiles.count() << " examination files available" << endl; if (Prefs::currentLectureFile() == "default") { - Prefs::setCurrentLectureFile(TQString::null); + Prefs::setCurrentLectureFile(TQString()); // /// \todo look up a lecture in the language of the KDE locale /* TQString default_lecture = "default"; if (m_lectureFiles.count() > 0) default_lecture = m_lectureFiles[0]; @@ -620,21 +620,21 @@ void KTouch::init() { */ } - // if keyboard layout (loaded by Prefs is not available (e.g. the - // layout file has been deleted) switch to default keyboard - if (m_keyboardFiles.contains(Prefs::currentKeyboardFile() )==0) { + // if keyboard tqlayout (loaded by Prefs is not available (e.g. the + // tqlayout file has been deleted) switch to default keyboard + if (m_keyboardFiles.tqcontains(Prefs::currentKeyboardFile() )==0) { TQString default_keyboard; // determine locale TQString lang = KGlobal::locale()->language(); TQString fname = lang + ".keyboard"; // try to find keyboard with current locale TQStringList::const_iterator it = m_keyboardFiles.constBegin(); - while (it != m_keyboardFiles.constEnd() && (*it).find(fname) == -1) ++it; + while (it != m_keyboardFiles.constEnd() && (*it).tqfind(fname) == -1) ++it; if (it == m_keyboardFiles.constEnd()) { fname = lang.left(2) + ".keyboard"; // try to find more general version it = m_keyboardFiles.constBegin(); - while (it != m_keyboardFiles.constEnd() && (*it).find(fname) == -1) ++it; + while (it != m_keyboardFiles.constEnd() && (*it).tqfind(fname) == -1) ++it; } if (it != m_keyboardFiles.constEnd()) @@ -652,18 +652,18 @@ void KTouch::init() { } // ---------------------------------------------------------------------------- -// Creates the layout and GUI setup for a practice session +// Creates the tqlayout and GUI setup for a practice session void KTouch::initTrainingSession() { - //kdDebug() << "[KTouch::initTrainingSession] setting up layouts and widgets for new training session..." << endl; + //kdDebug() << "[KTouch::initTrainingSession] setting up tqlayouts and widgets for new training session..." << endl; // Build the training area. The status widget has a fixed vertical size, the slide line and the // keyboard grow according to their vertical stretch factors (see last argument in the constructors // of TQSizePolicy) TQVBox * mainLayout = new TQVBox( this ); - m_statusWidget = new KTouchStatus( mainLayout ); + m_statusWidget = new KTouchtqStatus( mainLayout ); m_slideLineWidget = new KTouchSlideLine( mainLayout ); - m_slideLineWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) ); + m_slideLineWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) ); m_keyboardWidget = new KTouchKeyboardWidget( mainLayout ); - m_keyboardWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) ); + m_keyboardWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) ); setCentralWidget(mainLayout); // apply the settings to the widgets m_slideLineWidget->applyPreferences(); @@ -684,40 +684,40 @@ void KTouch::initTrainingSession() { void KTouch::setupActions() { // *** File menu *** new KAction(i18n("&Open lecture..."), "open_lecture", 0, - this, TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); + TQT_TQOBJECT(this), TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); new KAction(i18n("&Edit lecture..."), "edit_lecture", 0, - this, TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); + TQT_TQOBJECT(this), TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); new KAction(i18n("&Edit color scheme..."), "edit_colors", 0, - this, TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); + TQT_TQOBJECT(this), TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); // new KAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0, -// this, TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); - KStdAction::quit(this, TQT_SLOT(fileQuit()), actionCollection()); +// TQT_TQOBJECT(this), TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(fileQuit()), actionCollection()); // *** Training menu *** new KAction(i18n("&Start New Session"), "launch", 0, - this, TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); + TQT_TQOBJECT(this), TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); m_trainingPause = new KAction(i18n("&Pause Session"), "player_pause", 0, - this, TQT_SLOT(trainingPause()), actionCollection(), "training_pause"); + TQT_TQOBJECT(this), TQT_SLOT(trainingPause()), actionCollection(), "training_pause"); new KAction(i18n("&Lecture Statistics"), "kalarm", 0, - this, TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats"); + TQT_TQOBJECT(this), TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats"); // Setup menu entries for the training lectures - m_defaultLectureAction = new KSelectAction(i18n("Default &Lectures"), 0, this, 0, actionCollection(), "default_lectures"); + m_defaultLectureAction = new KSelectAction(i18n("Default &Lectures"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "default_lectures"); m_defaultLectureAction->setMenuAccelsEnabled(false); m_defaultLectureAction->setItems(m_lectureTitles); m_defaultLectureAction->setCurrentItem(0); - connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeLecture(int))); + connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeLecture(int))); // *** Settings menu *** - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); - // Setup menu entries for keyboard layouts - m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, this, 0, actionCollection(), "keyboard_layouts"); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + // Setup menu entries for keyboard tqlayouts + m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts"); m_keyboardLayoutAction->setMenuAccelsEnabled(false); m_keyboardLayoutAction->setItems(m_keyboardTitles); - connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeKeyboard(int))); + connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeKeyboard(int))); // Setup menu entries for colour schemes - m_keyboardColorAction = new KSelectAction(i18n("&Color Schemes"), 0, this, 0, actionCollection(), "keyboard_schemes"); + m_keyboardColorAction = new KSelectAction(i18n("&Color Schemes"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_schemes"); TQStringList schemes_list; for (unsigned int i=0; i(Prefs::currentColorScheme()) >= schemes_list.count()) Prefs::setCurrentColorScheme(1); m_keyboardColorAction->setCurrentItem(Prefs::currentColorScheme()); - connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeColor(int))); + connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeColor(int))); } // ---------------------------------------------------------------------------- @@ -753,9 +753,9 @@ void KTouch::updateFileLists() { // TODO : search in i18n() directories m_keyboardFiles = dirs->findAllResources("data","ktouch/*.keyboard"); - // remove the number layout, since this is the necessary default layout and will be + // remove the number tqlayout, since this is the necessary default tqlayout and will be // added anyway - TQStringList::iterator it = m_keyboardFiles.find("number.keyboard"); + TQStringList::iterator it = m_keyboardFiles.tqfind("number.keyboard"); if (it!=m_keyboardFiles.end()) m_keyboardFiles.remove(it); m_keyboardTitles.clear(); @@ -826,7 +826,7 @@ void KTouch::updateLectureActionCheck() { int num = 0; TQStringList::iterator it = m_lectureFiles.begin(); TQString fname = Prefs::currentLectureFile(); - while (it != m_lectureFiles.end() && (*it).find(fname) == -1) { + while (it != m_lectureFiles.end() && (*it).tqfind(fname) == -1) { ++it; ++num; } @@ -839,7 +839,7 @@ void KTouch::updateKeyboardActionCheck() { int num = 0; TQStringList::iterator it = m_keyboardFiles.begin(); TQString fname = Prefs::currentKeyboardFile(); - while (it != m_keyboardFiles.end() && (*it).find(fname) == -1) { + while (it != m_keyboardFiles.end() && (*it).tqfind(fname) == -1) { ++it; ++num; } @@ -866,7 +866,7 @@ void KTouch::imEndEvent(TQIMEvent *e) { if (!e->text().isEmpty()) { if (e->text() == "^") { TQKeyEvent *ev = new TQKeyEvent (TQEvent::KeyPress, - Qt::Key_AsciiCircum, '^', 0, + TQt::Key_AsciiCircum, '^', 0, TQString("^")); keyPressEvent(ev); delete ev; diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h index ba5f8e56..4703fd92 100644 --- a/ktouch/src/ktouch.h +++ b/ktouch/src/ktouch.h @@ -30,7 +30,7 @@ class KToggleAction; class KActionMenu; class KSelectAction; -class KTouchStatus; +class KTouchtqStatus; class KTouchSlideLine; class KTouchKeyboardWidget; class KTouchTrainer; @@ -58,6 +58,7 @@ class KTouchPrefColorsLayout; /// object and all the widgets. class KTouch : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /// Constructor, creates the KTouch proggy. KTouch(); @@ -100,7 +101,7 @@ class KTouch : public KMainWindow { void trainingStatistics(); ///< The action Training->Show training statistics... void optionsPreferences(); ///< The action Settings->Configure KTouch... - /// Quick-changes the keyboard layout (called from menu). + /// Quick-changes the keyboard tqlayout (called from menu). void changeKeyboard(int num); /// Quick-changes the colour scheme used on the keyboard (called from menu). void changeColor(int num); @@ -110,7 +111,7 @@ class KTouch : public KMainWindow { protected: /// Reimplementated to save preferences and bool queryExit(); - /// Some layout fixes here... + /// Some tqlayout fixes here... void resizeEvent(TQResizeEvent *); /// Accepts a typed char. void keyPressEvent(TQKeyEvent *keyEvent); @@ -127,7 +128,7 @@ class KTouch : public KMainWindow { /// Initialises the program during a normal startup void init(); - /// Creates the layout and GUI setup for a practice session + /// Creates the tqlayout and GUI setup for a practice session void initTrainingSession(); /// Creates the (standard) actions and entries in the menu. void setupActions(); @@ -153,7 +154,7 @@ class KTouch : public KMainWindow { KSelectAction *m_keyboardColorAction; KSelectAction *m_defaultLectureAction; - KTouchStatus *m_statusWidget; ///< Pointer to the status widget on top of the main widget. + KTouchtqStatus *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). @@ -170,12 +171,12 @@ class KTouch : public KMainWindow { TQStringList m_examinationFiles; ///< A list of all default examination files. TQStringList m_examinationTitles; ///< A list of the titles of all default examination files. - TQStringList m_keyboardFiles; ///< A list of all default keyboard layout files. - TQStringList m_keyboardTitles; ///< A list of the titles of all default keyboard layout files. + TQStringList m_keyboardFiles; ///< A list of all default keyboard tqlayout files. + TQStringList m_keyboardTitles; ///< A list of the titles of all default keyboard tqlayout files. KTouchStatisticsData m_stats; ///< All user statistics are kept here. - QChar m_lastDeadKey; ///< Temporary storage of last dead key. + TQChar m_lastDeadKey; ///< Temporary storage of last dead key. }; /// A global pointer to the main widget (actually only used to retrieve some data). diff --git a/ktouch/src/ktouchchartwidget.cpp b/ktouch/src/ktouchchartwidget.cpp index 43e3642a..5eec6633 100644 --- a/ktouch/src/ktouchchartwidget.cpp +++ b/ktouch/src/ktouchchartwidget.cpp @@ -20,8 +20,8 @@ #include // for mathematical functions #include -KTouchChartWidget::KTouchChartWidget(TQWidget* parent, const char *name) - : KPlotWidget(0.0, 1.0, 0.0, 1.0, parent, name) +KTouchChartWidget::KTouchChartWidget(TQWidget* tqparent, const char *name) + : KPlotWidget(0.0, 1.0, 0.0, 1.0, tqparent, name) { setShowGrid( false ); // no grid please setBGColor( TQColor( "white" ) ); diff --git a/ktouch/src/ktouchchartwidget.h b/ktouch/src/ktouchchartwidget.h index 799a5a38..00193e5a 100644 --- a/ktouch/src/ktouchchartwidget.h +++ b/ktouch/src/ktouchchartwidget.h @@ -24,9 +24,10 @@ class KTouchTrainer; /// This is the chart widget and contains all chart drawing code. class KTouchChartWidget : public KPlotWidget { Q_OBJECT + TQ_OBJECT public: /// Constructor. - KTouchChartWidget(TQWidget* parent, const char *name=0); + KTouchChartWidget(TQWidget* tqparent, const char *name=0); /// Destructor. ~KTouchChartWidget(); }; diff --git a/ktouch/src/ktouchcoloreditor.cpp b/ktouch/src/ktouchcoloreditor.cpp index e9bdb829..b1f3e3a4 100644 --- a/ktouch/src/ktouchcoloreditor.cpp +++ b/ktouch/src/ktouchcoloreditor.cpp @@ -23,8 +23,8 @@ #include #include -KTouchColorEditor::KTouchColorEditor(TQWidget* parent, const char* name, bool modal, WFlags fl) -: KTouchColorEditorDlg(parent,name, modal,fl) +KTouchColorEditor::KTouchColorEditor(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: KTouchColorEditorDlg(tqparent,name, modal,fl) { } // ---------------------------------------------------------------------------- @@ -36,7 +36,7 @@ KTouchColorEditor::~KTouchColorEditor() void KTouchColorEditor::startEditor(TQValueList& schemes, int active, int & selected) { m_schemes = schemes; - m_currentItem = QMAX(0, active); + m_currentItem = TQMAX(0, active); updateListBox(); if (active >= 0) m_currentItem = active; @@ -107,7 +107,7 @@ void KTouchColorEditor::updateClicked() { (*it).m_background[7] = back8Btn->color(); updateListBox(); - schemeListBox->setCurrentItem( QMIN(old_num, static_cast(m_schemes.count())-1) ); + schemeListBox->setCurrentItem( TQMIN(old_num, static_cast(m_schemes.count())-1) ); colorSchemeChanged(NULL); } // ---------------------------------------------------------------------------- @@ -121,7 +121,7 @@ void KTouchColorEditor::removeBtnClicked() { m_schemes.erase(it); } updateListBox(); - schemeListBox->setCurrentItem( QMIN(old_num, static_cast(m_schemes.count())-1) ); + schemeListBox->setCurrentItem( TQMIN(old_num, static_cast(m_schemes.count())-1) ); colorSchemeChanged(NULL); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchcoloreditor.h b/ktouch/src/ktouchcoloreditor.h index 9e826e94..ce532d6a 100644 --- a/ktouch/src/ktouchcoloreditor.h +++ b/ktouch/src/ktouchcoloreditor.h @@ -27,10 +27,11 @@ class KTouchColorEditor : public KTouchColorEditorDlg { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchColorEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchColorEditor(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); /// Destructor ~KTouchColorEditor(); diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui index d6c4a0a7..8422b41e 100644 --- a/ktouch/src/ktouchcoloreditor_dlg.ui +++ b/ktouch/src/ktouchcoloreditor_dlg.ui @@ -1,10 +1,10 @@ KTouchColorEditorDlg - + KTouchColorEditorDlg - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox2 @@ -31,7 +31,7 @@ 0 - + 0 0 @@ -44,7 +44,7 @@ unnamed - + schemeListBox @@ -99,7 +99,7 @@ Expanding - + 20 16 @@ -108,7 +108,7 @@ - + editGroupBox @@ -127,15 +127,15 @@ unnamed - + - layout18 + tqlayout18 unnamed - + nameL @@ -158,7 +158,7 @@ - + groupBox3 @@ -177,9 +177,9 @@ unnamed - + - layout14 + tqlayout14 @@ -193,7 +193,7 @@ - + textLabel3_2 @@ -211,7 +211,7 @@ Expanding - + 20 40 @@ -226,7 +226,7 @@ - + textLabel3 @@ -246,22 +246,22 @@ Fixed - + 16 20 - + - layout10 + tqlayout10 unnamed - + textLabel3_5 @@ -269,7 +269,7 @@ Student text on error - + textLabel3_4 @@ -293,7 +293,7 @@ - + textLabel3_3 @@ -317,7 +317,7 @@ - + textLabel3_6 @@ -337,7 +337,7 @@ Expanding - + 30 20 @@ -346,7 +346,7 @@ - + keyboardColorsGroup @@ -365,9 +365,9 @@ unnamed - + - layout24 + tqlayout24 @@ -383,7 +383,7 @@ Fixed - + 16 20 @@ -400,7 +400,7 @@ Expanding - + 20 20 @@ -417,22 +417,22 @@ Expanding - + 20 16 - + - layout22 + tqlayout22 unnamed - + textLabel3_9 @@ -440,7 +440,7 @@ Highlighted text color - + textLabel3_8 @@ -456,7 +456,7 @@ - + textLabel3_7 @@ -464,7 +464,7 @@ Key frame - + textLabel2 @@ -496,7 +496,7 @@ - + textLabel3_10 @@ -514,7 +514,7 @@ Expanding - + 20 16 @@ -523,15 +523,15 @@ - + - layout20 + tqlayout20 unnamed - + textLabel3_7_2 @@ -547,7 +547,7 @@ - + textLabel3_9_2 @@ -563,7 +563,7 @@ - + textLabel3_10_2 @@ -587,7 +587,7 @@ - + textLabel1 @@ -595,7 +595,7 @@ Modifier/other keys: - + textLabel3_8_2 @@ -607,7 +607,7 @@ - + textLabel3_11 @@ -615,9 +615,9 @@ Background colors for normal keys: - + - layout28 + tqlayout28 @@ -774,9 +774,9 @@ schemeListBox - currentChanged(QListBoxItem*) + currentChanged(TQListBoxItem*) KTouchColorEditorDlg - colorSchemeChanged(QListBoxItem*) + colorSchemeChanged(TQListBoxItem*) updateBtn @@ -785,14 +785,14 @@ updateClicked() - + closeQuery() addBtnClicked() removeBtnClicked() updateClicked() - colorSchemeChanged(QListBoxItem * item) - - + colorSchemeChanged(TQListBoxItem * item) + + kpushbutton.h kpushbutton.h diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp index 9a20d2e9..3e36f458 100644 --- a/ktouch/src/ktouchcolorscheme.cpp +++ b/ktouch/src/ktouchcolorscheme.cpp @@ -36,21 +36,21 @@ void KTouchColorScheme::clear() { m_teacherBackground = TQColor("#BEBEFF"); m_studentTextColor = TQColor("#003200"); m_studentBackground = TQColor("#9FFF9F"); - m_errorTextColor = Qt::white; + m_errorTextColor = TQt::white; m_errorBackground = TQColor("#AC0000"); - m_frame = Qt::black; + m_frame = TQt::black; m_background[0] = TQColor(255,238, 7); m_background[4] = TQColor(247,138,247); m_background[1] = TQColor( 14,164,239); m_background[5] = TQColor(158,255,155); m_background[2] = TQColor(158,255,155); m_background[6] = TQColor( 14,164,239); m_background[3] = TQColor(252,138,138); m_background[7] = TQColor(255,238, 7); - m_text = Qt::black; - m_backgroundH = Qt::darkBlue; - m_textH = Qt::white; - m_cBackground = Qt::gray; - m_cText = Qt::black; - m_cBackgroundH = Qt::white; - m_cTextH = Qt::black; + m_text = TQt::black; + m_backgroundH = TQt::darkBlue; + m_textH = TQt::white; + m_cBackground = TQt::gray; + m_cText = TQt::black; + m_cBackgroundH = TQt::white; + m_cTextH = TQt::black; m_default = false; } @@ -81,7 +81,7 @@ bool KTouchColorScheme::read(const TQDomNode& node) { TQDomNode c; READ_COLOR("KeyFrame", m_frame); for (unsigned int i=0; i<8; ++i) { - READ_COLOR(TQString("KeyBack_%1").arg(i), m_background[i]); + READ_COLOR(TQString("KeyBack_%1").tqarg(i), m_background[i]); } READ_COLOR("KeyText", m_text); READ_COLOR("KeyBackHigh", m_backgroundH); @@ -125,7 +125,7 @@ void KTouchColorScheme::write(TQDomDocument& doc, TQDomElement& root) const { WRITE_COLOR(key_colors, "KeyFrame", m_frame); for (unsigned int i=0; i<8; ++i) { - WRITE_COLOR(key_colors, TQString("KeyBack_%1").arg(i), m_background[i]); + WRITE_COLOR(key_colors, TQString("KeyBack_%1").tqarg(i), m_background[i]); } WRITE_COLOR(key_colors, "KeyText", m_text); WRITE_COLOR(key_colors, "KeyBackHigh", m_backgroundH); @@ -224,22 +224,22 @@ void KTouchColorScheme::createDefaults() { color.m_default = true; color.m_name = i18n("Black & White"); - color.m_teacherTextColor = Qt::black; - color.m_teacherBackground = Qt::white; - color.m_studentTextColor = Qt::black; - color.m_studentBackground = Qt::white; - color.m_errorTextColor = Qt::white; - color.m_errorBackground = Qt::black; - color.m_frame = Qt::black; + color.m_teacherTextColor = TQt::black; + color.m_teacherBackground = TQt::white; + color.m_studentTextColor = TQt::black; + color.m_studentBackground = TQt::white; + color.m_errorTextColor = TQt::white; + color.m_errorBackground = TQt::black; + color.m_frame = TQt::black; for (int i=0; i<8; ++i) - color.m_background[i] = Qt::white; - color.m_text = Qt::black; - color.m_backgroundH = Qt::black; - color.m_textH = Qt::white; - color.m_cBackground = Qt::gray; - color.m_cText = Qt::black; - color.m_cBackgroundH = Qt::white; - color.m_cTextH = Qt::black; + color.m_background[i] = TQt::white; + color.m_text = TQt::black; + color.m_backgroundH = TQt::black; + color.m_textH = TQt::white; + color.m_cBackground = TQt::gray; + color.m_cText = TQt::black; + color.m_cBackgroundH = TQt::white; + color.m_cTextH = TQt::black; m_colorSchemes.push_back(color); color.m_name = i18n("Classic"); @@ -247,26 +247,26 @@ void KTouchColorScheme::createDefaults() { color.m_teacherBackground = TQColor("#BEBEFF"); color.m_studentTextColor = TQColor("#003200"); color.m_studentBackground = TQColor("#9FFF9F"); - color.m_errorTextColor = Qt::white; + color.m_errorTextColor = TQt::white; color.m_errorBackground = TQColor("#AC0000"); - color.m_frame = Qt::black; + color.m_frame = TQt::black; color.m_background[0] = TQColor(255,238, 7); color.m_background[4] = TQColor(247,138,247); color.m_background[1] = TQColor( 14,164,239); color.m_background[5] = TQColor(158,255,155); color.m_background[2] = TQColor(158,255,155); color.m_background[6] = TQColor( 14,164,239); color.m_background[3] = TQColor(252,138,138); color.m_background[7] = TQColor(255,238, 7); - color.m_text = Qt::black; - color.m_backgroundH = Qt::darkBlue; - color.m_textH = Qt::white; - color.m_cBackground = Qt::gray; - color.m_cText = Qt::black; - color.m_cBackgroundH = Qt::white; - color.m_cTextH = Qt::black; + color.m_text = TQt::black; + color.m_backgroundH = TQt::darkBlue; + color.m_textH = TQt::white; + color.m_cBackground = TQt::gray; + color.m_cText = TQt::black; + color.m_cBackgroundH = TQt::white; + color.m_cTextH = TQt::black; m_colorSchemes.push_back(color); color.m_name = i18n("Deep Blue"); - color.m_teacherTextColor = Qt::white; + color.m_teacherTextColor = TQt::white; color.m_teacherBackground = TQColor( 0, 39, 80); - color.m_studentTextColor = Qt::white; + color.m_studentTextColor = TQt::white; color.m_studentBackground = TQColor( 39, 59,127); color.m_errorTextColor = TQColor("#B5CFFF"); color.m_errorBackground = TQColor("#640000"); @@ -275,34 +275,34 @@ void KTouchColorScheme::createDefaults() { color.m_background[1] = TQColor( 39, 59,127); color.m_background[5] = TQColor( 8, 44,124); color.m_background[2] = TQColor( 4, 39, 53); color.m_background[6] = TQColor( 10, 82,158); color.m_background[3] = TQColor( 40, 32,121); color.m_background[7] = TQColor( 43, 60,124); - color.m_text = Qt::white; + color.m_text = TQt::white; color.m_backgroundH = TQColor(125,180,255); - color.m_textH = Qt::darkBlue; - color.m_cBackground = Qt::black; - color.m_cText = Qt::white; + color.m_textH = TQt::darkBlue; + color.m_cBackground = TQt::black; + color.m_cText = TQt::white; color.m_cBackgroundH = TQColor(111,121,73); - color.m_cTextH = Qt::white; + color.m_cTextH = TQt::white; m_colorSchemes.push_back(color); color.m_name = i18n("Stripy"); - color.m_teacherTextColor = Qt::white; + color.m_teacherTextColor = TQt::white; color.m_teacherBackground = TQColor( 39, 70, 227); - color.m_studentTextColor = Qt::white; + color.m_studentTextColor = TQt::white; color.m_studentBackground = TQColor( 39, 70, 127); - color.m_errorTextColor = Qt::white; - color.m_errorBackground = Qt::darkGray; - color.m_frame = Qt::black; + color.m_errorTextColor = TQt::white; + color.m_errorBackground = TQt::darkGray; + color.m_frame = TQt::black; for (int i=0; i<8; i=i+2) color.m_background[i] = TQColor( 39, 70, 127); for (int i=1; i<8; i=i+2) - color.m_background[i] = Qt::darkGray; - color.m_text = Qt::black; + color.m_background[i] = TQt::darkGray; + color.m_text = TQt::black; color.m_backgroundH = TQColor( 39, 70, 227); - color.m_textH = Qt::white; - color.m_cBackground = Qt::gray; - color.m_cText = Qt::black; + color.m_textH = TQt::white; + color.m_cBackground = TQt::gray; + color.m_cText = TQt::black; color.m_cBackgroundH = TQColor( 39, 70, 227); - color.m_cTextH = Qt::black; + color.m_cTextH = TQt::black; m_colorSchemes.push_back(color); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchdefaults.h b/ktouch/src/ktouchdefaults.h index d66a1663..8f6631db 100644 --- a/ktouch/src/ktouchdefaults.h +++ b/ktouch/src/ktouchdefaults.h @@ -21,7 +21,7 @@ extern const unsigned int BEGINNER_SPEED; ///< Speed for rating in characters p extern const unsigned int ADVANCED_SPEED; ///< Speed for rating in characters per minute. extern const unsigned int PROFESSIONAL_SPEED; ///< Speed for rating in characters per minute. -extern const int KEYBOARD_MARGIN; ///< The margin around the keybaord layout. +extern const int KEYBOARD_MARGIN; ///< The margin around the keybaord tqlayout. extern const int LCD_UPDATE_INTERVAL; ///< Update interval for LCD display and statistics. diff --git a/ktouch/src/ktouchkey.h b/ktouch/src/ktouchkey.h index 011f4e4b..cfa179c5 100644 --- a/ktouch/src/ktouchkey.h +++ b/ktouch/src/ktouchkey.h @@ -41,7 +41,7 @@ class KTouchKeyChar { position_t m_pos; ///< The position of the character. bool m_bold; ///< Whether this is a bold character. - QString m_text; ///< The text to draw of m_ch == 0. + TQString m_text; ///< The text to draw of m_ch == 0. }; /// This class represents a key on the keyboard. diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index 1e7440a5..f4ecf178 100644 --- a/ktouch/src/ktouchkeyboard.cpp +++ b/ktouch/src/ktouchkeyboard.cpp @@ -27,14 +27,14 @@ void KTouchKeyboard::clear() { m_keys.clear(); m_connectors.clear(); - m_title = TQString::null; - m_comment = TQString::null; - m_language = TQString::null; - m_fontSuggestions = TQString::null; + m_title = TQString(); + m_comment = TQString(); + m_language = TQString(); + m_fontSuggestions = TQString(); } // ---------------------------------------------------------------------------- -// Loads a keyboard layout (old format) from file (returns true if successful). +// Loads a keyboard tqlayout (old format) from file (returns true if successful). bool KTouchKeyboard::load(TQWidget * window, const KURL& url) { // Ok, first download the contents as usual using the KIO lib // File is only downloaded if not local, otherwise it's just opened @@ -163,7 +163,7 @@ bool KTouchKeyboard::read(TQTextStream& in) { m_connectors.push_back(keycon); } else { - //errorMsg = i18n("Missing key type in line '%1'.").arg(line); + //errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); return false; } // calculate the maximum extent of the keyboard on the fly... @@ -176,14 +176,14 @@ bool KTouchKeyboard::read(TQTextStream& in) { // Loads keyboard data from file into an XML document bool KTouchKeyboard::read(const TQDomDocument& doc) { // clean current data - kdDebug() << "Reading new keyboard layout" << endl; + kdDebug() << "Reading new keyboard tqlayout" << endl; m_keys.clear(); m_connectors.clear(); - m_title = TQString::null; + m_title = TQString(); // retrieve the title TQDomNodeList entries = doc.elementsByTagName("Title"); if (entries.count() >= 1) m_title = entries.item(0).firstChild().nodeValue(); - else m_title = i18n("untitled keyboard layout"); + else m_title = i18n("untitled keyboard tqlayout"); kdDebug() << "Title: " << m_title << endl; // retrieve the comment entries = doc.elementsByTagName("Comment"); @@ -235,7 +235,7 @@ void KTouchKeyboard::write(TQDomDocument& doc) const { // Store title and ensure that the file contains a title! TQDomElement title = doc.createElement("Title"); TQDomText titleText; - if (m_title.isEmpty()) titleText = doc.createTextNode( i18n("untitled keyboard layout") ); + if (m_title.isEmpty()) titleText = doc.createTextNode( i18n("untitled keyboard tqlayout") ); else titleText = doc.createTextNode(m_title); title.appendChild(titleText); root.appendChild(title); @@ -281,7 +281,7 @@ void KTouchKeyboard::createDefault() { const int keyWidth = 20; const int col = keyWidth+keySpacing; const int row = keyHeight+keySpacing; - // First let's create the visible layout. + // First let's create the visible tqlayout. // This means we have to create all keys that will be displayed. // Note: purely decorative keys get a key character code of 0! m_keys.clear(); @@ -327,8 +327,8 @@ void KTouchKeyboard::createDefault() { m_connectors.push_back( KTouchKeyConnector('.', '.', '6', 0) ); m_title = "Number keypad"; - m_comment = "Predefined keyboard layout"; - m_language = TQString::null; + m_comment = "Predefined keyboard tqlayout"; + m_language = TQString(); // language does not apply to numbers... that's one of the nice things with math :-) m_fontSuggestions = "Monospace"; m_width = 8*col; @@ -352,12 +352,12 @@ bool KTouchKeyboard::loadKeyboard(TQWidget * window, const KURL& url, TQString* bool result = readKeyboard(target, msg); KIO::NetAccess::removeTempFile(target); if (!result && errorMsg!=NULL) - *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").tqarg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(url.url()); + *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url()); return false; } } @@ -382,7 +382,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { TQTextStream out( &outfile ); out << "########################################## \n"; out << "# # \n"; - out << "# Keyboard layout file for KTouch # \n"; + out << "# Keyboard tqlayout file for KTouch # \n"; out << "# # \n"; out << "########################################## \n"; out << "#\n"; @@ -396,7 +396,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { default : out << "NormalKey "; break; } TQRect rect=key->frame(); - out << key->m_keyChar.unicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.tqunicode() << '\t' << key->m_keyText << '\t' << rect.left() << '\t' << rect.top() << '\t' << rect.width() << '\t' << rect.height() << endl; } @@ -408,15 +408,15 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { } void KTouchKeyboard::applyPreferences(TQWidget * window, bool silent) { - // let's check whether the keyboard layout has changed + // let's check whether the keyboard tqlayout has changed if (KTouchConfig().m_currentKeyboardFile!=m_currentLayout) { - // if the layout is the number layout just create it and we're done + // if the tqlayout is the number tqlayout just create it and we're done if (KTouchConfig().m_currentKeyboardFile=="number.keyboard") { createDefaultKeyboard(); resizeEvent(NULL); return; } - // ok, let's load this layout + // ok, let's load this tqlayout if (silent) { // during initialisation we don't want to have a message box, that's why this is silent if (!loadKeyboard(window, KURL::fromPathOrURL( KTouchConfig().m_currentKeyboardFile ))) @@ -427,8 +427,8 @@ void KTouchKeyboard::applyPreferences(TQWidget * window, bool silent) { else { TQString errorMsg; if (!loadKeyboard(window, KURL::fromPathOrURL( KTouchConfig().m_currentKeyboardFile ), &errorMsg)) { - KMessageBox::error( 0, i18n("Error reading the keyboard layout; the default number keypad will " - "be created instead. You can choose another keyboard layout in the preferences dialog."), + KMessageBox::error( 0, i18n("Error reading the keyboard tqlayout; the default number keypad will " + "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), errorMsg); createDefaultKeyboard(); } @@ -607,7 +607,7 @@ bool KTouchKeyboard::readKeyboard(const TQString& fileName, TQString& errorMsg) m_connectorList.append( KTouchKeyConnector(keyAscII, targetChar, fingerChar, controlChar) ); } else { - errorMsg = i18n("Missing key type in line '%1'.").arg(line); + errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); return false; } // calculate the maximum extent of the keyboard on the fly... diff --git a/ktouch/src/ktouchkeyboard.h b/ktouch/src/ktouchkeyboard.h index 5334c49b..0e2ebfd6 100644 --- a/ktouch/src/ktouchkeyboard.h +++ b/ktouch/src/ktouchkeyboard.h @@ -24,7 +24,7 @@ class KURL; -/// This class stores the keyboard layout and the connectivity between characters +/// This class stores the keyboard tqlayout and the connectivity between characters /// and the actual keys. class KTouchKeyboard { public: @@ -32,7 +32,7 @@ class KTouchKeyboard { KTouchKeyboard() { createDefault(); } /// Clears the keyboard (resets all data) void clear(); - /// Loads a keyboard layout (old format) from file (returns true if successful). + /// Loads a keyboard tqlayout (old format) from file (returns true if successful). bool load(TQWidget * window, const KURL& url); /// Loads a lecture (in XML format) from file (returns true if successful). bool loadXML(TQWidget * window, const KURL& url); @@ -46,10 +46,10 @@ class KTouchKeyboard { TQValueVector m_keys; ///< Vector with key definitions. TQValueVector m_connectors; ///< Vector with connectivity data. - QString m_title; ///< Title of the keyboard (to appear in the menu). - QString m_comment; ///< Comments about the creator of the keyboard layout. - QString m_language; ///< Language ID of keyboard - QString m_fontSuggestions; ///< Suggestions of fonts to be used on the keys. + TQString m_title; ///< Title of the keyboard (to appear in the menu). + TQString m_comment; ///< Comments about the creator of the keyboard tqlayout. + TQString m_language; ///< Language ID of keyboard + TQString m_fontSuggestions; ///< Suggestions of fonts to be used on the keys. // These variables are recalculated after the keyboard was loaded. int m_width; ///< The width of the keyboard (maximum of the sums of all keywidths in each line). diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp index 54f026bb..17c87997 100644 --- a/ktouch/src/ktouchkeyboardeditor.cpp +++ b/ktouch/src/ktouchkeyboardeditor.cpp @@ -34,8 +34,8 @@ // ***** Public functions *** // ************************** -KTouchKeyboardEditor::KTouchKeyboardEditor(TQWidget* parent, const char* name, bool modal, WFlags fl) - : KTouchKeyboardEditorDlg(parent,name, modal,fl) +KTouchKeyboardEditor::KTouchKeyboardEditor(TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : KTouchKeyboardEditorDlg(tqparent,name, modal,fl) { } // ----------------------------------------------------------------------------- @@ -66,7 +66,7 @@ void KTouchKeyboardEditor::fontBtnClicked() { titleEdit->setFont(f); keyboardCommentEdit->setFont(f); languageEdit->setFont(f); - update(); // trigger repaint of the keyboard. + update(); // trigger tqrepaint of the keyboard. setModified(); } } @@ -89,7 +89,7 @@ void KTouchKeyboardEditor::saveBtnClicked() { // ----------------------------------------------------------------------------- void KTouchKeyboardEditor::saveAsBtnClicked() { - TQString tmp = KFileDialog::getSaveFileName(TQString::null, + TQString tmp = KFileDialog::getSaveFileName(TQString(), i18n("*.keyboard.xml|KTouch Keyboard Files (*.keyboard.xml)\n*.*|All Files"), this, i18n("Save Keyboard Layout") ); if (!tmp.isEmpty()) { transfer_from_dialog(); @@ -133,7 +133,7 @@ void KTouchKeyboardEditor::paintEvent(TQPaintEvent *) { void KTouchKeyboardEditor::transfer_to_dialog() { if (m_currentURL.isEmpty()) { - titleEdit->setText( i18n("untitled keyboard layout") ); + titleEdit->setText( i18n("untitled keyboard tqlayout") ); keyboardCommentEdit->setText(""); } else { @@ -167,13 +167,13 @@ void KTouchKeyboardEditor::transfer_to_dialog() { min_y = std::min(min_y, it->m_y); max_y = std::max(max_y, it->m_y+it->m_h); } - dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").arg(max_x - min_x).arg(max_y - min_y) ); + dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").tqarg(max_x - min_x).tqarg(max_y - min_y) ); } // ----------------------------------------------------------------------------- void KTouchKeyboardEditor::transfer_from_dialog() { m_keyboard.m_title = titleEdit->text(); - if (m_keyboard.m_title.isEmpty()) m_keyboard.m_title = i18n("untitled keyboard layout"); + if (m_keyboard.m_title.isEmpty()) m_keyboard.m_title = i18n("untitled keyboard tqlayout"); m_keyboard.m_comment = keyboardCommentEdit->text(); m_keyboard.m_language = languageEdit->text(); } @@ -201,7 +201,7 @@ int KTouchKeyboardEditor::openKeyboardFile(const KURL& url) { !m_keyboard.load(this, m_currentURL) && !m_keyboard.loadXML(this, m_currentURL)) { KMessageBox::sorry(this, i18n("Could not open the keyboard file, creating a new one instead!")); - m_currentURL = TQString::null; // new keyboards haven't got a URL + m_currentURL = TQString(); // new keyboards haven't got a URL m_keyboard.clear(); } // If we have no URL, we create a new keyboard - can happen if either the user @@ -234,7 +234,7 @@ bool KTouchKeyboardEditor::saveModified() { if (!m_modified) return true; // ok, ask the user to save the changes int result = KMessageBox::questionYesNoCancel(this, - i18n("The keyboard has been changed. Do you want to save the changes?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard()); + i18n("The keyboard has been changed. Do you want to save the changes?"),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()); if (result == KMessageBox::Cancel) return false; // User aborted if (result == KMessageBox::Yes) saveBtnClicked(); // if successfully saved the modified flag will be resetted in the saveBtnClicked() function diff --git a/ktouch/src/ktouchkeyboardeditor.h b/ktouch/src/ktouchkeyboardeditor.h index 48c6e4f6..8b36da95 100644 --- a/ktouch/src/ktouchkeyboardeditor.h +++ b/ktouch/src/ktouchkeyboardeditor.h @@ -41,10 +41,11 @@ /// @see startEditor() for details on the return value. class KTouchKeyboardEditor : public KTouchKeyboardEditorDlg { Q_OBJECT + TQ_OBJECT public: /// Constructor. - KTouchKeyboardEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchKeyboardEditor(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); /// Default destructor. ~KTouchKeyboardEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui index f6aa1009..e27c6575 100644 --- a/ktouch/src/ktouchkeyboardeditor_dlg.ui +++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui @@ -1,10 +1,10 @@ KTouchKeyboardEditorDlg - + KTouchKeyboardEditorDlg - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout3 + tqlayout3 @@ -45,7 +45,7 @@ Expanding - + 40 20 @@ -89,7 +89,7 @@ - + groupBox5 @@ -108,7 +108,7 @@ unnamed - + dimensionsLabel @@ -116,7 +116,7 @@ Keyboard dimensions: - + keyboardPreviewLabel @@ -128,7 +128,7 @@ 0 - + 0 100 @@ -143,7 +143,7 @@ - + groupBox2 @@ -154,7 +154,7 @@ unnamed - + keyListBox @@ -167,9 +167,9 @@ - + - layout3 + tqlayout3 @@ -225,7 +225,7 @@ - + textLabel1_2 @@ -233,7 +233,7 @@ Key definition data: - + keyInfoText @@ -248,7 +248,7 @@ - + groupBox3 @@ -259,7 +259,7 @@ unnamed - + titleLabel @@ -290,14 +290,14 @@ 0 - + 32767 70 - + textLabel1 @@ -305,7 +305,7 @@ Comments: - + textLabel2 @@ -378,7 +378,7 @@ keySelectionChanged(QListBoxItem*) - + openBtnClicked() saveBtnClicked() saveAsBtnClicked() @@ -388,8 +388,8 @@ editBtnClicked() removeBtnClicked() keySelectionChanged(QListBoxItem*) - - + + kpushbutton.h kpushbutton.h diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index 99cc63cc..bbf42687 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -35,8 +35,8 @@ TQMap KTouchKeyboardWidget::m_keyCharMap; // -------------------------------------------------------------------------- -KTouchKeyboardWidget::KTouchKeyboardWidget(TQWidget *parent) - : TQWidget(parent), m_keyboardWidth(100), m_keyboardHeight(60), m_currentLayout(""), +KTouchKeyboardWidget::KTouchKeyboardWidget(TQWidget *tqparent) + : TQWidget(tqparent), m_keyboardWidth(100), m_keyboardHeight(60), m_currentLayout(""), m_hideKeyboard(false) { setMinimumHeight(100); // when it's smaller you won't see anything @@ -51,12 +51,12 @@ bool KTouchKeyboardWidget::loadKeyboard(TQWidget * window, const KURL& url, TQSt bool result = readKeyboard(target, msg); KIO::NetAccess::removeTempFile(target); if (!result && errorMsg!=NULL) - *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").tqarg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(url.url()); + *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url()); return false; } } @@ -81,7 +81,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) { TQTextStream out( &outfile ); out << "########################################## \n"; out << "# # \n"; - out << "# Keyboard layout file for KTouch # \n"; + out << "# Keyboard tqlayout file for KTouch # \n"; out << "# # \n"; out << "########################################## \n"; out << "#\n"; @@ -95,7 +95,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) { default : out << "NormalKey "; break; } TQRect rect=key->frame(); - out << key->m_keyChar.unicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.tqunicode() << '\t' << key->m_keyText << '\t' << rect.left() << '\t' << rect.top() << '\t' << rect.width() << '\t' << rect.height() << endl; } @@ -112,16 +112,16 @@ void KTouchKeyboardWidget::applyPreferences(TQWidget * window, bool silent) { setMaximumHeight(100); else setMaximumHeight(10000); - // let's check whether the keyboard layout has changed + // let's check whether the keyboard tqlayout has changed if (Prefs::currentKeyboardFile() != m_currentLayout) { - // if the layout is the number layout just create it and we're done + // if the tqlayout is the number tqlayout just create it and we're done //kdDebug() << "[KTouchKeyboardWidget::applyPreferences] keyboard = " << Prefs::currentKeyboardFile() << endl; if (Prefs::currentKeyboardFile()=="number.keyboard") { createDefaultKeyboard(); resizeEvent(NULL); return; } - // ok, let's load this layout + // ok, let's load this tqlayout if (silent) { // during initialisation we don't want to have a message box, that's why this is silent if (!loadKeyboard(window, KURL::fromPathOrURL( Prefs::currentKeyboardFile() ))) @@ -132,8 +132,8 @@ void KTouchKeyboardWidget::applyPreferences(TQWidget * window, bool silent) { else { TQString errorMsg; if (!loadKeyboard(window, KURL::fromPathOrURL( Prefs::currentKeyboardFile() ), &errorMsg)) { - KMessageBox::error( 0, i18n("Error reading the keyboard layout; the default number keypad will " - "be created instead. You can choose another keyboard layout in the preferences dialog."), + KMessageBox::error( 0, i18n("Error reading the keyboard tqlayout; the default number keypad will " + "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), errorMsg); createDefaultKeyboard(); } @@ -309,7 +309,7 @@ void KTouchKeyboardWidget::createDefaultKeyboard() { updateColours(); m_currentLayout="number.keyboard"; - // create keyboard geometry for new keyboard data + // create keyboard tqgeometry for new keyboard data int sp = 10; int h = 50; @@ -397,13 +397,13 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro w=h=8; // default values for old keyboard files m_keyList.append( new KTouchFingerKey(keyAscII, keyText, x+1, y+1, w, h) ); m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, 0, 0) ); -// kdDebug() << "read : F : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : F : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; } else if (keyType=="ControlKey") { lineStream >> keyText >> x >> y >> w >> h; m_keyList.append( new KTouchControlKey(keyAscII, keyText, x+1, y+1, w-2, h-2) ); m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, 0, 0) ); -// kdDebug() << "read : C : unicode = " << keyAscII << " char = " << keyText << endl; +// kdDebug() << "read : C : tqunicode = " << keyAscII << " char = " << keyText << endl; } else if (keyType=="NormalKey") { int fingerCharCode; @@ -412,16 +412,16 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro // retrieve the finger key with the matching char m_keyList.append( new KTouchNormalKey(keyAscII, keyText, x+1, y+1, w, h) ); m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, fingerCharCode, 0) ); -// kdDebug() << "read : N : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : N : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; } else if (keyType=="HiddenKey") { int targetChar, fingerChar, controlChar; lineStream >> targetChar >> fingerChar >> controlChar; m_connectorList.append( KTouchKeyConnection(keyAscII, targetChar, fingerChar, controlChar) ); -// kdDebug() << "read : H : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; +// kdDebug() << "read : H : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; } else { - errorMsg = i18n("Missing key type in line '%1'.").arg(line); + errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); return false; } if (keys.find(keyAscII)!=keys.end()) { @@ -437,7 +437,7 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro m_keyboardWidth = std::max(m_keyboardWidth, x+w); m_keyboardHeight = std::max(m_keyboardHeight, y+h); } while (!in.atEnd() && !line.isNull()); -// kdDebug() << "showing all unicode numbers in this file" << endl; +// kdDebug() << "showing all tqunicode numbers in this file" << endl; /* for (std::set::iterator it = keys.begin(); it != keys.end(); ++it) kdDebug() << *it << endl; */ @@ -460,9 +460,9 @@ void KTouchKeyboardWidget::updateColours() { TQChar targetChar = (*it).m_targetKeyChar; // this is the _base_ character of the key that needs to be highlighted TQChar ch = (*it).m_keyChar; -/* kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.unicode() << ") " - << "target = " << targetChar << "(" << targetChar.unicode() << ") " - << "finger = " << fingerChar << "(" << fingerChar.unicode() << ")" << endl; +/* kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.tqunicode() << ") " + << "target = " << targetChar << "(" << targetChar.tqunicode() << ") " + << "finger = " << fingerChar << "(" << fingerChar.tqunicode() << ")" << endl; */ m_keyCharMap[ch] = -1; diff --git a/ktouch/src/ktouchkeyboardwidget.h b/ktouch/src/ktouchkeyboardwidget.h index 047a7575..a31497ad 100644 --- a/ktouch/src/ktouchkeyboardwidget.h +++ b/ktouch/src/ktouchkeyboardwidget.h @@ -30,28 +30,29 @@ class KURL; /** This is the keyboard widget at the bottom of the training screen. * In addition to the painting functions this class has the member * functions loadKeyboard() and saveKeyboard() which can read and write - * a keyboard layout from/into a file.

    + * a keyboard tqlayout from/into a file.

    * The keyboard is drawn in the paintEvent() member function. The * resizing, that means the recalculation of m_shift is * done in the resizeEvent() member function.

    * The state of keyboard and keys does not change while it is - * repainted or resized. Only when a new character has been typed + * tqrepainted or resized. Only when a new character has been typed * and the newKey() slot is called the state changes (and thus the * activated keys and finger key animations etc.) */ class KTouchKeyboardWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchKeyboardWidget(TQWidget *parent); - /// Reads a keyboard layout from the given URL. + KTouchKeyboardWidget(TQWidget *tqparent); + /// Reads a keyboard tqlayout from the given URL. /// The function returns 'true' when the reading was successful or 'false' if not. In this /// case the optional parameter errorMsg contains the error message. bool loadKeyboard(TQWidget * window, const KURL& url, TQString* errorMsg=NULL); - /// Saves the keyboard layout to the URL. + /// Saves the keyboard tqlayout to the URL. void saveKeyboard(TQWidget * window, const KURL& url); - /// Applies preferences to the keyboard layout and the keys. - /// This means that the layout is basically recreated and if the layout type/language + /// Applies preferences to the keyboard tqlayout and the keys. + /// This means that the tqlayout is basically recreated and if the tqlayout type/language /// changed it will be reloaded. void applyPreferences(TQWidget * window, bool silent); @@ -89,7 +90,7 @@ class KTouchKeyboardWidget : public TQWidget { int m_keyboardWidth; ///< The width of the keyboard (maximum of the sums of all keywidths in each line). int m_keyboardHeight; ///< The height of the keyboard (sum of all key row heights). double m_shift; ///< The horizontal shift for the keyboard. - TQString m_currentLayout; ///< The name of the currently used layout. + TQString m_currentLayout; ///< The name of the currently used tqlayout. TQChar m_nextKey; ///< The next to be pressed character. bool m_hideKeyboard; ///< If true, the keyboard won't be shown. diff --git a/ktouch/src/ktouchkeys.cpp b/ktouch/src/ktouchkeys.cpp index 83efa572..6f45d40a 100644 --- a/ktouch/src/ktouchkeys.cpp +++ b/ktouch/src/ktouchkeys.cpp @@ -68,7 +68,7 @@ void KTouchNormalKey::paint(TQPainter& p) const { p.setPen( colorScheme.m_frame ); textColor = colorScheme.m_text; }; - KTouchBaseKey::paint(p); // call the parents paint() function + KTouchBaseKey::paint(p); // call the tqparents paint() function p.setPen(textColor); p.setFont( m_font ); diff --git a/ktouch/src/ktouchkeys.h b/ktouch/src/ktouchkeys.h index 68ffa959..c429790d 100644 --- a/ktouch/src/ktouchkeys.h +++ b/ktouch/src/ktouchkeys.h @@ -39,7 +39,7 @@ class KTouchBaseKey { m_x(x), m_y(y), m_w(w), m_h(h), m_type(NORMAL_KEY) {} /// Destructor. virtual ~KTouchBaseKey() {} - /// Paints the basic key shape using the painter p. + /// Paints the basic key tqshape using the painter p. virtual void paint(TQPainter& p) const; /// Recalculates the scaled position and size properties of the key. void resize(double scale); @@ -66,7 +66,7 @@ class KTouchBaseKey { int m_wS; ///< The scaled width of the key. int m_hS; ///< The scaled height of the key. - KeyType m_type; ///< Stores the type of the key (convenience for saving of the keyboard layout). + KeyType m_type; ///< Stores the type of the key (convenience for saving of the keyboard tqlayout). }; // --------------------------------------------------------------------------------------- @@ -116,14 +116,14 @@ class KTouchFingerKey : public KTouchNormalKey { /** This is a special or control key. * This key acts as a modifier key to a normal key (for instance a shift key) and has a - * different shape and painting routine then the normal keys. Therefore it is directly + * different tqshape and painting routine then the normal keys. Therefore it is directly * derived from KTouchKey. */ class KTouchControlKey : public KTouchBaseKey { public: /// Constructor KTouchControlKey(const TQChar& keyChar, const TQString& keyText, int x, int y, int w, int h); - /// Extends the parents paint routine (draws the text or other fancy stuff). + /// Extends the tqparents paint routine (draws the text or other fancy stuff). void paint(TQPainter& p) const; }; // ------------------------------------------------------------------------------------ diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp index 5f5d57de..1f3b687b 100644 --- a/ktouch/src/ktouchlecture.cpp +++ b/ktouch/src/ktouchlecture.cpp @@ -122,16 +122,16 @@ bool KTouchLecture::readLecture(TQTextStream& in) { m_lectureData.clear(); // now loop until end of file is reached and break down the textfile into several strings containing the levels TQStringList slist; - TQString current_level = TQString::null; // used to store the current level data + TQString current_level = TQString(); // used to store the current level data line = in.readLine(); bool in_level = false; while (!in.atEnd() && !line.isNull()) { // only consider non-empty lines if (!line.isEmpty()) { // lecture title? - if (line.find("# Title:") == 0) + if (line.tqfind("# Title:") == 0) m_title = line.right(line.length() - 8).stripWhiteSpace(); - else if (line[0]!='#' || line.find("# Comment:")!=-1) { + else if (line[0]!='#' || line.tqfind("# Comment:")!=-1) { // ok, after all those comment lines, we finally found the beginn of a level in_level = true; current_level += line + '\n'; @@ -139,7 +139,7 @@ bool KTouchLecture::readLecture(TQTextStream& in) { else if (in_level) { // ok, a new comment found, if we were reading a level, store it slist.append(current_level); - current_level = TQString::null; + current_level = TQString(); in_level = false; } } diff --git a/ktouch/src/ktouchlecture.h b/ktouch/src/ktouchlecture.h index 9cc4cc6e..7c2af0d8 100644 --- a/ktouch/src/ktouchlecture.h +++ b/ktouch/src/ktouchlecture.h @@ -27,7 +27,7 @@ class KURL; /// This class handles the lecture data and provides the lines to type. /// /// It contains the level data (see KTouchLevelData). A lecture object -/// contains ALWAYS at least one lecture.

    +/// tqcontains ALWAYS at least one lecture.

    /// The lecture data can be read and written using the member functions /// readLecture() and writeLecture().

    /// During a training session the program will occasionally need a new diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index e274732b..12a497f9 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -41,8 +41,8 @@ // ***** Public functions *** // ************************** -KTouchLectureEditor::KTouchLectureEditor(TQWidget *parent, const char* name, bool modal, WFlags fl) - : KTouchLectureEditorDlg(parent, name, modal, fl) +KTouchLectureEditor::KTouchLectureEditor(TQWidget *tqparent, const char* name, bool modal, WFlags fl) + : KTouchLectureEditorDlg(tqparent, name, modal, fl) { levelListView->setSorting(-1); // don't sort my level list view! @@ -111,7 +111,7 @@ void KTouchLectureEditor::saveBtnClicked() { // ----------------------------------------------------------------------------- void KTouchLectureEditor::saveAsBtnClicked() { - TQString tmp = KFileDialog::getSaveFileName(TQString::null, + TQString tmp = KFileDialog::getSaveFileName(TQString(), "*.ktouch.xml|KTouch Lecture Files(*.ktouch.xml)\n*.*|All Files", this, i18n("Save Training Lecture") ); if (!tmp.isEmpty()) { transfer_from_dialog(); @@ -307,7 +307,7 @@ void KTouchLectureEditor::transfer_from_dialog() { void KTouchLectureEditor::showCurrentLevel() { if (m_level >= m_lecture.m_lectureData.size()) return; // should not happen, but why running a risk here... - levelLabel->setText(i18n("Data of Level %1").arg(m_level+1) ); + levelLabel->setText(i18n("Data of Level %1").tqarg(m_level+1) ); levelCommentEdit->setText(m_lecture.m_lectureData[m_level].m_comment); newCharsEdit->setText(m_lecture.m_lectureData[m_level].m_newChars); TQString text; @@ -379,7 +379,7 @@ int KTouchLectureEditor::openLectureFile(const KURL& url) { // try to read old format first then XML format if (!m_lecture.load(this, m_currentURL) && !m_lecture.loadXML(this, m_currentURL)) { KMessageBox::sorry(this, i18n("Could not open the lecture file, creating a new one instead.")); - m_currentURL = TQString::null; // new lectures haven't got a URL + m_currentURL = TQString(); // new lectures haven't got a URL } } // If we have no URL, we create a new lecture - can happen if either the user @@ -411,7 +411,7 @@ bool KTouchLectureEditor::saveModified() { if (!m_modified) return true; // ok, ask the user to save the changes int result = KMessageBox::questionYesNoCancel(this, - i18n("The lecture has been changed. Do you want to save the changes?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard()); + i18n("The lecture has been changed. Do you want to save the changes?"),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()); if (result == KMessageBox::Cancel) return false; // User aborted if (result == KMessageBox::Yes) saveBtnClicked(); // if successfully saved the modified flag will be resetted in the saveBtnClicked() function diff --git a/ktouch/src/ktouchlectureeditor.h b/ktouch/src/ktouchlectureeditor.h index 46d944b2..d09b7a9f 100644 --- a/ktouch/src/ktouchlectureeditor.h +++ b/ktouch/src/ktouchlectureeditor.h @@ -41,9 +41,10 @@ /// @see startEditor() for details on the return value. class KTouchLectureEditor : public KTouchLectureEditorDlg { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchLectureEditor(TQWidget *parent, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KTouchLectureEditor(TQWidget *tqparent, const char* name = 0, bool modal = FALSE, WFlags fl = 0); /// Destructor ~KTouchLectureEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui index a5008e97..4d52aa97 100644 --- a/ktouch/src/ktouchlectureeditor_dlg.ui +++ b/ktouch/src/ktouchlectureeditor_dlg.ui @@ -1,10 +1,10 @@ KTouchLectureEditorDlg - + KTouchLectureEditorDlg - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox2 @@ -30,15 +30,15 @@ unnamed - + - layout7 + tqlayout7 unnamed - + titleLabel @@ -59,7 +59,7 @@ - + textLabel1 @@ -75,7 +75,7 @@ Comment: - + lectureCommentEdit @@ -87,7 +87,7 @@ 0 - + 32767 70 @@ -96,7 +96,7 @@ - + groupBox1 @@ -107,9 +107,9 @@ unnamed - + - layout9 + tqlayout9 @@ -142,9 +142,9 @@ AllColumns - + - layout8 + tqlayout8 @@ -153,9 +153,9 @@ 0 - + - layout7 + tqlayout7 @@ -165,13 +165,13 @@ upBtn - + 35 28 - + 30 32767 @@ -188,13 +188,13 @@ downBtn - + 35 28 - + 30 32767 @@ -211,13 +211,13 @@ newBtn - + 35 28 - + 30 32767 @@ -242,13 +242,13 @@ 0 - + 35 28 - + 30 32767 @@ -273,7 +273,7 @@ Fixed - + 40 20 @@ -284,9 +284,9 @@ - + - layout9 + tqlayout9 @@ -297,7 +297,7 @@ newCharsEdit - + frame3 @@ -316,7 +316,7 @@ Sunken - + commentLabel @@ -332,15 +332,15 @@ Level comment (optional): - + - layout8 + tqlayout8 unnamed - + wordCountLabel @@ -358,14 +358,14 @@ Expanding - + 16 20 - + charCountLabel @@ -383,14 +383,14 @@ Expanding - + 20 20 - + textLabel4 @@ -400,7 +400,7 @@ - + levelLabel @@ -422,7 +422,7 @@ Level Data of Level 10 - + textLabel2 @@ -459,7 +459,7 @@ NoWrap - + textLabel3 @@ -484,9 +484,9 @@ - + - layout35 + tqlayout35 @@ -510,7 +510,7 @@ Expanding - + 248 20 @@ -656,15 +656,15 @@ saveAsButton quitButton - + openBtnClicked() saveBtnClicked() saveAsBtnClicked() closeQuery() setModified() fontBtnClicked() - - + + klineedit.h klistview.h diff --git a/ktouch/src/ktouchleveldata.cpp b/ktouch/src/ktouchleveldata.cpp index d0606442..58ac983f 100644 --- a/ktouch/src/ktouchleveldata.cpp +++ b/ktouch/src/ktouchleveldata.cpp @@ -38,14 +38,14 @@ void KTouchLevelData::createDefault() { bool KTouchLevelData::readLevel(TQTextStream& in) { TQString line; - m_comment = m_newChars = TQString::null; + m_comment = m_newChars = TQString(); m_lines.clear(); // now read all the lines of the level, until EOF or an empty line line = in.readLine(); while (!line.isNull()) { if (!line.isEmpty()) { // Do we have a comment here? And if yes, is a keyword in the line? - if (line.find("# Comment:")==0) + if (line.tqfind("# Comment:")==0) m_comment = line.right(line.length() - 10).stripWhiteSpace(); else if (line[0]!='#') { // the first line is the new characters line diff --git a/ktouch/src/ktouchopenrequest.cpp b/ktouch/src/ktouchopenrequest.cpp index eb82f3f8..1a293f23 100644 --- a/ktouch/src/ktouchopenrequest.cpp +++ b/ktouch/src/ktouchopenrequest.cpp @@ -26,8 +26,8 @@ #include "ktouchopenrequest.h" #include "ktouchopenrequest.moc" -KTouchOpenRequest::KTouchOpenRequest(TQWidget* parent, const char* name, bool modal, WFlags fl) -: KTouchOpenRequestDlg(parent,name, modal,fl) +KTouchOpenRequest::KTouchOpenRequest(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: KTouchOpenRequestDlg(tqparent,name, modal,fl) { } @@ -79,7 +79,7 @@ void KTouchOpenRequest::okBtnClicked() { if (presetRadioBtn->isChecked()) m_url = presetCombo->currentText(); if (newRadioBtn->isChecked()) - m_url = TQString::null; + m_url = TQString(); if (openFileRadioBtn->isChecked()) { if (openFileEdit->text().isEmpty()) { KMessageBox::error(this, i18n("Please select or enter a file name.")); @@ -113,7 +113,7 @@ void KTouchOpenRequest::radioBtnChanged() { void KTouchOpenRequest::browseBtnClicked() { - KURL tmp = KFileDialog::getOpenURL(TQString::null, TQString::null, this, i18n("Select Training Lecture File") ); + KURL tmp = KFileDialog::getOpenURL(TQString(), TQString(), this, i18n("Select Training Lecture File") ); if (!tmp.isEmpty()) openFileEdit->setText(tmp.url()); } diff --git a/ktouch/src/ktouchopenrequest.h b/ktouch/src/ktouchopenrequest.h index 8f1c31d0..c66f9f02 100644 --- a/ktouch/src/ktouchopenrequest.h +++ b/ktouch/src/ktouchopenrequest.h @@ -52,17 +52,18 @@ /// class KTouchOpenRequest : public KTouchOpenRequestDlg { Q_OBJECT + TQ_OBJECT public: /// Default constructor. - KTouchOpenRequest(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchOpenRequest(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); /// Default destructor. ~KTouchOpenRequest() {} /// Sets up the dialog and runs it. /// @return Returns the dialogs return code, TQDialog::Accepted or TQDialog::Rejected. int requestFileToOpen(KURL& url, const TQString& caption, const TQString& title, const TQString& currentText, const TQString& defaultText, const TQString& openText, const TQString& newText, - KURL current_url = TQString::null, TQStringList defaultList = TQStringList(), TQString emptyListText = TQString::null); + KURL current_url = TQString(), TQStringList defaultList = TQStringList(), TQString emptyListText = TQString()); /// After the dialog has been accepted the URL chosen by the user is stored herein. KURL m_url; diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui index 38ff057e..c89eacf9 100644 --- a/ktouch/src/ktouchopenrequest_dlg.ui +++ b/ktouch/src/ktouchopenrequest_dlg.ui @@ -1,10 +1,10 @@ KTouchOpenRequestDlg - + KTouchOpenRequestDlg - + 0 0 @@ -19,7 +19,7 @@ unnamed - + openChoiceGroup @@ -38,11 +38,11 @@ unnamed - + currentRadioBtn - + 0 28 @@ -52,11 +52,11 @@ Current something - + presetRadioBtn - + 0 28 @@ -66,12 +66,12 @@ Preset something: - + presetCombo - + newRadioBtn @@ -89,7 +89,7 @@ Fixed - + 20 16 @@ -106,16 +106,16 @@ Expanding - + 20 16 - + - layout3 + tqlayout3 @@ -147,11 +147,11 @@ Current something file - + openFileRadioBtn - + 0 28 @@ -163,9 +163,9 @@ - + - layout1 + tqlayout1 @@ -181,7 +181,7 @@ Expanding - + 40 20 @@ -273,12 +273,12 @@ okBtn cancelBtn - + okBtnClicked() radioBtnChanged() browseBtnClicked() - - + + klineedit.h kpushbutton.h diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui index 5b475da0..5d5ccca3 100644 --- a/ktouch/src/ktouchprefcolorslayout.ui +++ b/ktouch/src/ktouchprefcolorslayout.ui @@ -1,10 +1,10 @@ KTouchPrefColorsLayout - + KTouchPrefColorsLayout - + 0 0 @@ -22,7 +22,7 @@ 0 - + groupBox5 @@ -33,15 +33,15 @@ unnamed - + - layout3 + tqlayout3 unnamed - + textLabel2 @@ -59,14 +59,14 @@ Expanding - + 40 20 - + Black & White @@ -99,7 +99,7 @@ - + kcfg_CommonTypingLineColors @@ -107,7 +107,7 @@ Use common typing line colors independent of color scheme - + colorsGroup @@ -118,9 +118,9 @@ unnamed - + - layout9 + tqlayout9 @@ -130,7 +130,7 @@ kcfg_TeacherBackgroundColor - + 40 0 @@ -146,7 +146,7 @@ You can change here the background color for the teacher's line (the line of letters you have to type.) - + textLabel1_3 @@ -166,7 +166,7 @@ 0 - + 40 0 @@ -189,7 +189,7 @@ Expanding - + 20 20 @@ -206,7 +206,7 @@ Fixed - + 20 20 @@ -217,7 +217,7 @@ kcfg_StudentTextColor - + 40 0 @@ -233,7 +233,7 @@ Here you can change the color of the text you type in the student line. - + textLabel1_2 @@ -245,7 +245,7 @@ kcfg_StudentBackgroundColor - + 40 0 @@ -255,7 +255,7 @@ - + textLabel1_4_2 @@ -273,14 +273,14 @@ Fixed - + 20 20 - + textLabel1_4 @@ -288,7 +288,7 @@ Text: - + textLabel1 @@ -306,14 +306,14 @@ Expanding - + 34 20 - + textLabel1_2_2 @@ -333,14 +333,14 @@ Fixed - + 20 16 - + kcfg_ColorOnError @@ -351,9 +351,9 @@ If checked this shows your error using the colors below on the typing line - + - layout4 + tqlayout4 @@ -369,14 +369,14 @@ Expanding - + 140 20 - + errorTextLabel @@ -391,7 +391,7 @@ true - + 40 0 @@ -424,14 +424,14 @@ Fixed - + 20 20 - + errorBackgroundLabel @@ -446,7 +446,7 @@ true - + 40 0 @@ -485,7 +485,7 @@ Expanding - + 20 40 @@ -504,7 +504,7 @@ kcfg_ErrorBackgroundColor kcfg_CurrentColorScheme - + kcolorbutton.h kcolorbutton.h diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui index b62a5e81..002ae628 100644 --- a/ktouch/src/ktouchprefgenerallayout.ui +++ b/ktouch/src/ktouchprefgenerallayout.ui @@ -1,10 +1,10 @@ KTouchPrefGeneralLayout - + KTouchPrefGeneralLayout - + 0 0 @@ -22,7 +22,7 @@ 0 - + groupBox1 @@ -39,7 +39,7 @@ unnamed - + kcfg_BeepOnError @@ -53,7 +53,7 @@ If checked (default) this will emit a beep each time you make a typing error. - + kcfg_SoundOnLevel @@ -69,7 +69,7 @@ - + groupBox3 @@ -80,15 +80,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + textLabel2 @@ -106,18 +106,18 @@ Expanding - + 227 20 - + kcfg_SlidingSpeed - + 32767 20 @@ -149,14 +149,14 @@ Fixed - + 20 20 - + textLabel3 @@ -164,7 +164,7 @@ Slow: 1 - + textLabel1_2 @@ -184,22 +184,22 @@ Fixed - + 20 16 - + - layout3 + tqlayout3 unnamed - + textLabel1 @@ -207,7 +207,7 @@ Maximum height of sliding line widget: - + kcfg_MaxSlidingWidgetHeight @@ -218,7 +218,7 @@ 50 - + textLabel2_2 @@ -238,22 +238,22 @@ Fixed - + 20 16 - + - layout2 + tqlayout2 unnamed - + fontTextLabel @@ -271,7 +271,7 @@ Expanding - + 114 20 @@ -295,7 +295,7 @@ This button will display a font dialog where you can change the font for the student and the teacher lines. When you leave the font dialog, the new font is previewed in the line below and only applied when you click the Apply button below. - + kcfg_OverrideLectureFont @@ -323,7 +323,7 @@ Expanding - + 31 30 @@ -334,7 +334,7 @@ - + kfontrequester.h diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui index 34851276..179f071d 100644 --- a/ktouch/src/ktouchprefkeyboardlayout.ui +++ b/ktouch/src/ktouchprefkeyboardlayout.ui @@ -1,10 +1,10 @@ KTouchPrefKeyboardLayout - + KTouchPrefKeyboardLayout - + 0 0 @@ -22,7 +22,7 @@ 0 - + groupBox1 @@ -33,7 +33,7 @@ unnamed - + kcfg_ShowAnimation @@ -47,7 +47,7 @@ This highlights on the keyboard the key you have to type next. It is easier to type when this is checked. - + kcfg_HideKeyboard @@ -65,22 +65,22 @@ Fixed - + 20 16 - + - layout1 + tqlayout1 unnamed - + kcfg_OverrideKeyboardFont @@ -88,13 +88,13 @@ Override keyboard fonts - If checked you can specify your own keyboard font instead of the predefined one of the keyboard layout. + If checked you can specify your own keyboard font instead of the predefined one of the keyboard tqlayout. - Every keyboard layout may specify its own font. If the predefined font of a certain keyboard layout does not work or you would like to have your own, check this button. You may then choose your own font that will be used to draw the characters on the keys. + Every keyboard tqlayout may specify its own font. If the predefined font of a certain keyboard tqlayout does not work or you would like to have your own, check this button. You may then choose your own font that will be used to draw the characters on the keys. - + textLabel1 @@ -121,7 +121,7 @@ Expanding - + 20 30 @@ -132,10 +132,10 @@ - + fontChooseBtnClicked() - - + + kfontrequester.h diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui index 19fe985c..e9b714e0 100644 --- a/ktouch/src/ktouchpreftraininglayout.ui +++ b/ktouch/src/ktouchpreftraininglayout.ui @@ -1,10 +1,10 @@ KTouchPrefTrainingLayout - + KTouchPrefTrainingLayout - + 0 0 @@ -22,7 +22,7 @@ 0 - + groupBox1 @@ -33,7 +33,7 @@ unnamed - + kcfg_AutoLevelChange @@ -51,22 +51,22 @@ Fixed - + 20 16 - + - layout1 + tqlayout1 unnamed - + l3 @@ -82,7 +82,7 @@ 500 - + l2 @@ -90,7 +90,7 @@ Typing speed: - + l5 @@ -98,7 +98,7 @@ % - + l1 @@ -121,14 +121,14 @@ Fixed - + 16 20 - + l4 @@ -146,7 +146,7 @@ Fixed - + 16 20 @@ -165,22 +165,22 @@ Fixed - + 20 16 - + - layout2 + tqlayout2 unnamed - + l6 @@ -188,7 +188,7 @@ Limits to decrease a level - + l10 @@ -209,7 +209,7 @@ 500 - + l7 @@ -217,7 +217,7 @@ Typing speed: - + l9 @@ -235,7 +235,7 @@ Fixed - + 16 20 @@ -252,14 +252,14 @@ Fixed - + 16 20 - + l8 @@ -269,7 +269,7 @@ - + kcfg_DisableManualLevelChange @@ -279,7 +279,7 @@ - + groupBox7 @@ -290,7 +290,7 @@ unnamed - + kcfg_RememberLevel @@ -310,7 +310,7 @@ Expanding - + 20 20 @@ -321,7 +321,7 @@ - + knuminput.h knuminput.h diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index 3071cc52..b1870b7b 100644 --- a/ktouch/src/ktouchslideline.cpp +++ b/ktouch/src/ktouchslideline.cpp @@ -41,8 +41,8 @@ // --- don't touch the lines above --- -KTouchSlideLine::KTouchSlideLine(TQWidget *parent) - : TQWidget( parent ), +KTouchSlideLine::KTouchSlideLine(TQWidget *tqparent) + : TQWidget( tqparent ), m_teacherPixmap(NULL), m_studentPixmap(NULL), m_slideTimer(this), @@ -237,8 +237,8 @@ void KTouchSlideLine::resizeEvent ( TQResizeEvent * ) { KD_DEBUG( "[KTouchSlideLine::resizeEvent]" << endl ); // required input member variables: none - // when the widget is resized, the whole geometry is invalidated, so we do: - // 1. recalculate and store the geometry of the sliding lines + // when the widget is resized, the whole tqgeometry is tqinvalidated, so we do: + // 1. recalculate and store the tqgeometry of the sliding lines // 2. resize the font // 3. recreate the sliding lines (this is done from the resizeFont() function @@ -411,7 +411,7 @@ void KTouchSlideLine::updateSlidingLines() { // draw the teacher pixmap text TQPainter painter; - painter.begin (m_teacherPixmap, this); + painter.tqbegin (TQT_TQPAINTDEVICE(m_teacherPixmap), this); painter.setFont( m_font ); TQColor col_tt = Prefs::commonTypingLineColors() ? @@ -443,7 +443,7 @@ void KTouchSlideLine::updateSlidingLines() { KD_DEBUG( " m_studentPixmap = " << w+100 << " x " << h << endl ); // update (draw) student line and calculate coordinates needed for sliding - repaint(true); // trigger a paint event to erase the background + tqrepaint(true); // trigger a paint event to erase the background updateStudentLine(); } // ---------------------------------------------------------------------------- @@ -465,7 +465,7 @@ void KTouchSlideLine::updateStudentLine() { int teacherLen = m_teacherText.length(); int studentLen = m_studentText.length(); - unsigned int min_len = QMIN(teacherLen, studentLen); + unsigned int min_len = TQMIN(teacherLen, studentLen); TQString correctText; if (!Prefs::right2LeftTyping()) { @@ -532,7 +532,7 @@ void KTouchSlideLine::updateStudentLine() { // now let's draw the students pixmap TQPainter painter; - painter.begin (m_studentPixmap, this); + painter.tqbegin (TQT_TQPAINTDEVICE(m_studentPixmap), this); if (Prefs::colorOnError()) { // draw the student line depending on the colour settings if (error) { diff --git a/ktouch/src/ktouchslideline.h b/ktouch/src/ktouchslideline.h index b1466b7e..c707a9ad 100644 --- a/ktouch/src/ktouchslideline.h +++ b/ktouch/src/ktouchslideline.h @@ -33,9 +33,10 @@ class TQPainter; /// Please refer to the documentation 'sliding_line_widget.pdf' in the doc folder. class KTouchSlideLine : public TQWidget { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchSlideLine(TQWidget *parent); + KTouchSlideLine(TQWidget *tqparent); /// Destructor, free memory allocated for the line pixmap. ~KTouchSlideLine(); /// Applies the preferences (font and colours). @@ -82,7 +83,7 @@ class KTouchSlideLine : public TQWidget { /// @see slide() void paintEvent( TQPaintEvent * ); /// Will be called when the widget is resized. - /// This event will first recalculate the geometry of the sliding lines. + /// This event will first recalculate the tqgeometry of the sliding lines. /// Then the font size will be updated and through that, the sliding lines will be /// updated. void resizeEvent ( TQResizeEvent * ); @@ -120,8 +121,8 @@ class KTouchSlideLine : public TQWidget { TQColor m_cursorBackground; ///< Defines the background colour of the cursor (when turned off). // variables depending on size of widget, will be updated in resizeEvent() - int m_marginVerWidget; ///< Vertical margin between widget boundary and sliding line in pixels. - int m_slideLineDist; ///< Vertical distance between sliding lines in pixels. + int m_marginVerWidget; ///setChecked(true); WPMRadio->setChecked(true); @@ -122,7 +122,7 @@ void KTouchStatistics::lectureActivated(int index) { // ---------------------------------------------------------------------------- void KTouchStatistics::clearHistory() { - if (KMessageBox::warningContinueCancel(this, i18n("Erase all statistics data for the current user?"),TQString::null,KStdGuiItem::del()) + if (KMessageBox::warningContinueCancel(this, i18n("Erase all statistics data for the current user?"),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) { KTouchPtr->clearStatistics(); // clear statistics data in KTouch @@ -161,7 +161,7 @@ void KTouchStatistics::updateCurrentSessionTab() { else levelnums += ","; } levels_count = 0; - levelnums += TQString("%1").arg(*it+1); + levelnums += TQString("%1").tqarg(*it+1); } else { @@ -233,7 +233,7 @@ void KTouchStatistics::updateCurrentSessionTab() { void KTouchStatistics::updateCurrentLevelTab() { // level info - levelLabel2->setText( TQString("%1").arg(m_currLevelStats.m_levelNum+1) ); + levelLabel2->setText( TQString("%1").tqarg(m_currLevelStats.m_levelNum+1) ); // general stats group elapsedTimeLCDLevel->display(static_cast(m_currLevelStats.m_elapsedTime)); totalCharsLCDLevel->display(static_cast(m_currLevelStats.m_totalChars) ); @@ -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::currentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::tqcurrentDateTime().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::currentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::tqcurrentDateTime().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::currentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::tqcurrentDateTime().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::currentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, skill) ); } chartWidget->LeftAxis.setLabel( i18n("Skill") ); @@ -455,11 +455,11 @@ void KTouchStatistics::updateChartTab() { void KTouchStatistics::updateChartTab() { if (m_trainer->m_sessionHistory.size()<2) { chartTypeButtonGroup->setEnabled(false); - chartWidget->setEraseColor( Qt::gray ); + chartWidget->setEraseColor( TQt::gray ); } else { chartTypeButtonGroup->setEnabled(true); - chartWidget->setEraseColor( Qt::white ); + chartWidget->setEraseColor( TQt::white ); }; if (charSpeedButton->isChecked()) chartWidget->setChartType( KTouchChartWidget::CharsPerMinute ); diff --git a/ktouch/src/ktouchstatistics.h b/ktouch/src/ktouchstatistics.h index 98983168..d621a462 100644 --- a/ktouch/src/ktouchstatistics.h +++ b/ktouch/src/ktouchstatistics.h @@ -27,9 +27,10 @@ class KURL; /// Implementation of the statistics widget class KTouchStatistics : public KTouchStatisticsDlg { Q_OBJECT + TQ_OBJECT public: /// Constructor, takes a pointer to the trainer object. - KTouchStatistics(TQWidget* parent); + KTouchStatistics(TQWidget* tqparent); /// Fills the statistics dialog with data and executes it. void run(const KURL& currentLecture, const KTouchStatisticsData& stats, diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui index 761fd908..6f8b4dc6 100644 --- a/ktouch/src/ktouchstatistics_dlg.ui +++ b/ktouch/src/ktouchstatistics_dlg.ui @@ -1,10 +1,10 @@ KTouchStatisticsDlg - + KTouchStatisticsDlg - + 0 0 @@ -27,7 +27,7 @@ unnamed - + tabWidget @@ -42,7 +42,7 @@ 0 - + currentTab @@ -53,7 +53,7 @@ unnamed - + currentTitleLabel @@ -67,15 +67,15 @@ Current Training Session Statistics - + - layout7 + tqlayout7 unnamed - + textLabel4_3_2 @@ -83,7 +83,7 @@ Levels in this session: - + levelLabel1 @@ -99,7 +99,7 @@ levelLabel1 - + textLabel2_4_2 @@ -107,7 +107,7 @@ Lecture: - + lectureLabel1 @@ -125,15 +125,15 @@ - + - layout28 + tqlayout28 unnamed - + groupBox4 @@ -144,7 +144,7 @@ unnamed - + textLabel4 @@ -152,7 +152,7 @@ Words typed: - + textLabel5 @@ -160,7 +160,7 @@ Mistyped characters: - + textLabel2 @@ -168,11 +168,11 @@ Time (seconds) elapsed: - + elapsedTimeLCD - + 50 32767 @@ -185,11 +185,11 @@ This shows the number of seconds you have typed in this training session. - + totalCharsLCD - + 50 32767 @@ -202,11 +202,11 @@ The number of characters (correct and wrong) that you have typed so far. - + wrongCharsLCD - + 50 32767 @@ -219,11 +219,11 @@ Shows how many wrong characters you did type. - + wordsLCD - + 50 32767 @@ -236,7 +236,7 @@ The number of words typed so far. - + textLabel3 @@ -246,7 +246,7 @@ - + groupBox7 @@ -260,11 +260,11 @@ unnamed - + frame4 - + 20 0 @@ -277,17 +277,17 @@ Plain - + charProgress1 - + charProgress5 - + charLabel1 @@ -295,7 +295,7 @@ a: - + charLabel5 @@ -303,7 +303,7 @@ e: - + charLabel2 @@ -311,12 +311,12 @@ b: - + charProgress6 - + charLabel6 @@ -324,17 +324,17 @@ f: - + charProgress2 - + charProgress3 - + charLabel7 @@ -342,7 +342,7 @@ g: - + charLabel3 @@ -350,22 +350,22 @@ c: - + charProgress7 - + charProgress8 - + charProgress4 - + charLabel8 @@ -373,7 +373,7 @@ h: - + charLabel4 @@ -383,7 +383,7 @@ - + groupBox5 @@ -394,7 +394,7 @@ unnamed - + textLabel6 @@ -402,7 +402,7 @@ Characters per minute: - + textLabel6_2 @@ -410,11 +410,11 @@ Words per minute: - + charSpeedLCD - + 50 32767 @@ -427,11 +427,11 @@ The number of correct characters you typed per minute. - + wordSpeedLCD - + 50 32767 @@ -446,7 +446,7 @@ - + groupBox6 @@ -457,7 +457,7 @@ unnamed - + correctnessBar @@ -479,7 +479,7 @@ Expanding - + 20 40 @@ -488,7 +488,7 @@ - + currentLevelTab @@ -499,7 +499,7 @@ unnamed - + currentTitleLabel_3 @@ -513,15 +513,15 @@ Current Level Statistics - + - layout8 + tqlayout8 unnamed - + lectureLabel2 @@ -537,7 +537,7 @@ lectureLabel2 - + textLabel4_3 @@ -545,7 +545,7 @@ Level: - + textLabel2_4 @@ -553,7 +553,7 @@ Lecture: - + levelLabel2 @@ -571,15 +571,15 @@ - + - layout28_2 + tqlayout28_2 unnamed - + groupBox4_2 @@ -590,7 +590,7 @@ unnamed - + textLabel4_2 @@ -598,7 +598,7 @@ Words typed: - + textLabel5_2 @@ -606,7 +606,7 @@ Mistyped characters: - + textLabel2_3 @@ -614,11 +614,11 @@ Time (seconds) elapsed: - + elapsedTimeLCDLevel - + 50 32767 @@ -628,11 +628,11 @@ Flat - + totalCharsLCDLevel - + 50 32767 @@ -642,11 +642,11 @@ Flat - + wrongCharsLCDLevel - + 50 32767 @@ -656,11 +656,11 @@ Flat - + wordsLCDLevel - + 50 32767 @@ -670,7 +670,7 @@ Flat - + textLabel3_3 @@ -680,7 +680,7 @@ - + groupBox7_2 @@ -694,11 +694,11 @@ unnamed - + frame4_2 - + 20 0 @@ -711,17 +711,17 @@ Plain - + charProgress1Level - + charProgress5Level - + charLabel1Level @@ -729,7 +729,7 @@ a: - + charLabel5Level @@ -737,7 +737,7 @@ e: - + charLabel2Level @@ -745,12 +745,12 @@ b: - + charProgress6Level - + charLabel6Level @@ -758,17 +758,17 @@ f: - + charProgress2Level - + charProgress3Level - + charLabel7Level @@ -776,7 +776,7 @@ g: - + charLabel3Level @@ -784,22 +784,22 @@ c: - + charProgress7Level - + charProgress8Level - + charProgress4Level - + charLabel8Level @@ -807,7 +807,7 @@ h: - + charLabel4Level @@ -817,7 +817,7 @@ - + groupBox5_2 @@ -828,7 +828,7 @@ unnamed - + textLabel6_3 @@ -836,7 +836,7 @@ Characters per minute: - + textLabel6_2_2 @@ -844,11 +844,11 @@ Words per minute: - + charSpeedLCDLevel - + 50 32767 @@ -858,11 +858,11 @@ Flat - + wordSpeedLCDLevel - + 50 32767 @@ -874,7 +874,7 @@ - + groupBox6_3 @@ -885,7 +885,7 @@ unnamed - + correctnessBarLevel @@ -904,7 +904,7 @@ Expanding - + 20 89 @@ -913,7 +913,7 @@ - + progressTab @@ -924,7 +924,7 @@ unnamed - + currentTitleLabel_2 @@ -938,15 +938,15 @@ Your Typing Progress - + - layout6 + tqlayout6 unnamed - + textLabel1_2 @@ -985,7 +985,7 @@ - + groupBox6_2 @@ -1004,7 +1004,7 @@ unnamed - + buttonGroup1 @@ -1021,7 +1021,7 @@ 0 - + textLabel1 @@ -1034,7 +1034,7 @@ Chart Data - + levelsRadio @@ -1042,7 +1042,7 @@ Level stats - + sessionsRadio @@ -1060,7 +1060,7 @@ Expanding - + 20 16 @@ -1069,7 +1069,7 @@ - + buttonGroup2 @@ -1086,7 +1086,7 @@ 0 - + textLabel2_2 @@ -1099,7 +1099,7 @@ Chart Type - + WPMRadio @@ -1107,7 +1107,7 @@ Words per minute - + CPMRadio @@ -1115,7 +1115,7 @@ Characters per minute - + correctRadio @@ -1123,7 +1123,7 @@ Correctness - + skillRadio @@ -1133,7 +1133,7 @@ - + buttonGroup3 @@ -1150,7 +1150,7 @@ 0 - + textLabel3_2 @@ -1163,7 +1163,7 @@ Time Axis Scaling - + timeRadio @@ -1171,7 +1171,7 @@ Time scaled - + eventRadio @@ -1189,7 +1189,7 @@ Expanding - + 20 20 @@ -1203,9 +1203,9 @@ - + - layout6 + tqlayout6 @@ -1232,7 +1232,7 @@ Expanding - + 40 20 @@ -1277,7 +1277,7 @@ 89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af4000005bc494441545885b596416823d719c77f0e0a8c0e0b12b860810533a0057bd88035642133908087e4a29ea2b087684fb1c9253db57b6b4ba125c9a15d07127613ca3a7bc93a812e524f514a4b9f601b3f85763d0e6d7676a1c623b0f00c8989442ca281085e0e23c9abeccab10dd1e5cfa7ff7fbef7f17fdffbde9b9152729a9ff3c7b2e249601e683f84df01518c7cab3e739a7c4f9c76f1e5175cd45f42767f2f27f0da1fae41ea34d9ce500003b86c97a10fc63963022b4f9560f053178046bd558734888e98c00f831aa0fdc4050cc0d61d36bedac0c81a63fcedfdd779bf179ec981999336a1f3ebb262a0b1fc2b93d75ffc0d624fd09d8d119f49c24c4cf77e4cfc5e07882106f94eed44cd78620734ad84fe4a96f8e90e6bff5b030dea77ebc4f3314431994517ede52cdacb39e8c5274d7bf2be8d6341743b4dfa1c68cf77a8b56a68058dce4e8ca643bc23a00df15f4378d03d7101277640bef9e18cf8ddfb33c1bb45d29fe4585d588528a654709385ff0ff1ed101e4448294f3c0b4e75726dc7517d60b53547358ac9bd92a3f185a0fb51cceaed80abbd98e6291687a103eb37d6d55cacaba59eadec595bf57b4ad9b3f651dcedabddc6be626e0ee4d75c7ee31a57e7aee0ffa98fd62873ed992b5cfdfb3ebcbd8efd9cab36ffe54d7eff50bea5595b6d363695e3382ab1564a565e7d4d6dca2da5be566aebdf09def3ee25f110d7ff7c4ba94b2b6acbdb52eacba16ef707fa7da5fe79a1a8befdeff0bb7d95e87f90ef5b5f29fb695b49298f7ac02958c82f2456c682cfc12c98f8918f55302102d77091c458058bfedd3eb9410eb123b0162c8812bd17f9b8291722b0e64daa8d2a967ec48ff3b58f36ff0948e697d7f6710a0e1f3ff818162088024cdd248802d041ec099c94461005a40b69bcae87bbe08ef9200ab0741381205d003ff271175dfcb63fe647f9d2058807c3a39a6cc18a52df28a57695524aa97b7e82a358ed2ab57f675fa94b9547fe9f405f29b564abcd3b5bc7ea36ef6ca92bcf5c39da020d0dbf1d8001e15e88b998e028c6001148483dfaff04164010e3e8d6b13a47b7900379b4053160160c082197cf3d16ddf30e92e97c2e9f4b7a85a4077e4cf7480f84510839e81ff61f8bb5ed3ace603adf3fec431e0402e67f44a71ff5402a712026d3cd50fdac8a356b210291747d20710c07bfe763e78ad0af430b36b63770f2ce981781a0b458421c087e0e543fade2165c6adbb5313fca572a96a8efd493d332728001d477ea94164af8b14fe562053ff6295f2ce3c73ece9c43fd7e1d7a1d444b502e9627f8cac50a5ed7c39977905188756821db72821fe9655b621d5ad4bb7560781dafdf5857cebc8377e0e1ea2ea225707407d99238f30ea22558fc6a91dcce4d4ab3650492d200825e17139b6ae63e2e207a5d8c94cbdaf990d24209d112b8ba8b6ccb713e5777b9d9b849fd6f75a4943353df03b73eb8a5aefff23a5ed7c39ab7f0da93281e48363ed8c05ab2f8c5a5d547f8116efca3caf5f7d6587b6bedb177c4d4dbb074e125e8825518262b587090c4fe818f7bc1219bc95259aee01ff85873c9c41bf123fd65fb25346dfa536d6a018d9648cef5e7024333f0a364a2f9918fa92763d5c646b69b98ba49f56e150a933c3ac8c89bbaf8b1052ceb2e7e04aeeea2451aa66e8e67fa089b3471f5e4dc97164af82d7f82274aee98e3de8ac73a6016202024fd429a200ae13c04ed214621a4a01949380f91d6c57cca3ce287e8b5bd635f1dc738604304869183bd2938887175673abf47721b9ecd8126e4210c3b9087ce101f8eedd432b22da7f2e4939e38bb0321e47259e84076880fc7cd4183e26c110e1fcf7308e69c79ac03536b6bb41a38070eb54f6ad8039bc6a0c1726a99e6a089abb9f83ff301a86dd7707b2eb5ffd4c6bc9d4af4e54c192f7dc61e28668a881d41e56285201fb0f2ec0a413ea0f26c053f978ce7ce4107e349032ff226f891de3be761680651144d2d60ea245cbfb1aea270fa870c407c2a282e15c966b25365e141c8f6ddeda94ff5ef018e80fecc25cb29330000000049454e44ae426082 - + kcombobox.h ktouchchartwidget.h diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index 08fdff35..b58802fd 100644 --- a/ktouch/src/ktouchstatisticsdata.cpp +++ b/ktouch/src/ktouchstatisticsdata.cpp @@ -41,7 +41,7 @@ int KTouchCharStats::missHitRatio() const { // ---------------------------------------------------------------------------- TQTextStream& operator<<(TQTextStream &out, const KTouchCharStats &ch) { - return (out << ch.m_char.unicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); + return (out << ch.m_char.tqunicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); } // ---------------------------------------------------------------------------- @@ -98,7 +98,7 @@ bool KTouchLevelStats::read(TQDomNode in) { n = in.namedItem("Time"); if (!n.isNull()) { TQString timestring = n.firstChild().nodeValue(); - if (timestring != TQString::null) + if (timestring != TQString()) m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate); } // read characters @@ -135,10 +135,10 @@ void KTouchLevelStats::write(TQDomDocument& doc, TQDomElement& root) const { level.appendChild(e); // add char stats TQString char_data; - // we append for each missed char the char-unicode and the counters + // we append for each missed char the char-tqunicode and the counters for (std::set::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it) - char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode()) - .arg(it->m_correctCount).arg(it->m_wrongCount); + char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode()) + .tqarg(it->m_correctCount).tqarg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); @@ -157,7 +157,7 @@ void KTouchLevelStats::addCorrectChar(TQChar key) { else ++(const_cast(*it).m_correctCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::find(). The non-const overload is missing and find() always + // implementation of set::tqfind(). The non-const overload is missing and tqfind() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -179,7 +179,7 @@ void KTouchLevelStats::addWrongChar(TQChar key) { else ++(const_cast(*it).m_wrongCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::find(). The non-const overload is missing and find() always + // implementation of set::tqfind(). The non-const overload is missing and tqfind() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -244,7 +244,7 @@ bool KTouchSessionStats::read(TQDomNode in) { n = in.namedItem("Time"); if (!n.isNull()) { TQString timestring = n.firstChild().nodeValue(); - if (timestring != TQString::null) + if (timestring != TQString()) m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate); } // read level numbers @@ -295,17 +295,17 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const { // add levels TQString level_nums; for (std::set::const_iterator it = m_levelNums.begin(); it != m_levelNums.end(); ++it) - level_nums += TQString( " %1").arg(*it); + level_nums += TQString( " %1").tqarg(*it); e = doc.createElement("LevelNums"); tn = doc.createTextNode(level_nums); e.appendChild(tn); session.appendChild(e); // add char data TQString char_data; - // we append for each missed char the char-unicode and the counters + // we append for each missed char the char-tqunicode and the counters for (std::set::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it) - char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode()) - .arg(it->m_correctCount).arg(it->m_wrongCount); + char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode()) + .tqarg(it->m_correctCount).tqarg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); @@ -324,7 +324,7 @@ void KTouchSessionStats::addCorrectChar(TQChar key) { else ++(const_cast(*it).m_correctCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::find(). The non-const overload is missing and find() always + // implementation of set::tqfind(). The non-const overload is missing and tqfind() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -346,7 +346,7 @@ void KTouchSessionStats::addWrongChar(TQChar key) { else ++(const_cast(*it).m_wrongCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::find(). The non-const overload is missing and find() always + // implementation of set::tqfind(). The non-const overload is missing and tqfind() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -357,8 +357,8 @@ void KTouchSessionStats::addWrongChar(TQChar key) { // *** KTouchLectureStats *** void KTouchLectureStats::clear() { - m_lectureTitle = TQString::null; - m_lectureURL = TQString::null; + m_lectureTitle = TQString(); + m_lectureURL = TQString(); m_levelStats.clear(); m_sessionStats.clear(); } @@ -464,7 +464,7 @@ bool KTouchStatisticsData::read(TQWidget * window, const KURL& url) { #ifdef COMPRESSED_XML_STATISTICS TQByteArray array; array = infile.readAll(); - array = qUncompress(array); + array = tqUncompress(array); doc.setContent( array ); #else doc.setContent( &infile ); @@ -503,7 +503,7 @@ bool KTouchStatisticsData::write(TQWidget * window, const KURL& url) const { TQByteArray array; TQTextStream out(array, IO_WriteOnly); out << doc.toString(); - array = qCompress(array); + array = tqCompress(array); outfile.writeBlock(array); #else TQTextStream out( &outfile ); diff --git a/ktouch/src/ktouchstatisticsdata.h b/ktouch/src/ktouchstatisticsdata.h index 15ab2f82..3ddbf941 100644 --- a/ktouch/src/ktouchstatisticsdata.h +++ b/ktouch/src/ktouchstatisticsdata.h @@ -113,7 +113,7 @@ class KTouchLevelStats { unsigned int m_words; ///< The number of typed words. unsigned int m_totalChars; ///< The total number of chars typed this level. unsigned int m_correctChars; ///< The total number of correctly typed chars. - QDateTime m_timeRecorded; ///< The time at which the level stats were recorded. + TQDateTime m_timeRecorded; ///< The time at which the level stats were recorded. }; @@ -148,7 +148,7 @@ class KTouchSessionStats { unsigned int m_words; ///< The number of typed words. unsigned int m_totalChars; ///< The total number of chars typed this session. unsigned int m_correctChars; ///< The total number of correctly typed chars. - QDateTime m_timeRecorded; ///< The time at which the session stats were recorded. + TQDateTime m_timeRecorded; ///< The time at which the session stats were recorded. }; @@ -171,7 +171,7 @@ class KTouchLectureStats { /// Writes the lecture statistics to the XML document. void write(TQDomDocument& doc, TQDomElement& root) const; - QString m_lectureTitle; ///< The descriptive title of the lecture. + TQString m_lectureTitle; ///< The descriptive title of the lecture. KURL m_lectureURL; ///< The descriptive title of the lecture. TQValueVector m_levelStats; ///< The statistics for all levels in this lecture. diff --git a/ktouch/src/ktouchstatus.cpp b/ktouch/src/ktouchstatus.cpp index 94d11894..9ca6a4f2 100644 --- a/ktouch/src/ktouchstatus.cpp +++ b/ktouch/src/ktouchstatus.cpp @@ -20,13 +20,13 @@ #include #include "prefs.h" -KTouchStatus::KTouchStatus(TQWidget *parent) - : KTouchStatusLayout(parent) +KTouchtqStatus::KTouchtqStatus(TQWidget *tqparent) + : KTouchStatusLayout(tqparent) { applyPreferences(); } -void KTouchStatus::applyPreferences() { +void KTouchtqStatus::applyPreferences() { if (Prefs::autoLevelChange()) { levelUpBtn->setEnabled( !Prefs::disableManualLevelChange() ); levelDownBtn->setEnabled( !Prefs::disableManualLevelChange() ); @@ -37,11 +37,11 @@ void KTouchStatus::applyPreferences() { } } -void KTouchStatus::setNewChars(const TQString& newChars) { +void KTouchtqStatus::setNewChars(const TQString& newChars) { newCharsLabel->setText(newChars); } -void KTouchStatus::updateStatus(unsigned int level, double correctness) { +void KTouchtqStatus::updatetqStatus(unsigned int level, double correctness) { levelLCD->display(static_cast(level)+1); // +1 because our level variable ranges from 0...n-1 correctnessBar->setProgress(static_cast(correctness*100) ); } diff --git a/ktouch/src/ktouchstatus.h b/ktouch/src/ktouchstatus.h index 72bb6acc..d44d91c4 100644 --- a/ktouch/src/ktouchstatus.h +++ b/ktouch/src/ktouchstatus.h @@ -22,20 +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 updateStatus() member function. + * using the updatetqStatus() member function. * The "new characters" string is set using the member function setNewChars(). */ -class KTouchStatus : public KTouchStatusLayout { +class KTouchtqStatus : public KTouchStatusLayout { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchStatus(TQWidget *parent); + KTouchtqStatus(TQWidget *tqparent); /// 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 updateStatus(unsigned int level, double correctness); + void updatetqStatus(unsigned int level, double correctness); }; #endif // KTOUCHSTATUS_H diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui index 80b29f9f..9041a07a 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -1,10 +1,10 @@ KTouchStatusLayout - + KTouchStatusLayout - + 0 0 @@ -24,7 +24,7 @@ unnamed - + GroupBox1 @@ -38,15 +38,15 @@ 2 - + - layout2 + tqlayout2 unnamed - + levelLCD @@ -58,7 +58,7 @@ 0 - + 0 30 @@ -83,19 +83,19 @@ This shows which level you are at. - + - layout2 + tqlayout2 unnamed - + levelUpBtn - + 20 20 @@ -108,11 +108,11 @@ + - + levelDownBtn - + 20 20 @@ -131,7 +131,7 @@ - + GroupBox11 @@ -160,18 +160,18 @@ Expanding - + 20 2 - + speedLCD - + 0 30 @@ -203,7 +203,7 @@ Expanding - + 20 2 @@ -212,7 +212,7 @@ - + GroupBox12 @@ -233,14 +233,14 @@ Expanding - + 20 2 - + correctnessBar @@ -261,7 +261,7 @@ Expanding - + 20 2 @@ -270,7 +270,7 @@ - + GroupBox4 @@ -291,14 +291,14 @@ Expanding - + 20 2 - + newCharsLabel @@ -321,7 +321,7 @@ true - + AlignCenter @@ -337,7 +337,7 @@ Expanding - + 20 2 @@ -348,13 +348,13 @@ - + levelForcedDown() levelForcedUp() showStatChanged(int) runningStateChanged(int) startKTouch() stopKTouch() - - + + diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp index 7ed140ca..b2e48277 100644 --- a/ktouch/src/ktouchtrainer.cpp +++ b/ktouch/src/ktouchtrainer.cpp @@ -31,7 +31,7 @@ #include "ktouchdefaults.h" #include "prefs.h" -KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture) +KTouchTrainer::KTouchTrainer(KTouchtqStatus *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->updateStatus(m_level, m_levelStats.correctness()); + m_statusWidget->updatetqStatus(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->updateStatus(m_level, 1); + m_statusWidget->updatetqStatus(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->updateStatus(m_level, m_levelStats.correctness()); + m_statusWidget->updatetqStatus(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->updateStatus(m_level, m_levelStats.correctness() ); + m_statusWidget->updatetqStatus(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::currentDateTime(); + m_levelStats.m_timeRecorded = TQDateTime::tqcurrentDateTime(); 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::currentDateTime(); + m_sessionStats.m_timeRecorded = TQDateTime::tqcurrentDateTime(); 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::currentDateTime(); + m_levelStats.m_timeRecorded = TQDateTime::tqcurrentDateTime(); 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->updateStatus(m_level, 1); + m_statusWidget->updatetqStatus(m_level, 1); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchtrainer.h b/ktouch/src/ktouchtrainer.h index f625d67b..4dba8ebc 100644 --- a/ktouch/src/ktouchtrainer.h +++ b/ktouch/src/ktouchtrainer.h @@ -23,7 +23,7 @@ class TQTimer; -class KTouchStatus; +class KTouchtqStatus; class KTouchSlideLine; class KTouchKeyboardWidget; class KTouchLecture; @@ -59,9 +59,10 @@ class KTouchLecture; /// is updated. class KTouchTrainer : public TQObject { Q_OBJECT + TQ_OBJECT public: /// Constructor. - KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture); + KTouchTrainer(KTouchtqStatus *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). @@ -148,7 +149,7 @@ class KTouchTrainer : public TQObject { /// right before a new level and new line is started). void statsChangeLevel(); - KTouchStatus *m_statusWidget; ///< Pointer to the status widget on top of the main window. + KTouchtqStatus *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/ktouch/src/ktouchutils.cpp b/ktouch/src/ktouchutils.cpp index a59dbfd9..26686a09 100644 --- a/ktouch/src/ktouchutils.cpp +++ b/ktouch/src/ktouchutils.cpp @@ -21,7 +21,7 @@ TQString format_speed(double speed) { unsigned int mins = static_cast(speed); unsigned int secs = static_cast(speed*60) - mins*60; - return TQString("%1' %2''").arg(mins).arg(secs); + return TQString("%1' %2''").tqarg(mins).tqarg(secs); } void sort_lists(TQStringList& text, TQStringList& data) { diff --git a/kturtle/TODO b/kturtle/TODO index f9da37cb..83c33dff 100644 --- a/kturtle/TODO +++ b/kturtle/TODO @@ -293,7 +293,7 @@ Im tryered of this... I can fix it; too much for me. Sorry in kdelibs/kdecore/kapp... : -url = QString("help:/%1?anchor=%2").arg(appname).arg(anchor); +url = QString("help:/%1?anchor=%2").tqarg(appname).tqarg(anchor); and DCOPRef( "khelpcenter", "KHelpCenterIface" ).send( "openUrl", url, startup_id ); diff --git a/kturtle/src/canvas.cpp b/kturtle/src/canvas.cpp index 38281956..e21ad4ea 100644 --- a/kturtle/src/canvas.cpp +++ b/kturtle/src/canvas.cpp @@ -18,7 +18,7 @@ // Note on this file: -// It contains 200 lines of code just to make sure very long line are drawn correctly +// It tqcontains 200 lines of code just to make sure very long line are drawn correctly // till a certain extent... Beyond that extent the code just cuts the crap, since use user // it then probably not doing anything usefull anymore; so he she will not notice the code // is cheating a bit in order to prevent CPU hogging. @@ -75,10 +75,10 @@ const double DEG2RAD = 3.14159265358979323846/180; // BEGIN public methods -Canvas::Canvas(TQWidget *parent, const char *name) : TQCanvasView(0, parent, name) +Canvas::Canvas(TQWidget *tqparent, const char *name) : TQCanvasView(0, tqparent, name) { // Create a new canvas for this view - canvas = new TQCanvas(parent); + canvas = new TQCanvas(TQT_TQOBJECT(tqparent)); canvas->setAdvancePeriod(250); // refresh-rate in [ms] // set initial values @@ -297,11 +297,11 @@ void Canvas::slotPrint(TQString text) void Canvas::slotFontType(TQString family, TQString extra) { font.setFamily(family); - font.setBold( extra.contains("bold") > 0 ); - font.setItalic( extra.contains("italic") > 0 ); - font.setUnderline( extra.contains("underline") > 0 ); - font.setOverline( extra.contains("overline") > 0 ); - font.setStrikeOut( extra.contains("strikeout") > 0 ); + font.setBold( extra.tqcontains("bold") > 0 ); + font.setItalic( extra.tqcontains("italic") > 0 ); + font.setUnderline( extra.tqcontains("underline") > 0 ); + font.setOverline( extra.tqcontains("overline") > 0 ); + font.setStrikeOut( extra.tqcontains("strikeout") > 0 ); } void Canvas::slotFontSize(int px) diff --git a/kturtle/src/canvas.h b/kturtle/src/canvas.h index 0dd5bb13..edda5f9d 100644 --- a/kturtle/src/canvas.h +++ b/kturtle/src/canvas.h @@ -22,12 +22,13 @@ #include -class Canvas : public QCanvasView +class Canvas : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: - Canvas(TQWidget *parent = 0, const char *name = 0); + Canvas(TQWidget *tqparent = 0, const char *name = 0); ~Canvas(); TQPixmap* canvas2Pixmap(); diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp index fcc6322d..9b693c1d 100644 --- a/kturtle/src/dialogs.cpp +++ b/kturtle/src/dialogs.cpp @@ -25,8 +25,8 @@ // BEGIN class ErrorMessage dialog -ErrorMessage::ErrorMessage (TQWidget *parent) - : KDialogBase (parent, "errorDialog", false, 0, KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true, i18n("Help on &Error") ) +ErrorMessage::ErrorMessage (TQWidget *tqparent) + : KDialogBase (tqparent, "errorDialog", false, 0, KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true, i18n("Help on &Error") ) { connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( showHelpOnError() ) ); connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( errorMessageHelp() ) ); @@ -140,8 +140,8 @@ void ErrorMessage::errorMessageHelp() // BEGIN class ColorPicker dialog -ColorPicker::ColorPicker(TQWidget *parent) - : KDialogBase(parent, "colorpicker", false, i18n("Color Picker"), KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true ) +ColorPicker::ColorPicker(TQWidget *tqparent) + : KDialogBase(tqparent, "colorpicker", false, i18n("Color Picker"), KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true ) { // connect to help connect( this, TQT_SIGNAL( helpClicked() ), TQT_SLOT( slotColorPickerHelp() ) ); @@ -149,7 +149,7 @@ ColorPicker::ColorPicker(TQWidget *parent) // for toggling convenience connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( slotEmitVisibility() ) ); - // Create the top level page and its layout + // Create the top level page and its tqlayout BaseWidget = new TQWidget(this); setMainWidget(BaseWidget); @@ -157,57 +157,57 @@ ColorPicker::ColorPicker(TQWidget *parent) setButtonText( KDialogBase::User1, i18n("Insert Color Code at Cursor") ); connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotEmitColorCode() ) ); - TQVBoxLayout *vlayout = new TQVBoxLayout(BaseWidget); + TQVBoxLayout *vtqlayout = new TQVBoxLayout(BaseWidget); - vlayout->addSpacing(5); // spacing on top + vtqlayout->addSpacing(5); // spacing on top // the palette and value selector go into a H-box - TQHBoxLayout *h1layout = new TQHBoxLayout(BaseWidget); - vlayout->addLayout(h1layout); + TQHBoxLayout *h1tqlayout = new TQHBoxLayout(BaseWidget); + vtqlayout->addLayout(h1tqlayout); - h1layout->addSpacing(10); // space on the left border + h1tqlayout->addSpacing(10); // space on the left border hsSelector = new KHSSelector(BaseWidget); // the color (SH) selector hsSelector->setMinimumSize(300, 150); - h1layout->addWidget(hsSelector); + h1tqlayout->addWidget(hsSelector); connect( hsSelector, TQT_SIGNAL( valueChanged(int, int) ), TQT_SLOT( slotSelectorChanged(int, int) ) ); - h1layout->addSpacing(5); // space in between + h1tqlayout->addSpacing(5); // space in between valuePal = new KValueSelector(BaseWidget); // the darkness (V) pal valuePal->setFixedWidth(30); - h1layout->addWidget(valuePal); + h1tqlayout->addWidget(valuePal); connect( valuePal, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotPalChanged(int) ) ); - vlayout->addSpacing(15); // space in between the top and the bottom widgets + vtqlayout->addSpacing(15); // space in between the top and the bottom widgets // the patch and the codegenerator also go into a H-box - TQHBoxLayout *h2layout = new TQHBoxLayout(BaseWidget); - vlayout->addLayout(h2layout); + TQHBoxLayout *h2tqlayout = new TQHBoxLayout(BaseWidget); + vtqlayout->addLayout(h2tqlayout); - h2layout->addSpacing(10); // space on the left border + h2tqlayout->addSpacing(10); // space on the left border patch = new KColorPatch(BaseWidget); // the patch (color previewer) patch->setFixedSize(50, 50); - h2layout->addWidget(patch); + h2tqlayout->addWidget(patch); - h2layout->addSpacing(10); // space in between + h2tqlayout->addSpacing(10); // space in between // the label and the codegenerator go in a V-box - TQVBoxLayout *v2layout = new TQVBoxLayout(BaseWidget); - h2layout->addLayout(v2layout); + TQVBoxLayout *v2tqlayout = new TQVBoxLayout(BaseWidget); + h2tqlayout->addLayout(v2tqlayout); copyable = new TQLabel(i18n("Color code:"), BaseWidget); // tha label - v2layout->addWidget(copyable); + v2tqlayout->addWidget(copyable); colorcode = new TQLineEdit(BaseWidget); // the code generator colorcode->setReadOnly(true); - v2layout->addWidget(colorcode); + v2tqlayout->addWidget(colorcode); connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) ); - h2layout->addSpacing(5); // spacing on the right border + h2tqlayout->addSpacing(5); // spacing on the right border - vlayout->addSpacing(10); // spacing on the bottom + vtqlayout->addSpacing(10); // spacing on the bottom h = g = b = 0; // start with red s = v = r = 255; @@ -228,7 +228,7 @@ void ColorPicker::updatePal() valuePal->setSaturation(s); valuePal->setValue(v); valuePal->updateContents(); - valuePal->repaint(false); + valuePal->tqrepaint(false); } void ColorPicker::updatePatch() @@ -239,7 +239,7 @@ void ColorPicker::updatePatch() void ColorPicker::updateColorCode() { color.getRgb(&r, &g, &b); - colorcode->setText( TQString("%1, %2, %3").arg(r).arg(g).arg(b) ); + colorcode->setText( TQString("%1, %2, %3").tqarg(r).tqarg(g).tqarg(b) ); colorcode->selectAll(); } @@ -297,8 +297,8 @@ void ColorPicker::slotColorPickerHelp() // BEGIN class RestartOrBack dialog -RestartOrBack::RestartOrBack (TQWidget *parent) - : KDialogBase (parent, "rbDialog", true, 0, KDialogBase::User1 | KDialogBase::User2, KDialogBase::User2, false, i18n("&Restart"), i18n("&Back") ) +RestartOrBack::RestartOrBack (TQWidget *tqparent) + : KDialogBase (tqparent, "rbDialog", true, 0, KDialogBase::User1 | KDialogBase::User2, KDialogBase::User2, false, i18n("&Restart"), i18n("&Back") ) { setPlainCaption( i18n("Finished Execution") ); setButtonWhatsThis( KDialogBase::User1, i18n("Click here to restart the current logo program.") ); diff --git a/kturtle/src/dialogs.h b/kturtle/src/dialogs.h index 0a421d49..f1b99a98 100644 --- a/kturtle/src/dialogs.h +++ b/kturtle/src/dialogs.h @@ -53,9 +53,10 @@ struct errorData class ErrorMessage : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ErrorMessage(TQWidget *parent); + ErrorMessage(TQWidget *tqparent); ~ErrorMessage() {} bool containsErrors(); @@ -97,9 +98,10 @@ class ErrorMessage : public KDialogBase class ColorPicker : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ColorPicker(TQWidget *parent); + ColorPicker(TQWidget *tqparent); virtual ~ColorPicker() {} @@ -117,9 +119,9 @@ class ColorPicker : public KDialogBase TQWidget *BaseWidget; KHSSelector *hsSelector; KValueSelector *valuePal; - TQVBoxLayout *vlayout; - TQHBoxLayout *h1layout; - TQHBoxLayout *h2layout; + TQVBoxLayout *vtqlayout; + TQHBoxLayout *h1tqlayout; + TQHBoxLayout *h2tqlayout; KColorPatch *patch; TQLabel *copyable; TQLineEdit *colorcode; @@ -149,9 +151,10 @@ class ColorPicker : public KDialogBase class RestartOrBack : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - RestartOrBack (TQWidget *parent); + RestartOrBack (TQWidget *tqparent); ~RestartOrBack() {} protected: diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp index e50c64a5..e71204b4 100644 --- a/kturtle/src/executer.cpp +++ b/kturtle/src/executer.cpp @@ -220,7 +220,7 @@ void Executer::execFunction(TreeNode* node) functable::iterator p = functionTable.find(funcname); if ( p == functionTable.end() ) { - emit ErrorMsg(node->getToken(), i18n("Call to undefined function: %1.").arg(funcname), 5010); + emit ErrorMsg(node->getToken(), i18n("Call to undefined function: %1.").tqarg(funcname), 5010); return; } @@ -231,7 +231,7 @@ void Executer::execFunction(TreeNode* node) // check if number of parameters match if ( callparams->size() != funcIds->size() ) { - emit ErrorMsg(node->getToken(), i18n("Call to function '%1' with wrong number of parameters.").arg(funcname), 5020); + emit ErrorMsg(node->getToken(), i18n("Call to function '%1' with wrong number of parameters.").tqarg(funcname), 5020); return; } @@ -274,7 +274,7 @@ void Executer::execRetFunction(TreeNode* node) execFunction(node); if (runStack.size() == 0) { - emit ErrorMsg(node->getToken(), i18n("Function %1 did not return a value.").arg( node->getLook() ), 5030); + emit ErrorMsg(node->getToken(), i18n("Function %1 did not return a value.").tqarg( node->getLook() ), 5030); return; } node->setValue( runStack.top() ); // set return val @@ -329,7 +329,7 @@ void Executer::execForEach(TreeNode* node) bBreak = false; - int i = expStr2.contains(expStr1, false); + int i = expStr2.tqcontains(expStr1, false); for ( ; i > 0; i-- ) { if (bAbort) return; @@ -839,7 +839,7 @@ void Executer::execFontSize(TreeNode* node) { int x = ROUND2INT( param1->getValue().Number() ); // pull the number value & round it to int if ( x < 0 || x > 350 ) - emit ErrorMsg(node->getToken(), i18n("The parameters of function %1 must be within range: 0 to 350.").arg( node->getLook() ), 5065); + emit ErrorMsg(node->getToken(), i18n("The parameters of function %1 must be within range: 0 to 350.").tqarg( node->getLook() ), 5065); else emit FontSize(x); } @@ -877,7 +877,7 @@ void Executer::execResizeCanvas(TreeNode* node) int x = ROUND2INT( nodeX->getValue().Number() ); // converting & rounding to int int y = ROUND2INT( nodeY->getValue().Number() ); if ( ( x < 1 || y < 1 ) || ( x > 10000 || y > 10000 ) ) - emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 1 to 10000.").arg( node->getLook() ), 7030); + emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 1 to 10000.").tqarg( node->getLook() ), 7030); else emit ResizeCanvas(x, y); } @@ -917,7 +917,7 @@ void Executer::execSetFgColor(TreeNode* node) int g = ROUND2INT( nodeG->getValue().Number() ); int b = ROUND2INT( nodeB->getValue().Number() ); if ( ( r < 0 || g < 0 || b < 0 ) || ( r > 255 || g > 255 || b > 255 ) ) - emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 0 to 255.").arg( node->getLook() ), 6090); + emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 0 to 255.").tqarg( node->getLook() ), 6090); else emit SetFgColor(r, g, b); } @@ -938,7 +938,7 @@ void Executer::execSetBgColor(TreeNode* node) int g = ROUND2INT( nodeG->getValue().Number() ); int b = ROUND2INT( nodeB->getValue().Number() ); if ( ( r < 0 || g < 0 || b < 0 ) || ( r > 255 || g > 255 || b > 255 ) ) - emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 0 to 255.").arg( node->getLook() ), 6090); + emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 0 to 255.").tqarg( node->getLook() ), 6090); else emit SetBgColor(r, g, b); } @@ -1056,7 +1056,7 @@ bool Executer::checkParameterQuantity(TreeNode* node, uint quantity, int errorCo if (quantity == 0) { if (node->size() == 0) return true; // thats easy! - emit ErrorMsg(node->getToken(), i18n("The %1 command accepts no parameters.").arg( node->getLook() ), errorCode); + emit ErrorMsg(node->getToken(), i18n("The %1 command accepts no parameters.").tqarg( node->getLook() ), errorCode); return false; } @@ -1068,11 +1068,11 @@ bool Executer::checkParameterQuantity(TreeNode* node, uint quantity, int errorCo { if (nodeSize < quantity) { - emit ErrorMsg(node->getToken(), i18n("The %1 command was called with %2 but needs 1 parameter.", "The %1 command was called with %2 but needs %n parameters.", quantity).arg( node->getLook() ).arg(nodeSize), errorCode); + emit ErrorMsg(node->getToken(), i18n("The %1 command was called with %2 but needs 1 parameter.", "The %1 command was called with %2 but needs %n parameters.", quantity).tqarg( node->getLook() ).tqarg(nodeSize), errorCode); } else { - emit ErrorMsg(node->getToken(), i18n("The %1 command was called with %2 but only accepts 1 parameter.", "The %1 command was called with %2 but only accepts %n parameters.", quantity).arg( node->getLook() ).arg(nodeSize), errorCode); + emit ErrorMsg(node->getToken(), i18n("The %1 command was called with %2 but only accepts 1 parameter.", "The %1 command was called with %2 but only accepts %n parameters.", quantity).tqarg( node->getLook() ).tqarg(nodeSize), errorCode); } return false; } @@ -1093,16 +1093,16 @@ bool Executer::checkParameterType(TreeNode* node, int valueType, int errorCode) { case stringValue: if (quantity == 1) - emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts a string as its parameter.").arg( node->getLook() ), errorCode); + emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts a string as its parameter.").tqarg( node->getLook() ), errorCode); else - emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts strings as its parameters.").arg( node->getLook() ), errorCode); + emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts strings as its parameters.").tqarg( node->getLook() ), errorCode); break; case numberValue: if (quantity == 1) - emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts a number as its parameter.").arg( node->getLook() ), errorCode); + emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts a number as its parameter.").tqarg( node->getLook() ), errorCode); else - emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts numbers as its parameters.").arg( node->getLook() ), errorCode); + emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts numbers as its parameters.").tqarg( node->getLook() ), errorCode); break; } return false; diff --git a/kturtle/src/executer.h b/kturtle/src/executer.h index d4ecdb77..ee410c0a 100644 --- a/kturtle/src/executer.h +++ b/kturtle/src/executer.h @@ -32,9 +32,10 @@ typedef map functable; typedef stack runstack; -class Executer : public QObject +class Executer : public TQObject { Q_OBJECT + TQ_OBJECT public: Executer(TreeNode*); diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index d90228a6..49f47d11 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -123,59 +123,59 @@ void MainWindow::setupActions() KActionCollection *ac = actionCollection(); // abbreviation // File actions - KStdAction::openNew(this, TQT_SLOT(slotNewFile()), ac); - openExAction = new KAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, this, TQT_SLOT(slotOpenExample()), ac, "open_examples"); - KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac); - m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpenFile(const KURL&)), ac); - KStdAction::save(this, TQT_SLOT(slotSaveFile()), ac); - KStdAction::saveAs(this, TQT_SLOT(slotSaveAs()), ac); - new KAction(i18n("Save &Canvas..."), 0, 0, this, TQT_SLOT(slotSaveCanvas()), ac, "save_canvas"); - speed = new KSelectAction(i18n("Execution Speed"), 0, ALT+Key_S, this, TQT_SLOT( slotChangeSpeed() ), ac, "speed"); + KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotNewFile()), ac); + openExAction = new KAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotOpenExample()), ac, "open_examples"); + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), ac); + m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile(const KURL&)), ac); + KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSaveFile()), ac); + KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac); + new KAction(i18n("Save &Canvas..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanvas()), ac, "save_canvas"); + speed = new KSelectAction(i18n("Execution Speed"), 0, ALT+Key_S, TQT_TQOBJECT(this), TQT_SLOT( slotChangeSpeed() ), ac, "speed"); TQStringList speeds; speeds << i18n("Full Speed") << i18n("Slow") << i18n("Slower") << i18n("Slowest"); speed->setItems(speeds); speed->setCurrentItem(0); - run = new KAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, this, TQT_SLOT( slotExecute() ), ac, "run"); - pause = new KToggleAction(i18n("Pause E&xecution"), "player_pause", Key_Pause, this, TQT_SLOT( slotPauseExecution() ), ac, "pause"); + run = new KAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotExecute() ), ac, "run"); + pause = new KToggleAction(i18n("Pause E&xecution"), "player_pause", Key_Pause, TQT_TQOBJECT(this), TQT_SLOT( slotPauseExecution() ), ac, "pause"); pause->setChecked(false); pause->setEnabled(false); - stop = new KAction(i18n("Stop E&xecution"), "stop", Key_Escape, this, TQT_SLOT( slotAbortExecution() ), ac, "stop"); + stop = new KAction(i18n("Stop E&xecution"), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotAbortExecution() ), ac, "stop"); stop->setEnabled(false); - KStdAction::print(this, TQT_SLOT(slotPrint()), ac); - KStdAction::quit(this, TQT_SLOT(close()), ac); + KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), ac); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac); // Edit actions - KStdAction::undo(this, TQT_SLOT(slotUndo()), ac); - KStdAction::redo(this, TQT_SLOT(slotRedo()), ac); - KStdAction::cut(this, TQT_SLOT(slotCut()), ac); - KStdAction::copy(this, TQT_SLOT(slotCopy()), ac); - KStdAction::paste(this, TQT_SLOT(slotPaste()), ac); - KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), ac); - KStdAction::deselect(this, TQT_SLOT(slotClearSelection()), ac); - new KToggleAction(i18n("Toggle Insert"), Key_Insert, this, TQT_SLOT(slotToggleInsert()), ac, "set_insert"); - KStdAction::find(this, TQT_SLOT(slotFind()), ac); - KStdAction::findNext(this, TQT_SLOT(slotFindNext()), ac); - KStdAction::findPrev(this, TQT_SLOT(slotFindPrevious()), ac); - KStdAction::replace(this, TQT_SLOT(slotReplace()), ac); + KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ac); + KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), ac); + KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac); + KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac); + KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac); + KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), ac); + KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), ac); + new KToggleAction(i18n("Toggle Insert"), Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotToggleInsert()), ac, "set_insert"); + KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotFind()), ac); + KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()), ac); + KStdAction::findPrev(TQT_TQOBJECT(this), TQT_SLOT(slotFindPrevious()), ac); + KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), ac); // View actions - new KToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, this, TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers"); - m_fullscreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullscreen()), ac, this, "full_screen"); + new KToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers"); + m_fullscreen = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotToggleFullscreen()), ac, this, "full_screen"); m_fullscreen->setChecked(b_fullscreen); // Tools actions - colorpicker = new KToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, this, TQT_SLOT(slotColorPicker()), ac, "color_picker"); - new KAction(i18n("&Indent"), "indent", CTRL+Key_I, this, TQT_SLOT(slotIndent()), ac, "edit_indent"); - new KAction(i18n("&Unindent"), "unindent", CTRL+SHIFT+Key_I, this, TQT_SLOT(slotUnIndent()), ac, "edit_unindent"); - new KAction(i18n("Cl&ean Indentation"), 0, 0, this, TQT_SLOT(slotCleanIndent()), ac, "edit_cleanIndent"); - new KAction(i18n("Co&mment"), 0, CTRL+Key_D, this, TQT_SLOT(slotComment()), ac, "edit_comment"); - new KAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, this, TQT_SLOT(slotUnComment()), ac, "edit_uncomment"); + colorpicker = new KToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotColorPicker()), ac, "color_picker"); + new KAction(i18n("&Indent"), "indent", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotIndent()), ac, "edit_indent"); + new KAction(i18n("&Unindent"), "unindent", CTRL+SHIFT+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotUnIndent()), ac, "edit_unindent"); + new KAction(i18n("Cl&ean Indentation"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanIndent()), ac, "edit_cleanIndent"); + new KAction(i18n("Co&mment"), 0, CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotComment()), ac, "edit_comment"); + new KAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotUnComment()), ac, "edit_uncomment"); // Settings actions - KStdAction::preferences( this, TQT_SLOT(slotSettings()), ac ); - new KAction(i18n("&Configure Editor..."), "configure", 0, this, TQT_SLOT(slotEditor()), ac, "set_confdlg"); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotSettings()), ac ); + new KAction(i18n("&Configure Editor..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditor()), ac, "set_confdlg"); // Help actions - ContextHelp = new KAction(0, 0, Key_F2, this, TQT_SLOT(slotContextHelp()), ac, "context_help"); + ContextHelp = new KAction(0, 0, Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotContextHelp()), ac, "context_help"); slotContextHelpUpdate(); // this sets the label of this action // other @@ -192,7 +192,7 @@ void MainWindow::setupEditor() editorDock->setResizeEnabled(true); editorDock->setFrameShape(TQFrame::ToolBarPanel); TQWhatsThis::add( editorDock, i18n( "This is the code editor, here you type the Logo commands to instruct the turtle. You can also open an existing Logo program with File->Open Examples... or File->Open." ) ); - moveDockWindow(editorDock, Qt::DockLeft); + moveDockWindow(editorDock, TQt::DockLeft); editor = doc->createView (editorDock, 0L); // editorInterface is the editor interface which allows us to access the text in the part editorInterface = dynamic_cast(doc); @@ -221,7 +221,7 @@ void MainWindow::setupStatusBar() // fill the statusbar slotStatusBar(i18n("Welcome to KTurtle..."), IDS_STATUS); // the message part - slotStatusBar(i18n("Line: %1 Column: %2").arg(1).arg(1), IDS_LINECOLUMN); + slotStatusBar(i18n("Line: %1 Column: %2").tqarg(1).tqarg(1), IDS_LINECOLUMN); slotStatusBar(i18n("INS"), IDS_INS); } @@ -247,7 +247,7 @@ void MainWindow::setupCanvas() void MainWindow::slotStatusBar(TQString text, int id) { - text = " " + text + " "; // help the layout + text = " " + text + " "; // help the tqlayout statusBar()->changeItem(text, id); } @@ -256,7 +256,7 @@ void MainWindow::slotCursorStatusBar() uint cursorLine; uint cursorCol; dynamic_cast(editor)->cursorPositionReal(&cursorLine, &cursorCol); - TQString linenumber = i18n(" Line: %1 Column: %2 ").arg(cursorLine + 1).arg(cursorCol + 1); + TQString linenumber = i18n(" Line: %1 Column: %2 ").tqarg(cursorLine + 1).tqarg(cursorCol + 1); statusBar()->changeItem(linenumber, IDS_LINECOLUMN); } @@ -330,7 +330,7 @@ void MainWindow::loadFile(const KURL &url) file.close(); m_recentFiles->addURL(url); setCaption( url.fileName() ); - slotStatusBar(i18n("Opened file: %1").arg( url.fileName() ), IDS_STATUS); + slotStatusBar(i18n("Opened file: %1").tqarg( url.fileName() ), IDS_STATUS); editor->document()->setModified(false); CurrentFile = url; return; @@ -338,7 +338,7 @@ void MainWindow::loadFile(const KURL &url) else { KMessageBox::error( this, - i18n("KTurtle was unable to open: \n%1.").arg( url.prettyURL() ), + i18n("KTurtle was unable to open: \n%1.").tqarg( url.prettyURL() ), i18n("Open Error") ); slotStatusBar(i18n("Opening aborted because of error."), IDS_STATUS); return; @@ -367,7 +367,7 @@ void MainWindow::slotSaveAs() { int result = KMessageBox::warningContinueCancel ( this, i18n("A program named \"%1\" already exists in this folder. " - "Do you want to overwrite it?").arg( url.fileName() ), + "Do you want to overwrite it?").tqarg( url.fileName() ), i18n("Overwrite?"), i18n("&Overwrite") ); if (result != KMessageBox::Continue) return; } @@ -384,7 +384,7 @@ void MainWindow::writeFile(const KURL &url) editor->document()->saveAs(url); // use the KateParts method for saving loadFile(url); // reload the file as utf8 otherwise display weird chars setCaption( url.fileName() ); - slotStatusBar(i18n("Saved to: %1").arg( url.fileName() ), IDS_STATUS); + slotStatusBar(i18n("Saved to: %1").tqarg( url.fileName() ), IDS_STATUS); m_recentFiles->addURL(url); editor->document()->setModified(false); CurrentFile = url; @@ -405,7 +405,7 @@ void MainWindow::slotSaveCanvas() { int result = KMessageBox::warningContinueCancel( this, i18n("A picture named \"%1\" already in this folder. " - "Do you want to overwrite it?").arg( url.fileName() ), + "Do you want to overwrite it?").tqarg( url.fileName() ), i18n("Overwrite?"), i18n("&Overwrite") ); if (result != KMessageBox::Continue) return; } @@ -428,12 +428,12 @@ void MainWindow::slotSaveCanvas() { kdWarning() << "KTurtle was unable to save the canvas drawing" << endl; KMessageBox::error(this, - i18n("KTurtle was unable to save the image to: \n%1.").arg( url.prettyURL() ), + i18n("KTurtle was unable to save the image to: \n%1.").tqarg( url.prettyURL() ), i18n("Unable to Save Image") ); slotStatusBar(i18n("Could not save image."), IDS_STATUS); return; } - slotStatusBar(i18n("Saved canvas to: %1").arg( url.fileName() ), IDS_STATUS); + slotStatusBar(i18n("Saved canvas to: %1").tqarg( url.fileName() ), IDS_STATUS); } @@ -650,7 +650,7 @@ void MainWindow::slotMessageDialog(TQString text) -// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, find, replace, linenumbers etc.) +// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, tqfind, tqreplace, linenumbers etc.) void MainWindow::slotEditor() { @@ -716,7 +716,7 @@ void MainWindow::slotClearSelection() void MainWindow::slotFind() { - KAction *a = editor->actionCollection()->action("edit_find"); + KAction *a = editor->actionCollection()->action("edit_tqfind"); a->activate(); } @@ -734,7 +734,7 @@ void MainWindow::slotFindPrevious() void MainWindow::slotReplace() { - KAction* a = editor->actionCollection()->action("edit_replace"); + KAction* a = editor->actionCollection()->action("edit_tqreplace"); a->activate(); } @@ -877,39 +877,39 @@ void MainWindow::slotSettings() TQGridLayout *generalLayout = new TQGridLayout( general, 1, 1, 11, 6, "generalLayout"); WidthHeightBox = new TQGroupBox( i18n("Initial Canvas Size"), general ); WidthHeightBox->setColumnLayout(0, Qt::Vertical ); - WidthHeightBox->layout()->setSpacing( 6 ); - WidthHeightBox->layout()->setMargin( 11 ); - TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->layout() ); - WidthHeightBoxLayout->setAlignment( Qt::AlignTop ); - TQHBoxLayout *layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); - TQVBoxLayout *layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); + WidthHeightBox->tqlayout()->setSpacing( 6 ); + WidthHeightBox->tqlayout()->setMargin( 11 ); + TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->tqlayout() ); + WidthHeightBoxLayout->tqsetAlignment( TQt::AlignTop ); + TQHBoxLayout *tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); + TQVBoxLayout *tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); - TQVBoxLayout *layout1 = new TQVBoxLayout( 0, 0, 6, "layout1"); + TQVBoxLayout *tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1"); kcfg_CanvasWidth = new KIntNumInput( WidthHeightBox, "kcfg_CanvasWidth" ); kcfg_CanvasWidth->setValue( 400 ); kcfg_CanvasWidth->setMinValue( 1 ); kcfg_CanvasWidth->setReferencePoint( 1 ); - layout1->addWidget( kcfg_CanvasWidth ); + tqlayout1->addWidget( kcfg_CanvasWidth ); kcfg_CanvasHeight = new KIntNumInput( WidthHeightBox, "kcfg_CanvasHeight" ); kcfg_CanvasHeight->setValue( 300 ); kcfg_CanvasHeight->setMinValue( 1 ); kcfg_CanvasHeight->setReferencePoint( 1 ); - layout1->addWidget( kcfg_CanvasHeight ); + tqlayout1->addWidget( kcfg_CanvasHeight ); WidthLabel = new TQLabel( kcfg_CanvasWidth, i18n("Canvas &width:"), WidthHeightBox ); - layout2->addWidget( WidthLabel ); + tqlayout2->addWidget( WidthLabel ); HeightLabel = new TQLabel( kcfg_CanvasHeight, i18n("Ca&nvas height:"), WidthHeightBox ); - layout2->addWidget( HeightLabel ); - layout3->addLayout( layout2 ); + tqlayout2->addWidget( HeightLabel ); + tqlayout3->addLayout( tqlayout2 ); - layout3->addLayout( layout1 ); - WidthHeightBoxLayout->addLayout( layout3 ); + tqlayout3->addLayout( tqlayout1 ); + WidthHeightBoxLayout->addLayout( tqlayout3 ); 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(minimumSizeHint()) ); + general->resize( TQSize(234, 109).expandedTo(tqminimumSizeHint()) ); dialog->addPage( general, i18n("General"), "package_settings", i18n("General Settings") ); @@ -918,12 +918,12 @@ void MainWindow::slotSettings() TQGridLayout *languageLayout = new TQGridLayout( language, 1, 1, 11, 6, "Form1Layout"); TQGroupBox *groupBox1 = new TQGroupBox( language, "groupBox1" ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->layout()->setSpacing( 6 ); - groupBox1->layout()->setMargin( 11 ); - TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->layout() ); - groupBox1Layout->setAlignment( Qt::AlignTop ); + groupBox1->tqlayout()->setSpacing( 6 ); + groupBox1->tqlayout()->setMargin( 11 ); + TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->tqlayout() ); + groupBox1Layout->tqsetAlignment( TQt::AlignTop ); - TQVBoxLayout *layout4 = new TQVBoxLayout( 0, 0, 6, "layout4"); + TQVBoxLayout *tqlayout4 = new TQVBoxLayout( 0, 0, 6, "tqlayout4"); kcfg_LanguageComboBox = new KComboBox(groupBox1, "kcfg_LanguageComboBox"); kcfg_LanguageComboBox->setEditable(false); @@ -935,13 +935,13 @@ void MainWindow::slotSettings() kcfg_LanguageComboBox->insertStringList(LogoLanguageList); LanguageLabel = new TQLabel(kcfg_LanguageComboBox, i18n("&Select the language for the Logo commands:"), groupBox1); - layout4->addWidget( LanguageLabel ); - layout4->addWidget( kcfg_LanguageComboBox ); + tqlayout4->addWidget( LanguageLabel ); + tqlayout4->addWidget( kcfg_LanguageComboBox ); LanguageLabel->setBuddy( kcfg_LanguageComboBox ); - groupBox1Layout->addLayout( layout4, 0, 0 ); + groupBox1Layout->addLayout( tqlayout4, 0, 0 ); languageLayout->addWidget( groupBox1, 0, 0 ); - language->resize( TQSize(373, 80).expandedTo(minimumSizeHint()) ); + language->resize( TQSize(373, 80).expandedTo(tqminimumSizeHint()) ); dialog->addPage( language, i18n("Language"), "locale", i18n("Language Settings") ); @@ -967,7 +967,7 @@ void MainWindow::slotUpdateSettings() // TODO maybe this language name can be more pretty by not using ".left(2)", ie "American English" would than be possible... [if this is possible this should be fixed at more places.] KConfig entry(locate("locale", "all_languages")); entry.setGroup(Settings::logoLanguage().left(2)); - slotStatusBar(i18n("Command language: %1").arg( entry.readEntry("Name") ), IDS_LANG); + slotStatusBar(i18n("Command language: %1").tqarg( entry.readEntry("Name") ), IDS_LANG); delete translate; // to update the currently used language translate = new Translate(); @@ -979,7 +979,7 @@ void MainWindow::readConfig(KConfig *config) m_recentFiles->loadEntries(config, "Recent Files"); KConfig entry(locate("locale", "all_languages")); entry.setGroup(Settings::logoLanguage().left(2)); - slotStatusBar(i18n("Command language: %1").arg( entry.readEntry("Name") ), IDS_LANG); + slotStatusBar(i18n("Command language: %1").tqarg( entry.readEntry("Name") ), IDS_LANG); } void MainWindow::slotSettingsHelp() @@ -1044,8 +1044,8 @@ void MainWindow::slotContextHelp() TQString help2statusBar; if ( helpKeyword.startsWith("<") ) help2statusBar = helpKeyword; - else help2statusBar = i18n("\"%1\"").arg(helpKeyword); - slotStatusBar(i18n("Displaying help on %1").arg(help2statusBar), IDS_STATUS); + else help2statusBar = i18n("\"%1\"").tqarg(helpKeyword); + slotStatusBar(i18n("Displaying help on %1").tqarg(help2statusBar), IDS_STATUS); } void MainWindow::slotContextHelpUpdate() @@ -1058,20 +1058,20 @@ void MainWindow::slotContextHelpUpdate() if ( line.stripWhiteSpace().startsWith("#") ) { helpKeyword = i18n(""); - ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) ); + ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) ); return; } if ( line.stripWhiteSpace().isEmpty() || line.mid(col-1,2).stripWhiteSpace().isEmpty() ) { helpKeyword = i18n(""); - ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) ); + ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) ); return; } int start, length, pos; pos = 0; - if ( line.contains('"') ) + if ( line.tqcontains('"') ) { TQRegExp delimitedStrings("(\"[^\"\\\\\\r\\n]*(\\\\.[^\"\\\\\\r\\n]*)*\")"); while ( delimitedStrings.search(line, pos) != -1 ) @@ -1082,7 +1082,7 @@ void MainWindow::slotContextHelpUpdate() if ( col >= (uint)start && col < (uint)(start+length) ) { helpKeyword = i18n(""); - ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) ); + ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) ); return; } pos += (length <= 0 ? 1 : length); @@ -1112,20 +1112,20 @@ void MainWindow::slotContextHelpUpdate() else if ( !translate->name2key( cursorWord.lower() ).isEmpty() ) helpKeyword = cursorWord; else if ( !translate->alias2key( cursorWord.lower() ).isEmpty() ) helpKeyword = cursorWord; - else if ( cursorWord.find( TQRegExp("[\\d.]+") ) == 0 ) helpKeyword = i18n(""); + else if ( cursorWord.tqfind( TQRegExp("[\\d.]+") ) == 0 ) helpKeyword = i18n(""); - else if ( cursorWord.find( TQRegExp("[+\\-*/\\(\\)]") ) == 0 ) helpKeyword = i18n(""); + else if ( cursorWord.tqfind( TQRegExp("[+\\-*/\\(\\)]") ) == 0 ) helpKeyword = i18n(""); else if ( cursorWord == TQString("=") ) helpKeyword = i18n(""); - else if ( cursorWord.find( TQRegExp("==|<|>|<=|>=|!=") ) == 0 ) helpKeyword = i18n(""); + else if ( cursorWord.tqfind( TQRegExp("==|<|>|<=|>=|!=") ) == 0 ) helpKeyword = i18n(""); // if we come here we either have an ID of some sort or an error // all we can do is try to catch some errors (TODO) and then... else helpKeyword = i18n(""); - ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) ); + ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) ); return; } pos += (length <= 0 ? 1 : length); // the pos had to be increased with at least one @@ -1133,7 +1133,7 @@ void MainWindow::slotContextHelpUpdate() // we allready cached some in the beginning of this method; yet its still needed as fall-through helpKeyword = i18n(""); - ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) ); + ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) ); } // END diff --git a/kturtle/src/kturtle.h b/kturtle/src/kturtle.h index 3e52215e..1282294f 100644 --- a/kturtle/src/kturtle.h +++ b/kturtle/src/kturtle.h @@ -46,6 +46,7 @@ class KRecentFilesAction; class MainWindow : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: MainWindow(KTextEditor::Document* = 0L); diff --git a/kturtle/src/kturtle.kcfg b/kturtle/src/kturtle.kcfg index 1dba5092..dd57013a 100644 --- a/kturtle/src/kturtle.kcfg +++ b/kturtle/src/kturtle.kcfg @@ -26,11 +26,11 @@ // We assume keyword and highlight files come in pairs (if not there will be no highlight style) - QStringList xmlFiles = KGlobal::dirs()->findAllResources("data", "kturtle/data/*.xml"); - QStringList LogoLanguageList; - QString xmlTranslationFiles; // for debug purposes - for ( QStringList::Iterator it = xmlFiles.begin(); it != xmlFiles.end(); ++it ) { - QString xmlFile(*it); + TQStringList xmlFiles = KGlobal::dirs()->findAllResources("data", "kturtle/data/*.xml"); + TQStringList LogoLanguageList; + TQString xmlTranslationFiles; // for debug purposes + for ( TQStringList::Iterator it = xmlFiles.begin(); it != xmlFiles.end(); ++it ) { + TQString xmlFile(*it); xmlTranslationFiles += xmlFile.section('.', -2, -2).append(", "); // for debug purposes // build list of language codes (en_US, nl, etc.) LogoLanguageList += xmlFile.section('.', -2, -2); @@ -54,13 +54,13 @@ // Get the desktops language KConfigBase *globalConf = KGlobal::config(); globalConf->setGroup("Locale"); - QString desktopLanguage = globalConf->readEntry("Language"); + TQString desktopLanguage = globalConf->readEntry("Language"); kdDebug(0) << "desktopLanguage: "<< desktopLanguage <<endl; - QString defaultLanguage = "en_US"; // init to the fall back value + TQString defaultLanguage = "en_US"; // init to the fall back value int itemCount = 0; // for the LanguageComboBox - for (QStringList::Iterator it = LogoLanguageList.begin(); it != LogoLanguageList.end(); ++it ) { - QString testLanguage(*it); + for (TQStringList::Iterator it = LogoLanguageList.begin(); it != LogoLanguageList.end(); ++it ) { + TQString testLanguage(*it); if (testLanguage == desktopLanguage) { // exact match defaultLanguage = testLanguage; break; diff --git a/kturtle/src/parser.cpp b/kturtle/src/parser.cpp index 07a33aea..64d83cb0 100644 --- a/kturtle/src/parser.cpp +++ b/kturtle/src/parser.cpp @@ -94,7 +94,7 @@ void Parser::matchToken(int expectedToken) switch (expectedToken) { case tokEOL: - Error(currentToken, i18n("Unexpected intruction after the '%1' command, please use only one instruction per line").arg(preservedToken.look), 1010); + Error(currentToken, i18n("Unexpected intruction after the '%1' command, please use only one instruction per line").tqarg(preservedToken.look), 1010); break; case tokBegin: @@ -102,23 +102,23 @@ void Parser::matchToken(int expectedToken) break; case tokTo: - Error(currentToken, i18n("Expected 'to' after the '%1' command").arg(preservedToken.look), 1010); + Error(currentToken, i18n("Expected 'to' after the '%1' command").tqarg(preservedToken.look), 1010); break; case tokAssign: - Error(currentToken, i18n("Expected '=' after the '%1' command").arg(preservedToken.look), 1010); + Error(currentToken, i18n("Expected '=' after the '%1' command").tqarg(preservedToken.look), 1010); break; case tokEnd: - Error(currentToken, i18n("Expected ']' after the '%1' command").arg(preservedToken.look), 1010); + Error(currentToken, i18n("Expected ']' after the '%1' command").tqarg(preservedToken.look), 1010); break; case tokUnknown: - Error(preservedToken, i18n("Expected a name after the '%1' command").arg(preservedToken.look), 1010); + Error(preservedToken, i18n("Expected a name after the '%1' command").tqarg(preservedToken.look), 1010); break; default: - Error(currentToken, i18n("UNDEFINED ERROR NR %1: please send this Logo script to the KTurtle developers").arg(expectedToken), 1010); + Error(currentToken, i18n("UNDEFINED ERROR NR %1: please send this Logo script to the KTurtle developers").tqarg(expectedToken), 1010); break; } } @@ -188,7 +188,7 @@ TreeNode* Parser::Factor() case tokUnknown: node = getId(); - if (learnedFunctionList.contains(rememberedToken.look) > 0) // is function call + if (learnedFunctionList.tqcontains(rememberedToken.look) > 0) // is function call { delete node; node = FunctionCall(rememberedToken); @@ -241,12 +241,12 @@ TreeNode* Parser::Factor() TQString s = currentToken.look; if ( s.isEmpty() || currentToken.type == tokEOF ) { - Error(currentToken, i18n("INTERNAL ERROR NR %1: please sent this Logo script to KTurtle developers").arg(1), 1020); + Error(currentToken, i18n("INTERNAL ERROR NR %1: please sent this Logo script to KTurtle developers").tqarg(1), 1020); // if this error occurs the see the Parser::Repeat for the good solution using 'preservedToken' } else { - Error(currentToken, i18n("Cannot understand '%1', expected an expression after the '%2' command").arg(s).arg(preservedToken.look), 1020); + Error(currentToken, i18n("Cannot understand '%1', expected an expression after the '%2' command").tqarg(s).tqarg(preservedToken.look), 1020); } node = new TreeNode(currentToken, Unknown); getToken(); @@ -538,7 +538,7 @@ TreeNode* Parser::Statement() } if (currentToken.type != tokEnd) { - Error(currentToken, i18n("Cannot understand '%1'").arg(currentToken.look), 1060); + Error(currentToken, i18n("Cannot understand '%1'").tqarg(currentToken.look), 1060); } getToken(); @@ -1057,7 +1057,7 @@ TreeNode* Parser::Other() matchToken(tokUnknown); if (currentToken.type == tokAssign) return Assignment(rememberedToken); - else if (learnedFunctionList.contains(rememberedToken.look) > 0) + else if (learnedFunctionList.tqcontains(rememberedToken.look) > 0) { TreeNode* node; node = FunctionCall(rememberedToken); @@ -1065,7 +1065,7 @@ TreeNode* Parser::Other() return node; } - Error(rememberedToken, i18n("'%1' is neither a Logo command nor a learned command.").arg(rememberedToken.look), 1020); + Error(rememberedToken, i18n("'%1' is neither a Logo command nor a learned command.").tqarg(rememberedToken.look), 1020); TreeNode* errNode = new TreeNode(rememberedToken, Unknown); // skip the rest of the line diff --git a/kturtle/src/parser.h b/kturtle/src/parser.h index 68836221..c6948a7d 100644 --- a/kturtle/src/parser.h +++ b/kturtle/src/parser.h @@ -26,9 +26,10 @@ #include "treenode.h" -class Parser : public QObject +class Parser : public TQObject { Q_OBJECT + TQ_OBJECT public: Parser(TQTextIStream& in); diff --git a/kturtle/src/translate.cpp b/kturtle/src/translate.cpp index 10ad2b07..06e874a5 100644 --- a/kturtle/src/translate.cpp +++ b/kturtle/src/translate.cpp @@ -38,7 +38,7 @@ TQString Translate::name2fuzzy(const TQString &name) { if ( !aliasMap[name].isEmpty() ) // translate the alias if any { - return TQString( i18n("'%1' (%2)").arg(keyMap[name]).arg(reverseAliasMap[name]) ); + return TQString( i18n("'%1' (%2)").tqarg(keyMap[name]).tqarg(reverseAliasMap[name]) ); } return TQString( "'" + keyMap[name] + "'"); } diff --git a/kturtle/src/treenode.cpp b/kturtle/src/treenode.cpp index 0b5619a5..f294a8a8 100644 --- a/kturtle/src/treenode.cpp +++ b/kturtle/src/treenode.cpp @@ -58,7 +58,7 @@ TreeNode::~TreeNode() void TreeNode::init() { clear(); - parent = NULL; + tqparent = NULL; // fTok.look (TQString) and fTok.value (Value) are properly init'ed when constructed fTok.start.row = 0; fTok.start.col = 0; @@ -77,23 +77,23 @@ void TreeNode::appendChild(TreeNode* node) void TreeNode::appendSibling(TreeNode* node) { - node->parent = parent; - if (parent != NULL) parent->push_back(node); + node->tqparent = tqparent; + if (tqparent != NULL) tqparent->push_back(node); } TreeNode* TreeNode::nextSibling() { - if (parent) + if (tqparent) { TreeNode::iterator i = lookup(); - if ( i != parent->end() ) + if ( i != tqparent->end() ) { ++i; // Must check after i has been incremented // to make sure i isn't at the end before // returning the contained pointer value. - if ( i != parent->end() ) return *i; + if ( i != tqparent->end() ) return *i; } } return NULL; @@ -101,13 +101,13 @@ TreeNode* TreeNode::nextSibling() TreeNode* TreeNode::prevSibling() { - if (parent) + if (tqparent) { TreeNode::iterator i = lookup(); // Must make sure we aren't at beginning as well // or we can crash when decrementing since we shouldn't // decrement before the start of the list. - if ( ( i != parent->end() ) && ( i != parent->begin() ) ) + if ( ( i != tqparent->end() ) && ( i != tqparent->begin() ) ) { --i; return *i; @@ -184,10 +184,10 @@ TreeNode* TreeNode::lastChild() TreeNode::iterator TreeNode::lookup() { - if (parent != NULL) + if (tqparent != NULL) { - TreeNode::iterator i = parent->begin(); - while ( (*i != this) && (i != parent->end() ) ) ++i; + TreeNode::iterator i = tqparent->begin(); + while ( (*i != this) && (i != tqparent->end() ) ) ++i; return i; } return end(); @@ -201,7 +201,7 @@ TreeNode& TreeNode::operator= (const TreeNode& t) { fType = t.fType; fTok = t.fTok; - parent = t.parent; + tqparent = t.tqparent; clear(); for (TreeNode::const_iterator i = t.begin(); i != t.end(); ++i) @@ -248,7 +248,7 @@ void TreeNode::destroy(TreeNode* node) for ( TreeNode::iterator i = node->begin(); i != node->end(); ++i ) { destroy(*i); - (*i)->clear(); //free children + (*i)->clear(); //free tqchildren //delete ( *i ); //free mem } } diff --git a/kturtle/src/treenode.h b/kturtle/src/treenode.h index f43260bf..95b15bd8 100644 --- a/kturtle/src/treenode.h +++ b/kturtle/src/treenode.h @@ -213,14 +213,14 @@ class TreeNode : public list /*, public Value <-- maybe oneday */ { public: TreeNode(); // used for creation of the first node called 'tree', in the contructor of the parser - TreeNode( TreeNode* ); // give parent + TreeNode( TreeNode* ); // give tqparent TreeNode( Token, NodeType = Unknown, TQString = TQString() ); virtual ~TreeNode(); void init(); void appendChild(TreeNode*); - void appendSibling(TreeNode*); // works only if it has parent set! + void appendSibling(TreeNode*); // works only if it has tqparent set! TreeNode* firstChild(); TreeNode* secondChild(); @@ -232,8 +232,8 @@ class TreeNode : public list /*, public Value <-- maybe oneday */ TreeNode* nextSibling(); TreeNode* prevSibling(); - void setParent(TreeNode* p) { parent = p; } - TreeNode* getParent() const { return parent; } + void setParent(TreeNode* p) { tqparent = p; } + TreeNode* getParent() const { return tqparent; } void setToken(Token t) { fTok = t; } Token& getToken() { return fTok; } @@ -254,7 +254,7 @@ class TreeNode : public list /*, public Value <-- maybe oneday */ uint getCol() const { return fTok.start.col; } bool hasChildren() const { return size() != 0; } - TreeNode::iterator lookup(); // gives location in parent list as iterator (used by prevSibling and nextSibling) + TreeNode::iterator lookup(); // gives location in tqparent list as iterator (used by prevSibling and nextSibling) TreeNode& operator=(const TreeNode&); @@ -270,7 +270,7 @@ class TreeNode : public list /*, public Value <-- maybe oneday */ protected: - TreeNode *parent; + TreeNode *tqparent; }; #endif // _TREENODE_H_ diff --git a/kverbos/kverbos/data/en/verbos.verbos b/kverbos/kverbos/data/en/verbos.verbos index 62bc04a6..4050476a 100644 --- a/kverbos/kverbos/data/en/verbos.verbos +++ b/kverbos/kverbos/data/en/verbos.verbos @@ -715,7 +715,7 @@ ducharse to take a shower 0 encontrar -to find +to tqfind 3 encontrarse to encounter, to meet diff --git a/kverbos/kverbos/kerfassen.cpp b/kverbos/kverbos/kerfassen.cpp index 9ae8c2b7..b937b89f 100644 --- a/kverbos/kverbos/kerfassen.cpp +++ b/kverbos/kverbos/kerfassen.cpp @@ -31,8 +31,8 @@ // Die Konstruktoren sollen sicherstellen, dass am Anfang die Karteikarten und // die Eingabefelder für Gerund und Partizip nicht aktiviert sind. // Das Dialogfeld in den Zustand nicht geändert versetzen. -KErfassen::KErfassen(spanishVerbList& l, int pos, TQWidget* parent, const char* name, bool modal, WFlags fl) -: QErfassen(parent, name, modal, fl), liste(l) +KErfassen::KErfassen(spanishVerbList& l, int pos, TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: QErfassen(tqparent, name, modal, fl), liste(l) { formEdit[0][0] = EditYo2_1; formEdit[1][0] = EditTu2_1; @@ -352,42 +352,42 @@ void KErfassen::slotNewVerb() void KErfassen::slotN() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) pl->insert("ñ"); } void KErfassen::slotA() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) pl->insert("á"); } void KErfassen::slotE() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) pl->insert("é"); } void KErfassen::slotI() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) pl->insert("í"); } void KErfassen::slotO() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) pl->insert("ó"); } void KErfassen::slotU() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) pl->insert("ú"); } diff --git a/kverbos/kverbos/kerfassen.h b/kverbos/kverbos/kerfassen.h index 47cc3551..7916d712 100644 --- a/kverbos/kverbos/kerfassen.h +++ b/kverbos/kverbos/kerfassen.h @@ -26,7 +26,7 @@ class TQLineEdit; -/** This class overloads the class QErfassen which was created with the Qt-designer. +/** This class overloads the class QErfassen which was created with the TQt-designer. * The dialog is used to edit existing verbs and to add new verbs. * *@author Arnold Kraschinski @@ -34,17 +34,17 @@ class TQLineEdit; class KErfassen : public QErfassen { public: - /** An die Dialogklasse wird ein Zeiger auf eine Verbliste übergeben, damit - * Verben in die Liste eingefügt werden können. Es wird auch ein Iterator übergeben, der + /** An die Dialogklasse wird ein Zeiger auf eine Verbliste �bergeben, damit + * Verben in die Liste eingef�gt werden k�nnen. Es wird auch ein Iterator �bergeben, der * anzeigt, wo mit dem editieren begonnen werden soll. */ - KErfassen(spanishVerbList& l, int pos = -1, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KErfassen(spanishVerbList& l, int pos = -1, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); /** der Destruktor */ virtual ~KErfassen(); - /** Gibt zurück, ob durch den Ablauf des Dialoges eine Änderung an der + /** Gibt zur�ck, ob durch den Ablauf des Dialoges eine �nderung an der * bearbeiteten Verbliste entstanden ist (list = true). - * Wird als Parameter false übergeben, erfährt man, ob das Fenster des Dialoges - * geändert wurde. + * Wird als Parameter false �bergeben, erf�hrt man, ob das Fenster des Dialoges + * ge�ndert wurde. */ bool wasChanged(); /** The dialog works on his own copy of the verblist. So after the end of the dialog @@ -64,36 +64,36 @@ private: * werden. */ void verbToWidget(); - /** Deaktiviert die Eingabefelder für die Gerund-Form und für das Partizip - * und die Karteikarten für die ganzen Formen. Außerdem wird der Radiobutton - * wieder auf den Ausgangszustand zurückgesetzt. + /** Deaktiviert die Eingabefelder f�r die Gerund-Form und f�r das Partizip + * und die Karteikarten f�r die ganzen Formen. Au�erdem wird der Radiobutton + * wieder auf den Ausgangszustand zur�ckgesetzt. */ void deaktivieren(); - /** Aktiviert die Eingabefelder für die Gerund-Form und für das Partizip - * und die Karteikarten für die ganzen Formen. Außerdem wird der Radiobutton + /** Aktiviert die Eingabefelder f�r die Gerund-Form und f�r das Partizip + * und die Karteikarten f�r die ganzen Formen. Au�erdem wird der Radiobutton * in den gesetzten Zustand gebracht. */ void aktivieren(); /** In dem Dialog sollen ein Teil der Eingabefelder oder aber alle - * Eingabefelder gelöscht werden. + * Eingabefelder gel�scht werden. */ void clearPage(int s); void clearAllPages(); void clearAll(); - /** Es wird geprüft, ob der Inhalt des Eingabefensters verändert wurde. + /** Es wird gepr�ft, ob der Inhalt des Eingabefensters ver�ndert wurde. */ bool widgetChanged(); public slots: /** Dieser Slot bearbeitet den Wechsel am RadioButtonIrregular - * Wird der Knopf ausgewählt, dann müssen alle Felder für die - * unregelmäßigen Formen aktiviert werden. - * Wird der Button gelöscht, dann müssen die Felder deaktiviert + * Wird der Knopf ausgew�hlt, dann m�ssen alle Felder f�r die + * unregelm��igen Formen aktiviert werden. + * Wird der Button gel�scht, dann m�ssen die Felder deaktiviert * werden. */ // virtual void slotToggleIrregular(bool b); virtual void slotTypChanged(int); - /** Die folgenden Slots werden von den einzelnen Löschen-Buttons des + /** Die folgenden Slots werden von den einzelnen L�schen-Buttons des * Dialoges aufgerufen. */ virtual void slotClearPage1(); @@ -105,16 +105,16 @@ public slots: virtual void slotClearPage7(); virtual void slotClearPage8(); virtual void slotClearAll(); - /** Wird aufgerufen, wenn der 'beenden'-Button gedrückt wurde. + /** Wird aufgerufen, wenn der 'beenden'-Button gedr�ckt wurde. */ virtual void slotDlgEnde(); /** Die Eingabe eines Verbes wurde abgeschlossen und es wurde der - * weiter Button gedrückt, um weitere Verben einzugeben. + * weiter Button gedr�ckt, um weitere Verben einzugeben. */ virtual void slotWeiter(); - /** Es wurde an einer Position in der Liste der zurück-Button betätigt. - * Das gerade eingegebene Verb muss in die Liste übernommen werden und der - * Positionszeiger in der Liste muss eine Position nach hinten rücken, falls + /** Es wurde an einer Position in der Liste der zur�ck-Button bet�tigt. + * Das gerade eingegebene Verb muss in die Liste �bernommen werden und der + * Positionszeiger in der Liste muss eine Position nach hinten r�cken, falls * es ein Verb weiter vorne in der Liste gibt. Dieses Verb muss eventuell in * den Dialog geladen werden. */ @@ -125,8 +125,8 @@ public slots: */ virtual void slotNewVerb(); /** Die folgenden Slots werden aufgerufen, wenn ein Button mit einem - * spanischen Sonderzeichen gedrückt wird. - * Das Zeichen wird dann dem Eingabefeld, das den Focus hat zugefügt. + * spanischen Sonderzeichen gedr�ckt wird. + * Das Zeichen wird dann dem Eingabefeld, das den Focus hat zugef�gt. */ virtual void slotN(); virtual void slotA(); @@ -139,7 +139,7 @@ private: /** Der Zeiger auf das Dokumenten-Objekt des Programmes. */ spanishVerbList liste; spanishVerbList::Iterator position; - /** changed zeigt an, ob etwas geändert wurde. */ + /** changed zeigt an, ob etwas ge�ndert wurde. */ bool changed; /** Are pointers to the GUI elements for an easier use */ TQLineEdit* formEdit[6][MAX_TIEMPOS]; diff --git a/kverbos/kverbos/kfeedercontrol.cpp b/kverbos/kverbos/kfeedercontrol.cpp index 8948a128..9a5ad2f1 100644 --- a/kverbos/kverbos/kfeedercontrol.cpp +++ b/kverbos/kverbos/kfeedercontrol.cpp @@ -58,7 +58,7 @@ bool KFeederControl::reset() if (active) { TQByteArray data; // "raw support" for data - QDataStream arg(data, IO_WriteOnly); // "container" provides + TQDataStream arg(data, IO_WriteOnly); // "container" provides // easy access to data int a_number = 1; arg << a_number; // put information on the @@ -78,7 +78,7 @@ bool KFeederControl::addOne() if (active) { TQByteArray data; // "raw support" for data - QDataStream arg(data, IO_WriteOnly); // "container" provides + TQDataStream arg(data, IO_WriteOnly); // "container" provides // easy access to data int a_number = 1; arg << a_number; // put information on the @@ -98,7 +98,7 @@ bool KFeederControl::addN(int n) if (active) { TQByteArray data; // "raw support" for data - QDataStream arg(data, IO_WriteOnly); // "container" provides + TQDataStream arg(data, IO_WriteOnly); // "container" provides // easy access to data int a_number = n; arg << a_number; // put information on the @@ -120,7 +120,7 @@ bool KFeederControl::setAutomatic(bool a) if (active) { TQByteArray data; // "raw support" for data - QDataStream arg(data, IO_WriteOnly); // "container" provides + TQDataStream arg(data, IO_WriteOnly); // "container" provides // easy access to data int num; if (a) diff --git a/kverbos/kverbos/kresult.cpp b/kverbos/kverbos/kresult.cpp index 2eb5b6c1..292dbe21 100644 --- a/kverbos/kverbos/kresult.cpp +++ b/kverbos/kverbos/kresult.cpp @@ -23,8 +23,8 @@ #include -KResult::KResult(KVerbosUser* pU, TQWidget* parent, const char* name, bool modal, WFlags fl ) -: QResult(parent, name, modal, fl) +KResult::KResult(KVerbosUser* pU, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) +: QResult(tqparent, name, modal, fl) { int sessions; TQString date[10]; diff --git a/kverbos/kverbos/kresult.h b/kverbos/kverbos/kresult.h index e4aee250..715c27ab 100644 --- a/kverbos/kverbos/kresult.h +++ b/kverbos/kverbos/kresult.h @@ -28,7 +28,7 @@ class KResult : public QResult { public: - KResult(KVerbosUser* pU, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KResult(KVerbosUser* pU, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~KResult(); public slots: /** Wird durch den OK-Button aufgerufen und beendet den Dialog. diff --git a/kverbos/kverbos/kstartuplogo.cpp b/kverbos/kverbos/kstartuplogo.cpp index b01088ec..b31050d0 100644 --- a/kverbos/kverbos/kstartuplogo.cpp +++ b/kverbos/kverbos/kstartuplogo.cpp @@ -20,8 +20,8 @@ #include #include -KStartupLogo::KStartupLogo(TQWidget * parent, const char *name) -: TQWidget(parent,name,WStyle_Customize | WStyle_NoBorder ) +KStartupLogo::KStartupLogo(TQWidget * tqparent, const char *name) +: TQWidget(tqparent,name,WStyle_Customize | WStyle_NoBorder ) { TQPixmap pm; pm.load(locate("appdata", "pics/startuplogo.png")); diff --git a/kverbos/kverbos/kstartuplogo.h b/kverbos/kverbos/kstartuplogo.h index c290cc0a..c83e7201 100644 --- a/kverbos/kverbos/kstartuplogo.h +++ b/kverbos/kverbos/kstartuplogo.h @@ -26,8 +26,9 @@ class KStartupLogo : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KStartupLogo(TQWidget *parent=0, const char *name=0); + KStartupLogo(TQWidget *tqparent=0, const char *name=0); ~KStartupLogo(); protected: virtual bool event(TQEvent*); diff --git a/kverbos/kverbos/kverbedit.cpp b/kverbos/kverbos/kverbedit.cpp index 7e7bcde8..c4b8c800 100644 --- a/kverbos/kverbos/kverbedit.cpp +++ b/kverbos/kverbos/kverbedit.cpp @@ -24,8 +24,8 @@ * die Liste der Verben bearbeitet werden kann. Zu Beginn mssen alle Verben * aus der Liste in eine dialogeigene Liste und die TQListView bertragen werden. */ -KVerbEdit::KVerbEdit(spanishVerbList& l, TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/) -: QVerbEdit(parent, name, modal, fl), list(l) +KVerbEdit::KVerbEdit(spanishVerbList& l, TQWidget* tqparent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/) +: QVerbEdit(tqparent, name, modal, fl), list(l) { // Die Spaltenbreiten anpassen ListView1->setColumnWidthMode(0, TQListView::Manual); diff --git a/kverbos/kverbos/kverbedit.h b/kverbos/kverbos/kverbedit.h index e3b84d56..d9dcd7f4 100644 --- a/kverbos/kverbos/kverbedit.h +++ b/kverbos/kverbos/kverbedit.h @@ -23,18 +23,18 @@ /** * In dieser Klasse geht es darum die Liste der Verben zu editieren, nicht - * gewünschte Eintragungen zu löschen, weitere Eintragungen zu ergänzen - * Änderungen an den Eintragungen vorzunehmen. + * gew�nschte Eintragungen zu l�schen, weitere Eintragungen zu erg�nzen + * �nderungen an den Eintragungen vorzunehmen. * *@author Arnold Kraschinski */ class KVerbEdit : public QVerbEdit { public: - /** An die Dialogklasse wird direkt die Verbliste übergeben, damit + /** An die Dialogklasse wird direkt die Verbliste �bergeben, damit * die Liste der Verben bearbeitet werden kann. */ - KVerbEdit(spanishVerbList& l, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KVerbEdit(spanishVerbList& l, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~KVerbEdit(); /** kopiert die Liste in die ListView. */ void listToView(); @@ -44,20 +44,20 @@ public: bool wasChanged() const { return changed; } public slots: - /** Wird durch den OK-Button aufgerufen und beendet den Dialog. Änderungen - * werden übernommen. + /** Wird durch den OK-Button aufgerufen und beendet den Dialog. �nderungen + * werden �bernommen. */ virtual void slotDlgEnde(); /** Wird durch den Cancel-Button aufgerufen und beendet den Dialog ohne - * Änderungen zu übernehmen. + * �nderungen zu �bernehmen. */ virtual void slotCancel(); - /** Ist ein Verb in der Listenansicht ausgewählt, dann wird der Dialog - * KErfassen mit diesem Verb gestartet, ansonsten leer. Es können neue - * Verben eingegeben werden oder alte verändert werden. + /** Ist ein Verb in der Listenansicht ausgew�hlt, dann wird der Dialog + * KErfassen mit diesem Verb gestartet, ansonsten leer. Es k�nnen neue + * Verben eingegeben werden oder alte ver�ndert werden. */ virtual void slotEditVerb(); - /** Das in der Listenansicht ausgewählte Verb wird gelöscht. */ + /** Das in der Listenansicht ausgew�hlte Verb wird gel�scht. */ virtual void slotDelete(); private: @@ -65,7 +65,7 @@ private: */ spanishVerbList list; /** zeigt an, ob der momentane Inhalt der Felder des Dialoges schon - * in die Liste aufgenommen wurde, das ist wichtig, um beim Schließen + * in die Liste aufgenommen wurde, das ist wichtig, um beim Schlie�en * keine Informationen zu verlieren. */ bool changed; diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp index 96d6930a..234e43a0 100644 --- a/kverbos/kverbos/kverbos.cpp +++ b/kverbos/kverbos/kverbos.cpp @@ -39,7 +39,7 @@ #include "kfeedercontrol.h" #include "prefs.h" -// ID Nummern für die Statuszeile +// ID Nummern f�r die Statuszeile #define ID_STATUS_MSG 1 #define ID_TRAINED_MSG 2 #define ID_CORRECT_MSG 3 @@ -55,7 +55,7 @@ KVerbosApp::KVerbosApp(TQWidget* , const char* name):KMainWindow (0, name) start_logo->show(); start_logo->raise(); - // die Instanzen von kverbos zählen + // die Instanzen von kverbos z�hlen kverbosCounter++; config=kapp->config(); @@ -82,7 +82,7 @@ KVerbosApp::KVerbosApp(TQWidget* , const char* name):KMainWindow (0, name) editPaste->setEnabled(false); userResults->setEnabled(false); - // El programa ha leído las opciones del programa. Entonces puedo iniciar el objeto + // El programa ha le�do las opciones del programa. Entonces puedo iniciar el objeto // por la control de KFeeder. if (useKFeeder) { @@ -98,17 +98,17 @@ KVerbosApp::KVerbosApp(TQWidget* , const char* name):KMainWindow (0, name) else kfeederControl = 0; - // das Logo wieder löschen + // das Logo wieder l�schen delete start_logo; } KVerbosApp::~KVerbosApp() { - // den Instanzenzähler zurücksetzen + // den Instanzenz�hler zur�cksetzen kverbosCounter--; if (kfeederControl) { - disconnect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int))); + disconnect(view, TQT_SIGNAL(informKFeeder(int)), TQT_TQOBJECT(this), TQT_SLOT(slotFeedIt(int))); delete kfeederControl; kfeederControl = 0; }; @@ -116,25 +116,25 @@ KVerbosApp::~KVerbosApp() void KVerbosApp::initActions() { - fileNewWindow = new KAction(i18n("New &Window"), "window_new.png", 0, this, TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window"); - fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileOpenStandard = new KAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, this, TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard"); - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); - fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); - fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); - editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); - editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); - editErfassen = new KAction(i18n("E&nter New Verb..."), 0, 0, this, TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen"); - editBearbeiten = new KAction(i18n("&Edit Verb List..."), 0, 0, this, TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten"); - - settingOptions = new KAction(i18n("&Configure KVerbos..."), 0, 0, this, TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options"); - userUsername = new KAction(i18n("&Username..."), 0, 0, this, TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username"); - userResults = new KAction(i18n("&Results"), 0, 0, this, TQT_SLOT(slotUserResults()), actionCollection(), "user_results"); + fileNewWindow = new KAction(i18n("New &Window"), "window_new.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window"); + fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); + fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenStandard = new KAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard"); + fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); + filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); + editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); + editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); + editErfassen = new KAction(i18n("E&nter New Verb..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen"); + editBearbeiten = new KAction(i18n("&Edit Verb List..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten"); + + settingOptions = new KAction(i18n("&Configure KVerbos..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options"); + userUsername = new KAction(i18n("&Username..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username"); + userResults = new KAction(i18n("&Results"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUserResults()), actionCollection(), "user_results"); fileNewWindow->setToolTip(i18n("Opens a new application window")); fileOpenStandard->setToolTip(i18n("Opens the standard KVerbos verb file")); @@ -182,8 +182,8 @@ void KVerbosApp::initDocument() { doc = new KVerbosDoc(this); doc->newDocument(); - connect(doc, TQT_SIGNAL(anzahlVerbenGeaendert(int)), this, TQT_SLOT(slotStatusVerbMsg(int))); - connect(this, TQT_SIGNAL(testAnzahl(int)), this, TQT_SLOT(slotStatusVerbMsg(int))); + connect(doc, TQT_SIGNAL(anzahlVerbenGeaendert(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusVerbMsg(int))); + connect(this, TQT_SIGNAL(testAnzahl(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusVerbMsg(int))); } void KVerbosApp::initView() @@ -197,9 +197,9 @@ void KVerbosApp::initView() setCentralWidget(view); setCaption(doc->URL().fileName(),false); // - connect(view, TQT_SIGNAL(numberTrainedChanged(int)), this, TQT_SLOT(slotStatusTrainedMsg(int))); - connect(view, TQT_SIGNAL(numberCorrectChanged(int)), this, TQT_SLOT(slotStatusCorrectMsg(int))); - connect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int))); + connect(view, TQT_SIGNAL(numberTrainedChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusTrainedMsg(int))); + connect(view, TQT_SIGNAL(numberCorrectChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusCorrectMsg(int))); + connect(view, TQT_SIGNAL(informKFeeder(int)), TQT_TQOBJECT(this), TQT_SLOT(slotFeedIt(int))); } void KVerbosApp::openDocumentFile(const KURL& url) @@ -222,7 +222,7 @@ void KVerbosApp::saveOptions() fileOpenRecent->saveEntries(config,"Recent Files"); // Meine eigenen Optionen - // Die zum Lernen ausgewählten Zeiten + // Die zum Lernen ausgew�hlten Zeiten config->setGroup("tiempos"); TQString key; for (int i = presente; iloadEntries(config,"Recent Files"); // Meine eigenen Optionen - // Die zum Lernen ausgewählten Zeiten + // Die zum Lernen ausgew�hlten Zeiten config->setGroup("tiempos"); TQString key; for (int i = presente; ireadEntry ( key, "true false false"); int pos1 = 0; - int pos2 = options.find (' ', pos1, false); + int pos2 = options.tqfind (' ', pos1, false); timeOptions[i][0] = (options.left(pos2) == "true") ? true : false; pos1 = pos2 + 1; - pos2 = options.find (' ', pos1, false); + pos2 = options.tqfind (' ', pos1, false); timeOptions[i][1] = (options.mid(pos1,pos2-pos1) == "true") ? true : false; timeOptions[i][2] = (options.right(options.length()-pos2-1) == "true") ? true : false; }; @@ -385,7 +385,7 @@ void KVerbosApp::slotFileOpen() } else { - KURL url=KFileDialog::getOpenURL(TQString::null, + KURL url=KFileDialog::getOpenURL(TQString(), i18n("*|All Files"), this, i18n("Open File")); if(!url.isEmpty()) { @@ -446,7 +446,7 @@ void KVerbosApp::slotFileSave() slotStatusMsg(i18n("Saving file...")); if (doc->URL().fileName() == i18n("Untitled")) { - // Hier liegt ein Fall vor, der zu "Save as ... " gehört. + // Hier liegt ein Fall vor, der zu "Save as ... " geh�rt. slotFileSaveAs(); } else @@ -553,7 +553,7 @@ void KVerbosApp::slotStatusVerbMsg(int n) statusBar()->changeItem(s, ID_VERBS_MSG); } -// Gibt die Anzahl der geübten Verben in der Statuszeile aus. +// Gibt die Anzahl der ge�bten Verben in der Statuszeile aus. void KVerbosApp::slotStatusTrainedMsg(int n) { TQString s; @@ -562,7 +562,7 @@ void KVerbosApp::slotStatusTrainedMsg(int n) statusBar()->changeItem(s, ID_TRAINED_MSG); } -// Gibt die Anzahl der richtig geübten Verben aus. +// Gibt die Anzahl der richtig ge�bten Verben aus. void KVerbosApp::slotStatusCorrectMsg(int n) { TQString s; @@ -571,7 +571,7 @@ void KVerbosApp::slotStatusCorrectMsg(int n) statusBar()->changeItem(s, ID_CORRECT_MSG); } -// öffnet einen Dialog mit dem neue Verben erfasst werden können. +// �ffnet einen Dialog mit dem neue Verben erfasst werden k�nnen. void KVerbosApp::slotEditErfassen() { spanishVerbList* pList = getDocument()->getList(); @@ -588,7 +588,7 @@ void KVerbosApp::slotEditErfassen() emit testAnzahl(doc->getAnzahl()); } -// öffnet einen Dialog mit dem die Verbliste bearbeitet werden kann. +// �ffnet einen Dialog mit dem die Verbliste bearbeitet werden kann. void KVerbosApp::slotEditBearbeiten() { KVerbEdit* pDlgEdit = new KVerbEdit(*(getDocument()->getList()), this, "edit the verbs", true); @@ -690,8 +690,8 @@ void KVerbosApp::slotSettingsOptions() correctStrict = pDlgEdit->RadioStrictCorr->isChecked(); // showKFeederSplash = pDlgEdit->CheckBoxSplash->isChecked(); - // testen ob die Art der Futteranimationen geändert werden soll. Diese soll nur geändert - // werden, wenn der KFeeder läuft und auch weiterhin laufen soll. + // testen ob die Art der Futteranimationen ge�ndert werden soll. Diese soll nur ge�ndert + // werden, wenn der KFeeder l�uft und auch weiterhin laufen soll. if ((automaticKFeeder != pDlgEdit->CheckBoxMode->isChecked()) && useKFeeder && (pDlgEdit->CheckBoxKFeeder->isChecked() == true)) @@ -699,7 +699,7 @@ void KVerbosApp::slotSettingsOptions() kfeederControl->setAutomatic(pDlgEdit->CheckBoxMode->isChecked()); }; automaticKFeeder = pDlgEdit->CheckBoxMode->isChecked(); - // prüfen, ob der KFeeder angehalten oder gestartet werden soll. + // pr�fen, ob der KFeeder angehalten oder gestartet werden soll. if ((pDlgEdit->CheckBoxKFeeder->isChecked() == true) && (!useKFeeder)) { // kfeeder starten @@ -710,7 +710,7 @@ void KVerbosApp::slotSettingsOptions() if ((pDlgEdit->CheckBoxKFeeder->isChecked() == false) && (useKFeeder)) { // kfeeder anhalten - disconnect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int))); + disconnect(view, TQT_SIGNAL(informKFeeder(int)), TQT_TQOBJECT(this), TQT_SLOT(slotFeedIt(int))); delete kfeederControl; kfeederControl = 0; }; @@ -731,7 +731,7 @@ void KVerbosApp::slotSettingsUsername() { bool ok; TQString n = KInputDialog::getText(i18n("Enter User Name"), i18n("Please enter your name:"), - TQString::null , &ok, this).simplifyWhiteSpace(); + TQString() , &ok, this).simplifyWhiteSpace(); if (ok) { statusBar()->changeItem(i18n("user: ") + n, ID_USERNAME_MSG); diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h index 982ee0c1..aced0440 100644 --- a/kverbos/kverbos/kverbos.h +++ b/kverbos/kverbos/kverbos.h @@ -23,7 +23,7 @@ #include #endif -// include files for Qt +// include files for TQt // include files for KDE #include @@ -57,13 +57,14 @@ class KFeederControl; class KVerbosApp : public KMainWindow { Q_OBJECT + TQ_OBJECT friend class KVerbosView; public: /** construtor of KVerbosApp, calls all init functions to create the application. */ - KVerbosApp(TQWidget* parent=0, const char* name=0); + KVerbosApp(TQWidget* tqparent=0, const char* name=0); ~KVerbosApp(); /** opens a file specified by commandline option */ @@ -78,7 +79,7 @@ class KVerbosApp : public KMainWindow bool doitStrict() const { return correctStrict; } protected: - /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration + /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration * file */ void saveOptions(); diff --git a/kverbos/kverbos/kverbos.kcfg b/kverbos/kverbos/kverbos.kcfg index c6ee326b..4da6bd36 100644 --- a/kverbos/kverbos/kverbos.kcfg +++ b/kverbos/kverbos/kverbos.kcfg @@ -10,7 +10,7 @@ KConfigBase *globalConf = KGlobal::config(); globalConf->setGroup("Locale"); - QString m_language = globalConf->readEntry("Language", "en"); + TQString m_language = globalConf->readEntry("Language", "en"); //keep only the first 2 characters m_language = m_language.left(2); kdDebug()<< m_language <<endl; diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp index 632f10b3..2fd68712 100644 --- a/kverbos/kverbos/kverbosdoc.cpp +++ b/kverbos/kverbos/kverbosdoc.cpp @@ -20,7 +20,7 @@ #include #include -// include files for Qt +// include files for TQt #include // include files for KDE @@ -39,7 +39,7 @@ TQPtrList *KVerbosDoc::pViewList = 0L; -KVerbosDoc::KVerbosDoc(TQWidget *parent, const char *name) : TQObject(parent, name) +KVerbosDoc::KVerbosDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name) { if(!pViewList) { @@ -92,7 +92,7 @@ void KVerbosDoc::slotUpdateAllViews(KVerbosView *sender) if(pViewList) for(w=pViewList->first(); w!=0; w=pViewList->next()) if(w!=sender) - w->repaint(); + w->tqrepaint(); } bool KVerbosDoc::saveModified() @@ -101,7 +101,7 @@ bool KVerbosDoc::saveModified() if(modified) { - KVerbosApp *win=(KVerbosApp *) parent(); + KVerbosApp *win=(KVerbosApp *) tqparent(); int want_save = KMessageBox::warningYesNoCancel(win, i18n("The current file has been modified.\nDo you want to save it?"), i18n("Warning"),KStdGuiItem::save(),KStdGuiItem::discard()); @@ -232,9 +232,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f) s = t.readLine(); if (s.left(9) == "', 22, true); + int a = s.tqfind('>', 22, true); a++; - int e = s.find('<', a, true); + int e = s.tqfind('<', a, true); v[count1] = s.mid(a, e-a); count1++; }; @@ -294,9 +294,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f) s = t.readLine(); if ((s.left(4) == "") && (s != "")) { - int a = s.find('>', 2, true); + int a = s.tqfind('>', 2, true); a++; - int e = s.find('<', a, true); + int e = s.tqfind('<', a, true); forms[count2] = s.mid(a, e-a); count2++; if (14 == count2) @@ -324,9 +324,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f) { // kommt ein Leerzeichen vor, muss man die Form aufteilen: In das // Reflexivpronomen und das eigentliche Verb - if (forms[i].find(' ') >= 0) + if (forms[i].tqfind(' ') >= 0) { - NewVerb.setForm(a, b, forms[i].right(forms[i].length()-forms[i].find(' ')-1)); + NewVerb.setForm(a, b, forms[i].right(forms[i].length()-forms[i].tqfind(' ')-1)); } else { @@ -344,9 +344,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f) int offs = 30; // kommt ein Leerzeichen vor, muss man die Form aufteilen: In das // Reflexivpronomen und das eigentliche Verb - if (forms[i+offs].find(' ') >= 0) + if (forms[i+offs].tqfind(' ') >= 0) { - NewVerb.setForm(a, b, forms[i+offs].right(forms[i+offs].length()-forms[i+offs].find(' ')-1)); + NewVerb.setForm(a, b, forms[i+offs].right(forms[i+offs].length()-forms[i+offs].tqfind(' ')-1)); } else { @@ -658,10 +658,10 @@ void KVerbosDoc::deleteContents() } // Ein Verb wird der Liste hinzugefügt. -void KVerbosDoc::appendVerb(const verbSpanish v, bool emitStatus /*= true*/) +void KVerbosDoc::appendVerb(const verbSpanish v, bool emittqStatus /*= true*/) { verbList2.append(v); - if (emitStatus) + if (emittqStatus) emit anzahlVerbenGeaendert(getAnzahl()); } @@ -689,7 +689,7 @@ TQString KVerbosDoc::getAuswahl(TQString s[][3], int &t) int ti[MAX_TIEMPOS*MAX_SUBTYPES], ty[MAX_TIEMPOS*MAX_SUBTYPES]; bool op[MAX_TIEMPOS][MAX_SUBTYPES]; int zeitenZahl = 0; - KVerbosApp *app = dynamic_cast(parent()); + KVerbosApp *app = dynamic_cast(tqparent()); if (app) { app->getTimeOptions(op); } diff --git a/kverbos/kverbos/kverbosdoc.h b/kverbos/kverbos/kverbosdoc.h index efe5d98c..b419c300 100644 --- a/kverbos/kverbos/kverbosdoc.h +++ b/kverbos/kverbos/kverbosdoc.h @@ -58,14 +58,15 @@ class KVerbosUser; * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 1.2 code generation */ -class KVerbosDoc : public QObject +class KVerbosDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor for the fileclass of the application */ - KVerbosDoc(TQWidget *parent, const char *name=0); + KVerbosDoc(TQWidget *tqparent, const char *name=0); /** * Destructor for the fileclass of the application */ @@ -113,10 +114,10 @@ class KVerbosDoc : public QObject const KURL& URL() const; /** sets the URL of the document */ void setURL(const KURL& url); - /** es wird ein Verb der Liste hinzugefügt, ist emitStatus = true, wird auch + /** es wird ein Verb der Liste hinzugefügt, ist emittqStatus = true, wird auch * die Statuszeile entsprechend angepasst. */ - void appendVerb(const verbSpanish v, bool emitStatus = true); + void appendVerb(const verbSpanish v, bool emittqStatus = true); /** prüft, ob die Liste des Dokumentes leer ist */ bool isEmpty() const; /** Gibt einen Zeiger auf die Verbliste des Dokumentes zurück */ @@ -140,8 +141,8 @@ class KVerbosDoc : public QObject public slots: /** - * calls repaint() on all views connected to the document object and is called by the view by which the document has been changed. - * As this view normally repaints itself, it is excluded from the paintEvent. + * calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed. + * As this view normally tqrepaints itself, it is excluded from the paintEvent. */ void slotUpdateAllViews(KVerbosView *sender); diff --git a/kverbos/kverbos/kverbosoptions.cpp b/kverbos/kverbos/kverbosoptions.cpp index 381e058b..c9b4ecaa 100644 --- a/kverbos/kverbos/kverbosoptions.cpp +++ b/kverbos/kverbos/kverbosoptions.cpp @@ -19,8 +19,8 @@ #include "tqcheckbox.h" #include "kverbosoptions.h" -KVerbosOptions::KVerbosOptions( TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/ ) -: QVerbosOptions(parent, name, modal, fl) +KVerbosOptions::KVerbosOptions( TQWidget* tqparent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/ ) +: QVerbosOptions(tqparent, name, modal, fl) { // some times are disabled because they aren't ready yet. LabelSubPasado->setEnabled(false); diff --git a/kverbos/kverbos/kverbosoptions.h b/kverbos/kverbos/kverbosoptions.h index 25fc91bf..5531e0c0 100644 --- a/kverbos/kverbos/kverbosoptions.h +++ b/kverbos/kverbos/kverbosoptions.h @@ -21,22 +21,22 @@ #include "qverbosoptions.h" /** Eine Klasse des KVerbos Projektes. Dadurch wird der Optionendialog bereitgestellt. - * In diesem Dialog können die Zeitstufen, die gelernt werden sollen ausgewählt werden. + * In diesem Dialog k�nnen die Zeitstufen, die gelernt werden sollen ausgew�hlt werden. *@author Arnold Kraschinski */ class KVerbosOptions : public QVerbosOptions { public: - KVerbosOptions( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KVerbosOptions( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~KVerbosOptions(); public slots: - /** Wird durch den OK-Button aufgerufen und beendet den Dialog. Änderungen - * werden übernommen. + /** Wird durch den OK-Button aufgerufen und beendet den Dialog. �nderungen + * werden �bernommen. */ virtual void slotDlgEnde(); /** Wird durch den Cancel-Button aufgerufen und beendet den Dialog ohne - * Änderungen zu übernehmen. + * �nderungen zu �bernehmen. */ virtual void slotCancel(); }; diff --git a/kverbos/kverbos/kverbosuser.cpp b/kverbos/kverbos/kverbosuser.cpp index 64d319af..4c485431 100644 --- a/kverbos/kverbos/kverbosuser.cpp +++ b/kverbos/kverbos/kverbosuser.cpp @@ -34,8 +34,8 @@ KVerbosUser::KVerbosUser(spanishVerbList* pL, TQString n/*=DEFAULTUSER*/) { // try to read the user-information if there is one. int pos; - while ((pos = n.find(' ')) != -1) - n.replace(pos, 1, "_"); + while ((pos = n.tqfind(' ')) != -1) + n.tqreplace(pos, 1, "_"); TQFile file(locateLocal("data", "/kverbos/data/"+name+".kverbos")); if ( file.open(IO_ReadOnly) ) { @@ -61,7 +61,7 @@ KVerbosUser::KVerbosUser(spanishVerbList* pL, TQString n/*=DEFAULTUSER*/) else e.counter = 0; e.used = false; - it = liste.find(e); + it = liste.tqfind(e); if (liste.end() == it) liste.append(e); }; @@ -97,7 +97,7 @@ void KVerbosUser::fillList(spanishVerbList* pL) elem.verb = (*it2).getSpanish(); elem.right = elem.wrong = elem.counter = elem.status = 0; elem.used = true; - it = liste.find(elem); + it = liste.tqfind(elem); if (liste.end() == it) liste.append(elem); else @@ -209,8 +209,8 @@ bool KVerbosUser::saveUser(const int& res, const int& num) if (name != DEFAULTUSER) { int pos; - while ((pos = name.find(' ')) != -1) - name.replace(pos, 1, "_"); + while ((pos = name.tqfind(' ')) != -1) + name.tqreplace(pos, 1, "_"); TQFile file(locateLocal("data", "/kverbos/data/"+name+".kverbos")); if ( file.open(IO_WriteOnly) ) { @@ -227,7 +227,7 @@ bool KVerbosUser::saveUser(const int& res, const int& num) }; if (j == 1) { - TQDate d = TQDate::currentDate(); + TQDate d = TQDate::tqcurrentDate(); t << d.toString() << endl; t << res << endl; t << num << endl; diff --git a/kverbos/kverbos/kverbosview.cpp b/kverbos/kverbos/kverbosview.cpp index 83f184df..62739c89 100644 --- a/kverbos/kverbos/kverbosview.cpp +++ b/kverbos/kverbos/kverbosview.cpp @@ -17,7 +17,7 @@ #include -// include files for Qt +// include files for TQt #include #include #include @@ -33,7 +33,7 @@ #include "verbspanish.h" -KVerbosView::KVerbosView(TQWidget *parent, const char *name) : QLernen/*TQWidget*/(parent, name) +KVerbosView::KVerbosView(TQWidget *tqparent, const char *name) : QLernen/*TQWidget*/(tqparent, name) { // Hier wird gesetzt, wie der Hintergrund des Fensters zu zeichnen ist. setBackgroundMode(PaletteBackground); @@ -78,7 +78,7 @@ KVerbosView::~KVerbosView() KVerbosDoc* KVerbosView::getDocument() const { - KVerbosApp *theApp=(KVerbosApp *) parentWidget(); + KVerbosApp *theApp=(KVerbosApp *) tqparentWidget(); return theApp->getDocument(); } @@ -102,12 +102,12 @@ TQString KVerbosView::deleteAccents(const TQString& s) const for (unsigned int i=0; i(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) { pl->insert("ñ"); @@ -124,7 +124,7 @@ void KVerbosView::slotN() void KVerbosView::slotA() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) { pl->insert("á"); @@ -133,7 +133,7 @@ void KVerbosView::slotA() void KVerbosView::slotE() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) { pl->insert("é"); @@ -142,7 +142,7 @@ void KVerbosView::slotE() void KVerbosView::slotI() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) { pl->insert("í"); @@ -151,7 +151,7 @@ void KVerbosView::slotI() void KVerbosView::slotO() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) { pl->insert("ó"); @@ -160,7 +160,7 @@ void KVerbosView::slotO() void KVerbosView::slotU() { - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (pl) { pl->insert("ú"); @@ -251,14 +251,14 @@ void KVerbosView::slotCorregir() TQPalette palette = EditVerbo->palette(); palette.setColor(TQColorGroup::Text, red); palette.setColor(TQColorGroup::Base, white); - if ( 0 > formen[6][1].find(EditAleman->text().simplifyWhiteSpace(), 0)) + if ( 0 > formen[6][1].tqfind(EditAleman->text().simplifyWhiteSpace(), 0)) { EditAleman->setFont(fontBold); EditAleman->setPalette(palette); richtig = false; }; // die Formen vergleichen - KVerbosApp* kApp = dynamic_cast(parent()); + KVerbosApp* kApp = dynamic_cast(tqparent()); if (!kApp) { return; } @@ -332,7 +332,7 @@ void KVerbosView::slotFont() if (corrected) { TQFont fontNormal = EditVerbo->font(); - TQLineEdit* pl = dynamic_cast(focusWidget()); + TQLineEdit* pl = dynamic_cast(tqfocusWidget()); if (0 != pl) { pl->setFont(fontNormal); @@ -350,7 +350,7 @@ void KVerbosView::slotCopyText() // erst prüfen, ob so eine Zeitform vorliegt. if (zeitAuswahl >= MAX_TIEMPOS) { - QString s = formEdit[0][2]->text(); + TQString s = formEdit[0][2]->text(); for (int i=1; i<6; i++) { formEdit[i][2]->setText(s); diff --git a/kverbos/kverbos/kverbosview.h b/kverbos/kverbos/kverbosview.h index 3690c72a..2f681ff6 100644 --- a/kverbos/kverbos/kverbosview.h +++ b/kverbos/kverbos/kverbosview.h @@ -22,13 +22,13 @@ #include #endif -// include files for Qt +// include files for TQt #include "qlernen.h" -// weitere include-Files für das Programm +// weitere include-Files f�r das Programm #include "kverbos.h" -// forward-Deklaration der Klasse. Während man die API-Dokumentation erstellt, +// forward-Deklaration der Klasse. W�hrend man die API-Dokumentation erstellt, // muss diese Zeile auskommentiert werden, weil sonst der falsche Text als Beschreibung // der Klasse erkannt wird. //class KVerbosDoc; @@ -38,21 +38,21 @@ * docuement-view model, it needs a reference to the document object connected with it by the KVerbosApp class to manipulate and display * the document structure provided by the KVerbosDoc class. * - * Diese Klasse soll folgende Funktionen erfüllen: - * - sie soll das momentan ausgewählte Verb vom Dokument holen. - * Diese Information enthält die spanische und deutsche Bedeutung des Verbes, die Zeit, die - * momentan getestet werden soll, und alle Verbformen, die zu dieser Zeit gehören. - * - die Klasse nimmt die Eingaben des Benutzers entgegen und prüft anschließend, ob die Ein- + * Diese Klasse soll folgende Funktionen erf�llen: + * - sie soll das momentan ausgew�hlte Verb vom Dokument holen. + * Diese Information enth�lt die spanische und deutsche Bedeutung des Verbes, die Zeit, die + * momentan getestet werden soll, und alle Verbformen, die zu dieser Zeit geh�ren. + * - die Klasse nimmt die Eingaben des Benutzers entgegen und pr�ft anschlie�end, ob die Ein- * gaben richtig sind. - * - Die Informationen, wie viele Verben richtig geübt und wie viele falsch geübt wurden, soll + * - Die Informationen, wie viele Verben richtig ge�bt und wie viele falsch ge�bt wurden, soll * direkt in dieser Klasse gespeichert werden und nicht im Dokument. * - Die Klasse meldet an das Dokument, wenn es Zeit ist sich ein neues Verb zu suchen. - * Das ist in folgenden Fällen nötig: + * Das ist in folgenden F�llen n�tig: * - wenn die Klasse zum ersten Mal gestartet wird und ein erstes Verb eingestellt werden * soll. * - wenn ein neues Dokument mit Verben geladen wird. * - wenn der Benutzer die Formen richtig eingegeben hat. - * - wenn ihm nichts mehr einfällt und er weiter will. + * - wenn ihm nichts mehr einf�llt und er weiter will. * * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 0.4 code generation @@ -60,13 +60,14 @@ class KVerbosView : public QLernen /*TQWidget*/ { Q_OBJECT + TQ_OBJECT public: /** Constructor for the main view */ - KVerbosView(TQWidget *parent = 0, const char *name=0); + KVerbosView(TQWidget *tqparent = 0, const char *name=0); /** Destructor for the main view */ ~KVerbosView(); - /** returns a pointer to the document connected to the view instance. Mind that this method requires a KVerbosApp instance as a parent + /** returns a pointer to the document connected to the view instance. Mind that this method requires a KVerbosApp instance as a tqparent * widget to get to the window document pointer by calling the KVerbosApp::getDocument() method. * * @see KVerbosApp#getDocument @@ -86,8 +87,8 @@ public: public slots: /** Die folgenden Slots werden aufgerufen, wenn ein Button mit einem - * spanischen Sonderzeichen gedrückt wird. - * Das Zeichen wird dann dem Eingabefeld, das den Focus hat zugefügt. + * spanischen Sonderzeichen gedr�ckt wird. + * Das Zeichen wird dann dem Eingabefeld, das den Focus hat zugef�gt. */ virtual void slotN(); virtual void slotA(); @@ -107,10 +108,10 @@ public slots: */ virtual void slotCopyText(); /** Die Ansicht wird aufgefordert sich das aktuelle Verb vom Dokument zu holen - * sich eine Zeit auszuwählen und dann das Verb in dem Fenster zum Üben bereitzustellen + * sich eine Zeit auszuw�hlen und dann das Verb in dem Fenster zum �ben bereitzustellen */ virtual void zeigeVerb(); - /** Es soll ein anderes Verb zum Lernen ausgewählt werden, das momentan eingegebene wird + /** Es soll ein anderes Verb zum Lernen ausgew�hlt werden, das momentan eingegebene wird nicht gewertet. */ virtual void slotWeiter(); diff --git a/kverbos/kverbos/qerfassen.ui b/kverbos/kverbos/qerfassen.ui index 90465a19..88721f2e 100644 --- a/kverbos/kverbos/qerfassen.ui +++ b/kverbos/kverbos/qerfassen.ui @@ -5,11 +5,11 @@ Der Dialog mit dem ein neutes Verb erfasst und in die Liste aufgenommen wird. Arnold Kraschinski - + QErfassen - + 0 0 @@ -30,7 +30,7 @@ und in die Liste aufgenommen wird. 6 - + Layout49 @@ -44,7 +44,7 @@ und in die Liste aufgenommen wird. 6 - + Layout111_3 @@ -58,45 +58,45 @@ und in die Liste aufgenommen wird. 6 - + TextVerbo Verb: - + AlignVCenter|AlignLeft - + EditVerbo - + TextAleman In the foreign language: - + AlignVCenter|AlignRight - + EditAleman - + Layout46 @@ -110,7 +110,7 @@ und in die Liste aufgenommen wird. 6 - + regular @@ -219,7 +219,7 @@ und in die Liste aufgenommen wird. - + Layout112 @@ -233,52 +233,52 @@ und in die Liste aufgenommen wird. 6 - + TextGerundio gerundio: - + AlignVCenter|AlignRight - + EditGerundio - + TextParticipio participio: - + AlignVCenter|AlignRight - + EditParticipio - + TabWidgetFormas true - + tabPresente @@ -295,7 +295,7 @@ und in die Liste aufgenommen wird. 6 - + Layout70_3 @@ -309,7 +309,7 @@ und in die Liste aufgenommen wird. 6 - + Layout69_3 @@ -323,7 +323,7 @@ und in die Liste aufgenommen wird. 6 - + Layout13_6_4_2_3 @@ -337,11 +337,11 @@ und in die Liste aufgenommen wird. 6 - + TextYo1 - + 110 0 @@ -351,11 +351,11 @@ und in die Liste aufgenommen wird. yo: - + TextTu1 - + 110 0 @@ -365,11 +365,11 @@ und in die Liste aufgenommen wird. tu: - + TextEl1 - + 110 0 @@ -379,11 +379,11 @@ und in die Liste aufgenommen wird. el/ella/usted: - + TextNosotros1 - + 110 0 @@ -393,11 +393,11 @@ und in die Liste aufgenommen wird. nosotros: - + TextVosotros1 - + 110 0 @@ -407,11 +407,11 @@ und in die Liste aufgenommen wird. vosotros: - + TextEllos1 - + 110 0 @@ -423,7 +423,7 @@ und in die Liste aufgenommen wird. - + Layout14_6_4_2_3 @@ -437,66 +437,66 @@ und in die Liste aufgenommen wird. 6 - + EditYo2_1 - + 200 0 - + EditTu2_1 - + 200 0 - + EditEl2_1 - + 200 0 - + EditNosotros2_1 - + 200 0 - + EditVosotros2_1 - + 200 0 - + EditEllos2_1 - + 200 0 @@ -507,7 +507,7 @@ und in die Liste aufgenommen wird. - + Layout45_4_2_3 @@ -521,7 +521,7 @@ und in die Liste aufgenommen wird. 6 - + ButtonSeiteLoeschen1 @@ -546,7 +546,7 @@ und in die Liste aufgenommen wird. - + tabImperfecto @@ -563,7 +563,7 @@ und in die Liste aufgenommen wird. 6 - + Layout68_3 @@ -577,7 +577,7 @@ und in die Liste aufgenommen wird. 6 - + Layout67_3 @@ -591,7 +591,7 @@ und in die Liste aufgenommen wird. 6 - + Layout13_6_5_2_3 @@ -605,11 +605,11 @@ und in die Liste aufgenommen wird. 6 - + TextYo2 - + 110 0 @@ -619,11 +619,11 @@ und in die Liste aufgenommen wird. yo: - + TextTu2 - + 110 0 @@ -633,11 +633,11 @@ und in die Liste aufgenommen wird. tu: - + TextEl2 - + 110 0 @@ -647,11 +647,11 @@ und in die Liste aufgenommen wird. el/ella/usted: - + TextNosotros2 - + 110 0 @@ -661,11 +661,11 @@ und in die Liste aufgenommen wird. nosotros: - + TextVosotros2 - + 110 0 @@ -675,11 +675,11 @@ und in die Liste aufgenommen wird. vosotros: - + TextEllos2 - + 110 0 @@ -691,7 +691,7 @@ und in die Liste aufgenommen wird. - + Layout14_6_5_2_3 @@ -705,66 +705,66 @@ und in die Liste aufgenommen wird. 6 - + EditYo2_2 - + 200 0 - + EditTu2_2 - + 200 0 - + EditEl2_2 - + 200 0 - + EditNosotros2_2 - + 200 0 - + EditVosotros2_2 - + 200 0 - + EditEllos2_2 - + 200 0 @@ -775,7 +775,7 @@ und in die Liste aufgenommen wird. - + Layout45_5_2_3 @@ -789,7 +789,7 @@ und in die Liste aufgenommen wird. 6 - + ButtonSeiteLoeschen2 @@ -814,7 +814,7 @@ und in die Liste aufgenommen wird. - + tabIndefinido @@ -831,7 +831,7 @@ und in die Liste aufgenommen wird. 6 - + Layout66_3 @@ -845,7 +845,7 @@ und in die Liste aufgenommen wird. 6 - + Layout65_3 @@ -859,7 +859,7 @@ und in die Liste aufgenommen wird. 6 - + Layout13_6_6_2_3 @@ -873,11 +873,11 @@ und in die Liste aufgenommen wird. 6 - + TextYo3 - + 110 0 @@ -887,11 +887,11 @@ und in die Liste aufgenommen wird. yo: - + TextTu3 - + 110 0 @@ -901,11 +901,11 @@ und in die Liste aufgenommen wird. tu: - + TextEl3 - + 110 0 @@ -915,11 +915,11 @@ und in die Liste aufgenommen wird. el/ella/usted: - + TextNosotros3 - + 110 0 @@ -929,11 +929,11 @@ und in die Liste aufgenommen wird. nosotros: - + TextVosotros3 - + 110 0 @@ -943,11 +943,11 @@ und in die Liste aufgenommen wird. vosotros: - + TextEllos3 - + 110 0 @@ -959,7 +959,7 @@ und in die Liste aufgenommen wird. - + Layout14_6_6_2_3 @@ -973,66 +973,66 @@ und in die Liste aufgenommen wird. 6 - + EditYo2_3 - + 200 0 - + EditTu2_3 - + 200 0 - + EditEl2_3 - + 200 0 - + EditNosotros2_3 - + 200 0 - + EditVosotros2_3 - + 200 0 - + EditEllos2_3 - + 200 0 @@ -1043,7 +1043,7 @@ und in die Liste aufgenommen wird. - + Layout45_6_2_3 @@ -1057,7 +1057,7 @@ und in die Liste aufgenommen wird. 6 - + ButtonSeiteLoeschen3 @@ -1082,7 +1082,7 @@ und in die Liste aufgenommen wird. - + tabFuturo @@ -1099,7 +1099,7 @@ und in die Liste aufgenommen wird. 6 - + Layout64_3 @@ -1113,7 +1113,7 @@ und in die Liste aufgenommen wird. 6 - + Layout63_3 @@ -1127,7 +1127,7 @@ und in die Liste aufgenommen wird. 6 - + Layout13_6_7_2_3 @@ -1141,11 +1141,11 @@ und in die Liste aufgenommen wird. 6 - + TextYo4 - + 110 0 @@ -1155,11 +1155,11 @@ und in die Liste aufgenommen wird. yo: - + TextTu4 - + 110 0 @@ -1169,11 +1169,11 @@ und in die Liste aufgenommen wird. tu: - + TextEl4 - + 110 0 @@ -1183,11 +1183,11 @@ und in die Liste aufgenommen wird. el/ella/usted: - + TextNosotros4 - + 110 0 @@ -1197,11 +1197,11 @@ und in die Liste aufgenommen wird. nosotros: - + TextVosotros4 - + 110 0 @@ -1211,11 +1211,11 @@ und in die Liste aufgenommen wird. vosotros: - + TextEllos4 - + 110 0 @@ -1227,7 +1227,7 @@ und in die Liste aufgenommen wird. - + Layout14_6_7_2_3 @@ -1241,66 +1241,66 @@ und in die Liste aufgenommen wird. 6 - + EditYo2_4 - + 200 0 - + EditTu2_4 - + 200 0 - + EditEl2_4 - + 200 0 - + EditNosotros2_4 - + 200 0 - + EditVosotros2_4 - + 200 0 - + EditEllos2_4 - + 200 0 @@ -1311,7 +1311,7 @@ und in die Liste aufgenommen wird. - + Layout45_7_2_3 @@ -1325,7 +1325,7 @@ und in die Liste aufgenommen wird. 6 - + ButtonSeiteLoeschen4 @@ -1350,7 +1350,7 @@ und in die Liste aufgenommen wird. - + tabCondicional @@ -1367,7 +1367,7 @@ und in die Liste aufgenommen wird. 6 - + Layout62_3 @@ -1381,7 +1381,7 @@ und in die Liste aufgenommen wird. 6 - + Layout61_3 @@ -1395,7 +1395,7 @@ und in die Liste aufgenommen wird. 6 - + Layout13_6_8_2_4 @@ -1409,11 +1409,11 @@ und in die Liste aufgenommen wird. 6 - + TextYo5 - + 110 0 @@ -1423,11 +1423,11 @@ und in die Liste aufgenommen wird. yo: - + TextTu5 - + 110 0 @@ -1437,11 +1437,11 @@ und in die Liste aufgenommen wird. tu: - + TextEl5 - + 110 0 @@ -1451,11 +1451,11 @@ und in die Liste aufgenommen wird. el/ella/usted: - + TextNosotros5 - + 110 0 @@ -1465,11 +1465,11 @@ und in die Liste aufgenommen wird. nosotros: - + TextVosotros5 - + 110 0 @@ -1479,11 +1479,11 @@ und in die Liste aufgenommen wird. vosotros: - + TextEllos5 - + 110 0 @@ -1495,7 +1495,7 @@ und in die Liste aufgenommen wird. - + Layout14_6_8_2_4 @@ -1509,66 +1509,66 @@ und in die Liste aufgenommen wird. 6 - + EditYo2_5 - + 200 0 - + EditTu2_5 - + 200 0 - + EditEl2_5 - + 200 0 - + EditNosotros2_5 - + 200 0 - + EditVosotros2_5 - + 200 0 - + EditEllos2_5 - + 200 0 @@ -1579,7 +1579,7 @@ und in die Liste aufgenommen wird. - + Layout45_8_2_4 @@ -1593,7 +1593,7 @@ und in die Liste aufgenommen wird. 6 - + ButtonSeiteLoeschen5 @@ -1618,7 +1618,7 @@ und in die Liste aufgenommen wird. - + tabSubPresente @@ -1635,7 +1635,7 @@ und in die Liste aufgenommen wird. 6 - + Layout60_3 @@ -1649,7 +1649,7 @@ und in die Liste aufgenommen wird. 6 - + Layout_sp @@ -1663,7 +1663,7 @@ und in die Liste aufgenommen wird. 6 - + Layout_p_6 @@ -1677,11 +1677,11 @@ und in die Liste aufgenommen wird. 6 - + TextYo6 - + 110 0 @@ -1691,11 +1691,11 @@ und in die Liste aufgenommen wird. yo: - + TextTu6 - + 110 0 @@ -1705,11 +1705,11 @@ und in die Liste aufgenommen wird. tu: - + TextEl6 - + 110 0 @@ -1719,11 +1719,11 @@ und in die Liste aufgenommen wird. el/ella/usted: - + TextNosotros6 - + 110 0 @@ -1733,11 +1733,11 @@ und in die Liste aufgenommen wird. nosotros: - + TextVosotros6 - + 110 0 @@ -1747,11 +1747,11 @@ und in die Liste aufgenommen wird. vosotros: - + TextEllos6 - + 110 0 @@ -1763,7 +1763,7 @@ und in die Liste aufgenommen wird. - + Layout_e_6 @@ -1777,66 +1777,66 @@ und in die Liste aufgenommen wird. 6 - + EditYo2_6 - + 200 0 - + EditTu2_6 - + 200 0 - + EditEl2_6 - + 200 0 - + EditNosotros2_6 - + 200 0 - + EditVosotros2_6 - + 200 0 - + EditEllos2_6 - + 200 0 @@ -1847,7 +1847,7 @@ und in die Liste aufgenommen wird. - + Layout45_8_2_3_5 @@ -1861,7 +1861,7 @@ und in die Liste aufgenommen wird. 6 - + ButtonSeiteLoeschen6 @@ -1886,7 +1886,7 @@ und in die Liste aufgenommen wird. - + tabSubPasado @@ -1903,7 +1903,7 @@ und in die Liste aufgenommen wird. 6 - + Layout58_3 @@ -1917,7 +1917,7 @@ und in die Liste aufgenommen wird. 6 - + Layout_spa @@ -1931,7 +1931,7 @@ und in die Liste aufgenommen wird. 6 - + Layout_p_7 @@ -1945,11 +1945,11 @@ und in die Liste aufgenommen wird. 6 - + TextYo7 - + 110 0 @@ -1959,11 +1959,11 @@ und in die Liste aufgenommen wird. yo: - + TextTu7 - + 110 0 @@ -1973,11 +1973,11 @@ und in die Liste aufgenommen wird. tu: - + TextEl7 - + 110 0 @@ -1987,11 +1987,11 @@ und in die Liste aufgenommen wird. el/ella/usted: - + TextNosotros7 - + 110 0 @@ -2001,11 +2001,11 @@ und in die Liste aufgenommen wird. nosotros: - + TextVosotros7 - + 110 0 @@ -2015,11 +2015,11 @@ und in die Liste aufgenommen wird. vosotros: - + TextEllos7 - + 110 0 @@ -2031,7 +2031,7 @@ und in die Liste aufgenommen wird. - + Layout_e_7 @@ -2045,66 +2045,66 @@ und in die Liste aufgenommen wird. 6 - + EditYo2_7 - + 200 0 - + EditTu2_7 - + 200 0 - + EditEl2_7 - + 200 0 - + EditNosotros2_7 - + 200 0 - + EditVosotros2_7 - + 200 0 - + EditEllos2_7 - + 200 0 @@ -2115,7 +2115,7 @@ und in die Liste aufgenommen wird. - + Layout45_8_2_3_2_3 @@ -2129,7 +2129,7 @@ und in die Liste aufgenommen wird. 6 - + ButtonSeiteLoeschen7 @@ -2154,7 +2154,7 @@ und in die Liste aufgenommen wird. - + tabImperativo @@ -2171,7 +2171,7 @@ und in die Liste aufgenommen wird. 6 - + Layout47 @@ -2185,7 +2185,7 @@ und in die Liste aufgenommen wird. 6 - + Layout46 @@ -2199,7 +2199,7 @@ und in die Liste aufgenommen wird. 6 - + Layout55_3 @@ -2213,7 +2213,7 @@ und in die Liste aufgenommen wird. 6 - + Layout_p_8 @@ -2227,11 +2227,11 @@ und in die Liste aufgenommen wird. 6 - + TextYo8 - + 110 0 @@ -2241,11 +2241,11 @@ und in die Liste aufgenommen wird. yo: - + TextTu8 - + 110 0 @@ -2255,11 +2255,11 @@ und in die Liste aufgenommen wird. tu: - + TextEl8 - + 110 0 @@ -2269,11 +2269,11 @@ und in die Liste aufgenommen wird. el/ella/usted: - + TextNosotros8 - + 110 0 @@ -2283,11 +2283,11 @@ und in die Liste aufgenommen wird. nosotros: - + TextVosotros8 - + 110 0 @@ -2297,7 +2297,7 @@ und in die Liste aufgenommen wird. vosotros: - + TextEllos8 @@ -2309,7 +2309,7 @@ und in die Liste aufgenommen wird. - + Layout_e_8 @@ -2323,66 +2323,66 @@ und in die Liste aufgenommen wird. 6 - + EditYo2_8 - + 200 0 - + EditTu2_8 - + 200 0 - + EditEl2_8 - + 200 0 - + EditNosotros2_8 - + 200 0 - + EditVosotros2_8 - + 200 0 - + EditEllos2_8 - + 200 0 @@ -2393,7 +2393,7 @@ und in die Liste aufgenommen wird. - + Layout45_8_2_3_3_3 @@ -2407,7 +2407,7 @@ und in die Liste aufgenommen wird. 6 - + ButtonSeiteLoeschen8 @@ -2433,7 +2433,7 @@ und in die Liste aufgenommen wird. - + Layout18 @@ -2458,11 +2458,11 @@ und in die Liste aufgenommen wird. Expanding - + ButtonN - + 50 32767 @@ -2472,11 +2472,11 @@ und in die Liste aufgenommen wird. n - + ButtonA - + 50 32767 @@ -2486,11 +2486,11 @@ und in die Liste aufgenommen wird. a - + ButtonE - + 50 32767 @@ -2500,11 +2500,11 @@ und in die Liste aufgenommen wird. e - + ButtonI - + 50 32767 @@ -2514,11 +2514,11 @@ und in die Liste aufgenommen wird. i - + ButtonO - + 50 32767 @@ -2528,11 +2528,11 @@ und in die Liste aufgenommen wird. o - + ButtonU - + 50 32767 @@ -2544,7 +2544,7 @@ und in die Liste aufgenommen wird. - + Layout48 @@ -2558,11 +2558,11 @@ und in die Liste aufgenommen wird. 6 - + ButtonLoeschen - + 90 0 @@ -2583,11 +2583,11 @@ und in die Liste aufgenommen wird. Expanding - + PushZurueck - + 90 0 @@ -2597,11 +2597,11 @@ und in die Liste aufgenommen wird. Back - + PushWeiter - + 90 0 @@ -2611,11 +2611,11 @@ und in die Liste aufgenommen wird. Next - + PushNewVerb - + 90 0 @@ -2625,11 +2625,11 @@ und in die Liste aufgenommen wird. New - + PushBeenden - + 90 0 @@ -2770,7 +2770,7 @@ und in die Liste aufgenommen wird. qerfassen.ui.h - + slotNewVerb() slotA() slotClearAll() @@ -2791,6 +2791,6 @@ und in die Liste aufgenommen wird. slotU() slotWeiter() slotZurueck() - - + + diff --git a/kverbos/kverbos/qlernen.ui b/kverbos/kverbos/qlernen.ui index 9b4b1d33..70489db1 100644 --- a/kverbos/kverbos/qlernen.ui +++ b/kverbos/kverbos/qlernen.ui @@ -3,11 +3,11 @@ It is the main wiget of the kverbos project. The user learns with this GUI. Arnold Kraschinski - + QLernen - + 0 0 @@ -28,7 +28,7 @@ The user learns with this GUI. 6 - + Layout13 @@ -42,7 +42,7 @@ The user learns with this GUI. 6 - + Layout11_2 @@ -56,20 +56,20 @@ The user learns with this GUI. 6 - + TextVerbo Verb: - + AlignVCenter|AlignRight - + EditVerbo @@ -81,7 +81,7 @@ The user learns with this GUI. 0 - + 0 0 @@ -91,24 +91,24 @@ The user learns with this GUI. NoFocus - + TextAleman In the foreign language: - + AlignVCenter|AlignRight - + EditAleman - + 0 0 @@ -120,7 +120,7 @@ The user learns with this GUI. - + Layout2 @@ -134,11 +134,11 @@ The user learns with this GUI. 6 - + TextTiempo2 - + 70 32767 @@ -148,7 +148,7 @@ The user learns with this GUI. Time - + TextTiempo @@ -158,7 +158,7 @@ The user learns with this GUI. - + Layout17 @@ -172,7 +172,7 @@ The user learns with this GUI. 6 - + Layout13 @@ -186,11 +186,11 @@ The user learns with this GUI. 6 - + TextYo - + 110 0 @@ -200,11 +200,11 @@ The user learns with this GUI. yo: - + TextTu - + 110 0 @@ -214,11 +214,11 @@ The user learns with this GUI. tu: - + TextEl - + 110 0 @@ -228,11 +228,11 @@ The user learns with this GUI. el/ella/usted: - + TextNosotros - + 110 0 @@ -242,11 +242,11 @@ The user learns with this GUI. nosotros: - + TextVosotros - + 110 0 @@ -256,11 +256,11 @@ The user learns with this GUI. vosotros: - + TextEllos - + 110 0 @@ -272,7 +272,7 @@ The user learns with this GUI. - + Layout4 @@ -286,66 +286,66 @@ The user learns with this GUI. 6 - + EditYo1 - + 50 32767 - + EditTu1 - + 50 32767 - + EditEl1 - + 50 32767 - + EditNosotros1 - + 50 32767 - + EditVosotros1 - + 50 32767 - + EditEllos1 - + 50 32767 @@ -354,7 +354,7 @@ The user learns with this GUI. - + Layout14 @@ -368,66 +368,66 @@ The user learns with this GUI. 6 - + EditYo2 - + 200 0 - + EditTu2 - + 200 0 - + EditEl2 - + 200 0 - + EditNosotros2 - + 200 0 - + EditVosotros2 - + 200 0 - + EditEllos2 - + 200 0 @@ -436,7 +436,7 @@ The user learns with this GUI. - + Layout15 @@ -450,60 +450,60 @@ The user learns with this GUI. 6 - + EditYo3 - + EditTu3 - + 200 0 - + EditEl3 - + 200 0 - + EditNosotros3 - + 200 0 - + EditVosotros3 - + 200 0 - + EditEllos3 - + 200 0 @@ -514,7 +514,7 @@ The user learns with this GUI. - + Layout18 @@ -539,11 +539,11 @@ The user learns with this GUI. Expanding - + ButtonN - + 50 32767 @@ -553,11 +553,11 @@ The user learns with this GUI. n - + ButtonA - + 50 32767 @@ -567,11 +567,11 @@ The user learns with this GUI. a - + ButtonE - + 50 32767 @@ -581,11 +581,11 @@ The user learns with this GUI. e - + ButtonI - + 50 32767 @@ -595,11 +595,11 @@ The user learns with this GUI. i - + ButtonO - + 50 32767 @@ -609,11 +609,11 @@ The user learns with this GUI. o - + ButtonU - + 50 32767 @@ -625,7 +625,7 @@ The user learns with this GUI. - + Layout15 @@ -639,7 +639,7 @@ The user learns with this GUI. 6 - + TextErgebnis @@ -650,7 +650,7 @@ The user learns with this GUI. Result: - + AlignCenter @@ -669,7 +669,7 @@ The user learns with this GUI. - + ProgressBar @@ -692,7 +692,7 @@ The user learns with this GUI. true - + PixmapLabel1 @@ -703,7 +703,7 @@ The user learns with this GUI. true - + Layout11 @@ -717,11 +717,11 @@ The user learns with this GUI. 6 - + ButtonLoeschen - + 110 0 @@ -742,11 +742,11 @@ The user learns with this GUI. Expanding - + ButtonKorrektur - + 110 0 @@ -756,7 +756,7 @@ The user learns with this GUI. Correct - + ButtonSolution @@ -764,11 +764,11 @@ The user learns with this GUI. Solution - + ButtonWeiter - + 110 0 @@ -1002,7 +1002,7 @@ The user learns with this GUI. ButtonSolution ButtonWeiter - + slotA() slotClearAll() slotCopyText() @@ -1016,6 +1016,6 @@ The user learns with this GUI. slotTextCopy(QString) slotU() slotWeiter() - - + + diff --git a/kverbos/kverbos/qresult.ui b/kverbos/kverbos/qresult.ui index a8e93bb0..a12c9c5e 100644 --- a/kverbos/kverbos/qresult.ui +++ b/kverbos/kverbos/qresult.ui @@ -1,10 +1,10 @@ QResult - + QResult - + 0 0 @@ -33,7 +33,7 @@ 6 - + Layout8 @@ -47,7 +47,7 @@ 6 - + Layout13 @@ -72,7 +72,7 @@ Expanding - + TextUser @@ -92,13 +92,13 @@ User: - + AlignVCenter|AlignRight - + TextLabelUser @@ -117,7 +117,7 @@ nobody - + TextSession @@ -129,13 +129,13 @@ Number of training sessions: - + AlignVCenter|AlignRight - + TextLabelSessions @@ -167,7 +167,7 @@ - + Layout7 @@ -181,7 +181,7 @@ 6 - + TableResult @@ -192,7 +192,7 @@ 3 - + Right @@ -221,7 +221,7 @@ - + Layout13 @@ -246,7 +246,7 @@ Expanding - + PushOK @@ -268,8 +268,8 @@ slotDlgEnde() - + slotDlgEnde() - - + + diff --git a/kverbos/kverbos/qverbedit.ui b/kverbos/kverbos/qverbedit.ui index f16b76de..2245ac3a 100644 --- a/kverbos/kverbos/qverbedit.ui +++ b/kverbos/kverbos/qverbedit.ui @@ -5,11 +5,11 @@ Die im Programm verfühbaren Verben werden in der Listenansicht ausgegeben und können bearbeitet werden. Arnold Kraschinski - + QVerbEdit - + 0 0 @@ -30,7 +30,7 @@ und können bearbeitet werden. 6 - + Layout2 @@ -44,7 +44,7 @@ und können bearbeitet werden. 6 - + Layout1 @@ -58,7 +58,7 @@ und können bearbeitet werden. 6 - + ButtonDelete @@ -76,14 +76,14 @@ und können bearbeitet werden. Expanding - + 20 20 - + ButtonOK @@ -91,7 +91,7 @@ und können bearbeitet werden. &OK - + ButtonEdit @@ -99,7 +99,7 @@ und können bearbeitet werden. &Edit - + ButtonCancel @@ -109,7 +109,7 @@ und können bearbeitet werden. - + Spanish Verb @@ -186,11 +186,11 @@ und können bearbeitet werden. slotEditVerb() - + slotEditVerb() slotCancel() slotDelete() slotDlgEnde() - - + + diff --git a/kverbos/kverbos/qverbosoptions.ui b/kverbos/kverbos/qverbosoptions.ui index da432531..2347392d 100644 --- a/kverbos/kverbos/qverbosoptions.ui +++ b/kverbos/kverbos/qverbosoptions.ui @@ -5,11 +5,11 @@ Damit können einige Einstellungen zum Programm verändert werden, z.B welche Zeiten geübt werden sollen und welche nicht. Arnold Kraschinski - + QVerbosOptions - + 0 0 @@ -30,7 +30,7 @@ Zeiten geübt werden sollen und welche nicht. 6 - + Layout12 @@ -44,7 +44,7 @@ Zeiten geübt werden sollen und welche nicht. 6 - + GroupBox1 @@ -61,7 +61,7 @@ Zeiten geübt werden sollen und welche nicht. 6 - + Layout11 @@ -75,7 +75,7 @@ Zeiten geübt werden sollen und welche nicht. 6 - + Layout10 @@ -89,11 +89,11 @@ Zeiten geübt werden sollen und welche nicht. 6 - + LabelTiempos - + 0 28 @@ -103,11 +103,11 @@ Zeiten geübt werden sollen und welche nicht. tiempos - + LabelPresente - + 0 28 @@ -117,11 +117,11 @@ Zeiten geübt werden sollen und welche nicht. presente - + LabelImperfecto - + 0 28 @@ -131,11 +131,11 @@ Zeiten geübt werden sollen und welche nicht. imperfecto - + LabelIndefinido - + 0 28 @@ -145,11 +145,11 @@ Zeiten geübt werden sollen und welche nicht. indefinido - + LabelFuturo - + 0 28 @@ -159,11 +159,11 @@ Zeiten geübt werden sollen und welche nicht. futuro - + LabelCondicional - + 0 28 @@ -173,14 +173,14 @@ Zeiten geübt werden sollen und welche nicht. condicional - + LabelSubPresente true - + 0 28 @@ -190,14 +190,14 @@ Zeiten geübt werden sollen und welche nicht. subjuntivo presente - + LabelSubPasado true - + 0 28 @@ -207,14 +207,14 @@ Zeiten geübt werden sollen und welche nicht. subjuntivo pasado - + LabelSubFuturo true - + 0 28 @@ -224,14 +224,14 @@ Zeiten geübt werden sollen und welche nicht. subjuntivo futuro - + LabelImperativo true - + 0 28 @@ -251,7 +251,7 @@ Zeiten geübt werden sollen und welche nicht. Expanding - + 20 20 @@ -260,7 +260,7 @@ Zeiten geübt werden sollen und welche nicht. - + Layout11 @@ -274,11 +274,11 @@ Zeiten geübt werden sollen und welche nicht. 6 - + LabelNormal - + 0 28 @@ -288,7 +288,7 @@ Zeiten geübt werden sollen und welche nicht. normal - + CheckBox1_1 @@ -300,7 +300,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -310,7 +310,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox1_2 @@ -322,7 +322,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -332,7 +332,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox1_3 @@ -344,7 +344,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -354,7 +354,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox1_4 @@ -366,7 +366,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -376,7 +376,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox1_5 @@ -388,7 +388,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -398,7 +398,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox1_6 @@ -413,7 +413,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -423,7 +423,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox1_7 @@ -438,7 +438,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -448,7 +448,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox1_8 @@ -463,7 +463,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -473,7 +473,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox1_9 @@ -488,7 +488,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -508,7 +508,7 @@ Zeiten geübt werden sollen und welche nicht. Expanding - + 20 20 @@ -517,7 +517,7 @@ Zeiten geübt werden sollen und welche nicht. - + Layout12 @@ -531,11 +531,11 @@ Zeiten geübt werden sollen und welche nicht. 6 - + LabelProgresivo - + 0 28 @@ -545,7 +545,7 @@ Zeiten geübt werden sollen und welche nicht. progresivo - + CheckBox2_1 @@ -557,7 +557,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -567,7 +567,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox2_2 @@ -579,7 +579,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -589,7 +589,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox2_3 @@ -601,7 +601,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -611,7 +611,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox2_4 @@ -623,7 +623,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -633,7 +633,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox2_5 @@ -645,7 +645,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -655,7 +655,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox2_6 @@ -670,7 +670,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -680,7 +680,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox2_7 @@ -695,7 +695,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -705,7 +705,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox2_8 @@ -720,7 +720,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -740,7 +740,7 @@ Zeiten geübt werden sollen und welche nicht. Expanding - + 20 20 @@ -757,7 +757,7 @@ Zeiten geübt werden sollen und welche nicht. Expanding - + 20 20 @@ -766,7 +766,7 @@ Zeiten geübt werden sollen und welche nicht. - + Layout10 @@ -780,11 +780,11 @@ Zeiten geübt werden sollen und welche nicht. 6 - + LabelPerfecto - + 0 28 @@ -794,7 +794,7 @@ Zeiten geübt werden sollen und welche nicht. perfecto - + CheckBox3_1 @@ -806,7 +806,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -816,7 +816,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox3_2 @@ -828,7 +828,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -838,11 +838,11 @@ Zeiten geübt werden sollen und welche nicht. - + TextLabel1 - + 0 28 @@ -852,7 +852,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox3_4 @@ -864,7 +864,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -874,7 +874,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox3_5 @@ -886,7 +886,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -896,7 +896,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox3_6 @@ -911,7 +911,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -921,7 +921,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox3_7 @@ -936,7 +936,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -946,7 +946,7 @@ Zeiten geübt werden sollen und welche nicht. - + CheckBox3_8 @@ -961,7 +961,7 @@ Zeiten geübt werden sollen und welche nicht. 0 - + 0 28 @@ -981,7 +981,7 @@ Zeiten geübt werden sollen und welche nicht. Expanding - + 20 20 @@ -998,7 +998,7 @@ Zeiten geübt werden sollen und welche nicht. Expanding - + 20 20 @@ -1011,7 +1011,7 @@ Zeiten geübt werden sollen und welche nicht. - + ButtonGroup1 @@ -1028,7 +1028,7 @@ Zeiten geübt werden sollen und welche nicht. 6 - + Layout9 @@ -1042,7 +1042,7 @@ Zeiten geübt werden sollen und welche nicht. 6 - + RadioStrictCorr @@ -1053,7 +1053,7 @@ Zeiten geübt werden sollen und welche nicht. true - + RadioIgnoreAcc @@ -1065,7 +1065,7 @@ Zeiten geübt werden sollen und welche nicht. - + GroupBoxKFeeder @@ -1082,7 +1082,7 @@ Zeiten geübt werden sollen und welche nicht. 6 - + Layout10 @@ -1106,14 +1106,14 @@ Zeiten geübt werden sollen und welche nicht. Expanding - + 20 20 - + CheckBoxSplash @@ -1121,7 +1121,7 @@ Zeiten geübt werden sollen und welche nicht. Show splash screen - + CheckBoxKFeeder @@ -1129,7 +1129,7 @@ Zeiten geübt werden sollen und welche nicht. Using KFeeder - + CheckBoxMode @@ -1141,7 +1141,7 @@ Zeiten geübt werden sollen und welche nicht. - + Layout8 @@ -1165,14 +1165,14 @@ Zeiten geübt werden sollen und welche nicht. Expanding - + 20 20 - + ButtonCerrar @@ -1180,7 +1180,7 @@ Zeiten geübt werden sollen und welche nicht. &OK - + ButtonCancel @@ -1220,9 +1220,9 @@ Zeiten geübt werden sollen und welche nicht. setEnabled(bool) - + slotDlgEnde() slotCancel() - - + + diff --git a/kverbos/kverbos/verbspanish.cpp b/kverbos/kverbos/verbspanish.cpp index 3fa76dc6..b787d36e 100644 --- a/kverbos/kverbos/verbspanish.cpp +++ b/kverbos/kverbos/verbspanish.cpp @@ -17,7 +17,7 @@ #include "verbspanish.h" -// include files for Qt +// include files for TQt // application specific includes @@ -582,10 +582,10 @@ bool verbSpanish::conjugateAll() // Bei Verben der Gruppe 5 ändert sich der Stamm für den Gerund if (getGroup() == 5) { - int pos = gerund.findRev("e"); + int pos = gerund.tqfindRev("e"); if (pos>=0) { - gerund.replace(pos, 1, "i"); + gerund.tqreplace(pos, 1, "i"); }; } gerund += "iendo#"; @@ -606,19 +606,19 @@ bool verbSpanish::vergleich(const TQString& s1, const TQString& s2) const { bool gleich=false; unsigned int l=0; - int r=s1.find(",", l); + int r=s1.tqfind(",", l); while ((l=0) - s.replace(pos, 1, "ie"); + s.tqreplace(pos, 1, "ie"); }; }; break; @@ -690,9 +690,9 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) { if ((nosotros != person) && (vosotros != person)) { - pos = s.findRev("o", -3); + pos = s.tqfindRev("o", -3); if (pos>=0) - s.replace(pos, 1, "ue"); + s.tqreplace(pos, 1, "ue"); }; }; break; @@ -705,9 +705,9 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) { if ((nosotros != person) && (vosotros != person)) { - pos = s.findRev("u"); + pos = s.tqfindRev("u"); if (pos>=0) - s.replace(pos, 1, "ue"); + s.tqreplace(pos, 1, "ue"); }; }; break; @@ -719,10 +719,10 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) if ((presente == time) && (person != nosotros) && (person != vosotros)) { TQString st = getStem(); - pos = st.findRev("e"); + pos = st.tqfindRev("e"); if (pos>=0) { - st.replace(pos, 1, "i"); + st.tqreplace(pos, 1, "i"); s = st + verbEndings[time][getEnding(good)][person]; }; } @@ -730,10 +730,10 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) if ((indefinido == time) && ((el == person)||(ellos == person))) { TQString st = getStem(); - pos = st.findRev("e"); + pos = st.tqfindRev("e"); if (pos>=0) { - st.replace(pos, 1, "i"); + st.tqreplace(pos, 1, "i"); s = st + verbEndings[time][getEnding(good)][person]; }; } @@ -745,91 +745,91 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) }; break; case 6: // qu> (vor e wird c zu qu) - pos = s.findRev("ce"); + pos = s.tqfindRev("ce"); if (pos>=0) - s.replace(pos, 2, "que"); + s.tqreplace(pos, 2, "que"); else { - pos = s.findRev("cé"); + pos = s.tqfindRev("cé"); if (pos>=0) - s.replace(pos, 2, "qué"); + s.tqreplace(pos, 2, "qué"); } break; case 7: // gu> (vor e wird g zu gu) - pos = s.findRev("ge"); + pos = s.tqfindRev("ge"); if (pos>=0) - s.replace(pos, 2, "gue"); + s.tqreplace(pos, 2, "gue"); else { - pos = s.findRev("gé"); + pos = s.tqfindRev("gé"); if (pos>=0) - s.replace(pos, 2, "gué"); + s.tqreplace(pos, 2, "gué"); } break; case 8: // c> (vor e wird z zu c) - pos = s.findRev("ze"); + pos = s.tqfindRev("ze"); if (pos>=0) - s.replace(pos, 2, "ce"); + s.tqreplace(pos, 2, "ce"); else { - pos = s.findRev("zé"); + pos = s.tqfindRev("zé"); if (pos>=0) - s.replace(pos, 2, "cé"); + s.tqreplace(pos, 2, "cé"); } break; case 9: // gü> (vor e wird gu zu gü) - pos = s.findRev("gue"); + pos = s.tqfindRev("gue"); if (pos>=0) - s.replace(pos, 3, "güe"); + s.tqreplace(pos, 3, "güe"); else { - pos = s.findRev("gué"); + pos = s.tqfindRev("gué"); if (pos>=0) - s.replace(pos, 3, "güé"); + s.tqreplace(pos, 3, "güé"); } break; case 10: // z> (vor o und a wird c zu z) - pos = s.findRev("co"); + pos = s.tqfindRev("co"); if (pos>=0) - s.replace(pos, 2, "zo"); + s.tqreplace(pos, 2, "zo"); else { - pos = s.findRev("ca"); + pos = s.tqfindRev("ca"); if (pos>=0) - s.replace(pos, 2, "za"); + s.tqreplace(pos, 2, "za"); }; break; case 11: // j> (vor o und a wird g zu j) - pos = s.findRev("ga"); + pos = s.tqfindRev("ga"); if (pos>=0) - s.replace(pos, 2, "ja"); + s.tqreplace(pos, 2, "ja"); else { - pos = s.findRev("go"); + pos = s.tqfindRev("go"); if (pos>=0) - s.replace(pos, 2, "jo"); + s.tqreplace(pos, 2, "jo"); }; break; case 12: // g> (vor o und a wird gu zu g) - pos = s.findRev("guo"); + pos = s.tqfindRev("guo"); if (pos>=0) - s.replace(pos, 3, "go"); + s.tqreplace(pos, 3, "go"); else { - pos = s.findRev("gua"); + pos = s.tqfindRev("gua"); if (pos>=0) - s.replace(pos, 3, "ga"); + s.tqreplace(pos, 3, "ga"); }; break; case 13: // c> (vor o und a wird qu zu c) - pos = s.findRev("quo"); + pos = s.tqfindRev("quo"); if (pos>=0) - s.replace(pos, 3, "co"); + s.tqreplace(pos, 3, "co"); else { - pos = s.findRev("qua"); + pos = s.tqfindRev("qua"); if (pos>=0) - s.replace(pos, 3, "ca"); + s.tqreplace(pos, 3, "ca"); }; break; case 14: // diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp index 7bdfe888..246589da 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp @@ -34,8 +34,8 @@ #include -ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* parent, const char* name) - : ProgressDlgForm( parent, name ) +ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* tqparent, const char* name) + : ProgressDlgForm( tqparent, name ) { doc = 0; setCaption (title); diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h index 43242aa2..c9eba176 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h @@ -35,6 +35,7 @@ class kvoctrainDoc; class ProgressDlg : public ProgressDlgForm { Q_OBJECT + TQ_OBJECT public: @@ -43,7 +44,7 @@ public: const TQString &doctitle, const TQString &filename, const TQString &title, - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui index 2c5d44cb..c0f63a5b 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui @@ -1,10 +1,10 @@ ProgressDlgForm - + Form1 - + 0 0 @@ -12,7 +12,7 @@ 127 - + 400 120 @@ -25,7 +25,7 @@ unnamed - + Frame3 @@ -42,7 +42,7 @@ 0 - + TextLabel1 @@ -54,7 +54,7 @@ Filename: - + TextLabel2 @@ -66,7 +66,7 @@ Title: - + l_file @@ -82,7 +82,7 @@ file.kvtml - + l_title @@ -110,14 +110,14 @@ Expanding - + 20 20 - + progress @@ -129,7 +129,7 @@ 0 - + 340 22 @@ -138,5 +138,5 @@ - + diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp index 26834bea..7f24d5ad 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp @@ -74,8 +74,8 @@ static ListRef date_itemlist [] = }; -BlockOptions::BlockOptions(TQWidget* parent, const char* name, WFlags fl) -: BlockOptionsBase(parent, name, fl) +BlockOptions::BlockOptions(TQWidget* tqparent, const char* name, WFlags fl) +: BlockOptionsBase(tqparent, name, fl) { connect(expire1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); connect(block1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); @@ -251,7 +251,7 @@ void BlockOptions::checkValidity() if (!found) message.append(i18n("Illogical blocking times.\n")); found = true; - message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").arg(i).arg(i + 1)); + message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").tqarg(i).tqarg(i + 1)); } } } @@ -270,7 +270,7 @@ void BlockOptions::checkValidity() if (!found) message.append(i18n("\nIllogical expiration times.\n")); found = true; - message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").arg(i).arg(i + 1)); + message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").tqarg(i).tqarg(i + 1)); } } } @@ -290,7 +290,7 @@ void BlockOptions::checkValidity() if (!found) message.append(i18n("\nIllogical blocking vs. expiration times.\n")); found = true; - message.append(i18n("The blocking time at level %1 should be lower than the expiration time.\n").arg(i + 1)); + message.append(i18n("The blocking time at level %1 should be lower than the expiration time.\n").tqarg(i + 1)); } } } diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h index a0128dda..4895e244 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h @@ -36,9 +36,10 @@ class TQComboBox; class BlockOptions : public BlockOptionsBase { Q_OBJECT + TQ_OBJECT public: - BlockOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + BlockOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); void updateWidgets(); bool hasChanged(); bool isDefault(); diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui index 2bd5c449..35b01c01 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui @@ -1,10 +1,10 @@ BlockOptionsBase - + BlockOptionsBase - + 0 0 @@ -19,17 +19,17 @@ 0 - + expire2 - + expire7 - + l_lev2 @@ -40,12 +40,12 @@ block2 - + expire1 - + l_lev5 @@ -56,7 +56,7 @@ block5 - + l_lev6 @@ -67,7 +67,7 @@ block6 - + kcfg_Expire @@ -83,12 +83,12 @@ E&xpiring - + block4 - + kcfg_Block @@ -104,12 +104,12 @@ Bl&ocking - + block1 - + block7 @@ -122,12 +122,12 @@ - + expire6 - + l_lev4 @@ -138,7 +138,7 @@ block4 - + l_lev7 @@ -149,27 +149,27 @@ block7 - + expire5 - + block3 - + block2 - + expire4 - + l_lev1 @@ -190,24 +190,24 @@ Minimum - + 41 20 - + expire3 - + block5 - + block6 @@ -220,7 +220,7 @@ - + l_lev3 @@ -241,7 +241,7 @@ Expanding - + 380 30 @@ -268,5 +268,5 @@ block1 expire1 - + diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp b/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp index e69d5c99..1f9c8bd7 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp @@ -29,8 +29,8 @@ #include "generaloptions.h" -GeneralOptions::GeneralOptions(TQWidget* parent, const char* name, WFlags fl) -: GeneralOptionsBase(parent,name,fl) +GeneralOptions::GeneralOptions(TQWidget* tqparent, const char* name, WFlags fl) +: GeneralOptionsBase(tqparent,name,fl) { kcfg_BackupTime->setEnabled(kcfg_AutoBackup->isChecked()); } diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h index 434dd669..7b1a7191 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h @@ -31,9 +31,10 @@ class GeneralOptions : public GeneralOptionsBase { Q_OBJECT + TQ_OBJECT public: - GeneralOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + GeneralOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); }; #endif diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui index 3e8b5425..51f26f81 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui @@ -1,10 +1,10 @@ GeneralOptionsBase - + GeneralOptionsBase - + 0 0 @@ -19,7 +19,7 @@ 0 - + kcfg_AutoSave @@ -33,7 +33,7 @@ Your work will be automatically saved if you check this option - + kcfg_AutoBackup @@ -58,7 +58,7 @@ 5 - + lblBackupInterva @@ -69,7 +69,7 @@ kIntSpinBox1 - + kcfg_SmartAppend @@ -83,7 +83,7 @@ If this feature is activated, you will repeatedly be prompted with the entry dialog. After entering the first original you have to enter the corresponding translations. Afterwards you proceed with the next original and its translations until you stop by pressing the ESC key. - + kcfg_AutoEntryApply @@ -97,7 +97,7 @@ If checked, you will not be asked if you really want this change; it will be applied automatically. - + kcfg_HeaderResizeMode @@ -111,7 +111,7 @@ 6 - + hb_auto @@ -125,7 +125,7 @@ KVocTrain makes each column the same width except the leftmost with the lesson names, which is half the size of the others. The second column, which contains the picture that describes the state of the row, has a fixed width. - + hb_percent @@ -139,7 +139,7 @@ If this is checked, the columns resize by the same amount as the window - + hb_fixed @@ -165,7 +165,7 @@ Expanding - + 51 123 @@ -182,7 +182,7 @@ setEnabled(bool) - + knuminput.h diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp index ea11654b..6af8cc3b 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp @@ -28,8 +28,8 @@ #include "groupoptions.h" -GroupOptions::GroupOptions(TQWidget* parent, const char* name, WFlags fl) -: GroupOptionsBase(parent,name,fl) +GroupOptions::GroupOptions(TQWidget* tqparent, const char* name, WFlags fl) +: GroupOptionsBase(tqparent,name,fl) { } diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h index 6db54524..b77f10c2 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h @@ -31,9 +31,10 @@ class GroupOptions : public GroupOptionsBase { Q_OBJECT + TQ_OBJECT public: - GroupOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + GroupOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); void updateButtons(); }; diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui index ee90fe3a..a7687d8b 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui @@ -1,10 +1,10 @@ GroupOptionsBase - + GroupOptionsBase - + 0 0 @@ -19,7 +19,7 @@ 0 - + l_name @@ -30,15 +30,15 @@ ps_name - + - layout1 + tqlayout1 unnamed - + ps_store @@ -54,7 +54,7 @@ &Save - + ps_recall @@ -70,7 +70,7 @@ &Load - + ps_new @@ -86,7 +86,7 @@ &New - + ps_del @@ -104,7 +104,7 @@ - + ps_name @@ -127,7 +127,7 @@ Expanding - + 150 16 @@ -143,5 +143,5 @@ ps_new ps_del - + diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg index 32469ed7..2aea0769 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg @@ -221,7 +221,7 @@ - QString::null + TQString::null diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp index 73db49ce..005607a0 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp @@ -54,10 +54,10 @@ static const char unapplied[] = I18N_NOOP( "If you save a profile, those changes will not be included.\n" "Do you wish to continue?"); -KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent, +KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *tqparent, const char *name, KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/, bool /*modal*/) - : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls) + : KConfigDialog(tqparent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls) { m_config = config; m_queryManager = m; diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h index 3aaf994d..6909d0df 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h @@ -41,12 +41,13 @@ class KComboBox; class KVocTrainPrefs : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: /** * Creates a configuration dialog. */ - KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent=0, + KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *tqparent=0, const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index 5da383b0..36f61b00 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -677,8 +677,8 @@ KV_ISO639_Code kv_iso639_2[] = { }; */ -LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char* name, WFlags fl) - : LanguageOptionsBase(parent, name, fl), m_langSet(langset) +LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* tqparent, const char* name, WFlags fl) + : LanguageOptionsBase(tqparent, name, fl), m_langSet(langset) { langset_popup = 0; @@ -689,7 +689,7 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&))); connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&))); connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&))); - connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); + connect(d_kbtqlayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); // Load the languages first, then the countries and create the // menus for the languages last, so they will have flags @@ -768,13 +768,13 @@ void LanguageOptions::slotDeleteClicked() enableLangWidgets(); // doesn't work yet - if (d_shortName->count() != 0 && d_kblayout->isEnabled()) + if (d_shortName->count() != 0 && d_kbtqlayout->isEnabled()) { - for (int i = 0; i < d_kblayout->count(); i++) + for (int i = 0; i < d_kbtqlayout->count(); i++) { - if (d_kblayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) + if (d_kbtqlayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) { - d_kblayout->setCurrentItem(i); + d_kbtqlayout->setCurrentItem(i); break; } } @@ -782,9 +782,9 @@ void LanguageOptions::slotDeleteClicked() } -void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout) +void LanguageOptions::slotKeyboardLayoutChanged(const TQString& tqlayout) { - m_langSet.setKeyboardLayout(layout, d_shortName->currentItem()); + m_langSet.setKeyboardLayout(tqlayout, d_shortName->currentItem()); emit widgetModified(); m_hasChanged = true; } @@ -812,22 +812,22 @@ void LanguageOptions::enableLangWidgets() } else { - if (replyType == "TQStringList") + if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { - TQStringList layouts; + TQStringList tqlayouts; TQDataStream stream(replyData, IO_ReadOnly); - stream >> layouts; - layouts.prepend(TQString::null); - d_kblayout->clear(); - d_kblayout->insertStringList(layouts); + stream >> tqlayouts; + tqlayouts.prepend(TQString()); + d_kbtqlayout->clear(); + d_kbtqlayout->insertStringList(tqlayouts); } } } else { //kdDebug() << "kxkb not enabled" << endl; - d_kblayout->clear(); - d_kblayout->setEnabled(false); + d_kbtqlayout->clear(); + d_kbtqlayout->setEnabled(false); } } @@ -898,22 +898,22 @@ void LanguageOptions::slotShortActivated(const TQString& _id) else b_langPixmap->setText (i18n("No Picture Selected")); - TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem()); + TQString tqlayout = m_langSet.keyboardLayout(d_shortName->currentItem()); - //kdDebug() << "layout to select " << layout << endl; + //kdDebug() << "tqlayout to select " << tqlayout << endl; - for (int i = 0; i < d_kblayout->count(); i++) + for (int i = 0; i < d_kbtqlayout->count(); i++) { - if (d_kblayout->text(i) == layout) + if (d_kbtqlayout->text(i) == tqlayout) { - d_kblayout->setCurrentItem(i); + d_kbtqlayout->setCurrentItem(i); break; } } // not found - if (d_kblayout->currentText() != layout) + if (d_kbtqlayout->currentText() != tqlayout) { - d_kblayout->setCurrentItem(0); + d_kbtqlayout->setCurrentItem(0); } } } @@ -1015,8 +1015,8 @@ void LanguageOptions::loadCountryData() locale.setLanguage(curr_lang); KGlobal::_locale = &locale; - TQString sub = TQString::fromLatin1("l10n/"); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); + TQString sub = TQString::tqfromLatin1("l10n/"); + TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop")); regionlist.sort(); TQMap regions; @@ -1026,44 +1026,44 @@ void LanguageOptions::loadCountryData() TQString tag = *it; int index; - index = tag.findRev('/'); + index = tag.tqfindRev('/'); if (index != -1) tag = tag.mid(index + 1); - index = tag.findRev('.'); + index = tag.tqfindRev('.'); if (index != -1) tag.truncate(index); KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); regions.insert(tag, Region(name)); } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); + TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop")); int idx = 0; for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit) { KSimpleConfig entry(*sit); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); - TQString submenu = entry.readEntry(TQString::fromLatin1("Region")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region")); TQString tag = *sit; - int index = tag.findRev('/'); + int index = tag.tqfindRev('/'); tag.truncate(index); - index = tag.findRev('/'); + index = tag.tqfindRev('/'); tag = tag.mid(index+1); if (tag == "C") continue; - TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::fromLatin1("Languages"))); + TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::tqfromLatin1("Languages"))); TQValueList langs; TQString pixmap = *sit; - index = pixmap.findRev('/'); + index = pixmap.tqfindRev('/'); pixmap.truncate(index); pixmap += "/flag.png"; @@ -1071,8 +1071,8 @@ void LanguageOptions::loadCountryData() { // Treat ie "en_GB" and "en_USE" as "en" because the language list // only contains the first letters - if ((*it).find("_")) - *it = (*it).left((*it).find("_")); + if ((*it).tqfind("_")) + *it = (*it).left((*it).tqfind("_")); int id = global_langset.indexShortId(*it); if (id > 0) @@ -1126,7 +1126,7 @@ void LanguageOptions::loadCountryData() void LanguageOptions::slotLangFromGlobalActivated(int i) { - if (countryIdMap.contains(i)) + if (countryIdMap.tqcontains(i)) { Country c = countryIdMap[i]; bool first = true; @@ -1178,7 +1178,7 @@ void LanguageOptions::loadISO6391Data() for (unsigned id = 0; id < (int)(sizeof(kv_iso639_1) / sizeof(kv_iso639_1[0])) && kv_iso639_1[id].iso1code != 0; ++id) { TQString s = i18n(kv_iso639_1[id].langname); - global_langset.addSet(kv_iso639_1[id].iso1code, s, TQString::null, kv_iso639_1[id].iso2code); + global_langset.addSet(kv_iso639_1[id].iso1code, s, TQString(), kv_iso639_1[id].iso2code); } } diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h index 5da2bd88..d239f06f 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h @@ -34,9 +34,10 @@ class LanguageOptions : public LanguageOptionsBase { Q_OBJECT + TQ_OBJECT public: - LanguageOptions(LangSet & langset, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + LanguageOptions(LangSet & langset, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); virtual ~LanguageOptions (); LangSet getLangSet () const; diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui index 84698be7..c4718342 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -1,10 +1,10 @@ LanguageOptionsBase - + LanguageOptionsBase - + 0 0 @@ -22,7 +22,7 @@ 6 - + GroupBox3 @@ -39,7 +39,7 @@ 6 - + b_langDel @@ -53,7 +53,7 @@ By clicking on this button you can delete the selected language. - + e_shortName2 @@ -72,7 +72,7 @@ An alternative language code is set here but you can change it if you want - + e_langLong @@ -93,7 +93,7 @@ - d_kblayout + d_kbtqlayout Select a language or use the Add New Language Code to add one. @@ -102,7 +102,7 @@ You can select a language with the drop down box or use the Add New Language Code dialog below to add one. - + b_langPixmap @@ -127,7 +127,7 @@ You can select a language with the drop down box or use the Add New Language Code dialog below to add one. - + label_shortName @@ -152,7 +152,7 @@ Each column can be assigned a language. This is internally done with the usual international language codes. - + label_shortName2 @@ -169,7 +169,7 @@ Sometimes it may be useful to have a second language code because some languages have the usual short code and one or two longer codes. - + label_langLong @@ -186,7 +186,7 @@ Here you can give the language code a descriptive name in your own language which is shown in the header buttons in the main view. - + label_langPixmap @@ -203,9 +203,9 @@ Choose a picture to represent the language above. - + - label_kblayout + label_kbtqlayout @@ -216,10 +216,10 @@ - Keyboard layout: + Keyboard tqlayout: - d_kblayout + d_kbtqlayout You can assign a language to each column @@ -230,7 +230,7 @@ - + GroupBox2 @@ -247,7 +247,7 @@ 6 - + b_lang_kde @@ -261,7 +261,7 @@ Pressing this button opens a menu that contains all the countries that are known in your KDE installation. Ordered by country you can add your desired language properties to your personal list. - + b_lang_iso1 @@ -278,7 +278,7 @@ Pressing this button opens a menu that contains all the language codes that are covered by "ISO639-1" - + b_langNew @@ -292,7 +292,7 @@ This button becomes available when you type a language code in the field. - + e_newName @@ -323,7 +323,7 @@ Expanding - + 390 20 @@ -337,14 +337,14 @@ e_shortName2 e_langLong b_langPixmap - d_kblayout + d_kbtqlayout b_langDel e_newName b_langNew b_lang_kde b_lang_iso1 - + kcombobox.h kcombobox.h diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp index ca79f2d5..a273088b 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp @@ -50,8 +50,8 @@ static const char *separator_id[] = 0 }; -PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent, const char* name, WFlags fl) -: PasteOptionsBase(parent,name,fl), m_langSet(langset) +PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* tqparent, const char* name, WFlags fl) +: PasteOptionsBase(tqparent,name,fl), m_langSet(langset) { OrderList->setEnabled(!kcfg_UseCurrent->isChecked()); UpButton->setEnabled(!kcfg_UseCurrent->isChecked()); diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h index 587f3c09..f7ef34d3 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h @@ -34,9 +34,10 @@ class kvoctrainDoc; class PasteOptions : public PasteOptionsBase { Q_OBJECT + TQ_OBJECT public: - PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); void updateWidgets(); bool hasChanged(); diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui index 3ee107fc..ad0b78ac 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui @@ -1,10 +1,10 @@ PasteOptionsBase - + PasteOptionsBase - + 0 0 @@ -22,7 +22,7 @@ 6 - + label_sep @@ -37,7 +37,7 @@ SeparatorCombo - + 140 0 @@ -60,14 +60,14 @@ Expanding - + 310 20 - + label_order @@ -84,7 +84,7 @@ 6 - + OrderList @@ -97,7 +97,7 @@ - + DownButton @@ -105,7 +105,7 @@ &Down - + SkipButton @@ -113,7 +113,7 @@ S&kip - + UpButton @@ -121,7 +121,7 @@ &Up - + kcfg_UseCurrent @@ -145,7 +145,7 @@ Expanding - + 21 21 @@ -164,7 +164,7 @@ Expanding - + 80 31 @@ -207,7 +207,7 @@ SkipButton DownButton - + kcombobox.h diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp index 6660561f..ec273397 100644 --- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp @@ -39,8 +39,8 @@ SettingsProfile::SettingsProfile(TQString n, TQString q, TQString t, TQString b) { } -ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *parent, const char *name, bool modal) - : KDialogBase(Swallow, i18n("Profiles"), Close, Close, parent, name, modal, false) +ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *tqparent, const char *name, bool modal) + : KDialogBase(Swallow, i18n("Profiles"), Close, Close, tqparent, name, modal, false) { m_queryManager = m; mw = new GroupOptions(this); @@ -82,7 +82,7 @@ void ProfilesDialog::slotNewGroup() { bool ok; TQString newGroupName = KInputDialog::getText(i18n("Profile Description"), - i18n("Enter profile description:"), TQString::null, &ok); + i18n("Enter profile description:"), TQString(), &ok); if (ok) { @@ -113,7 +113,7 @@ void ProfilesDialog::slotStoreGroup() static bool extract (TQString &line, TQString &ret) { - int lim = line.find (","); + int lim = line.tqfind (","); if (lim < 0) { ret = ""; @@ -178,7 +178,7 @@ void ProfilesDialog::selectProfile(int profile) if (extract (line, s)) Prefs::setIKnow((bool) s.toInt()); -#define QCT(x) Prefs::EnumCompType::type(x) +#define TQCT(x) Prefs::EnumCompType::type(x) line = profiles[profile].thresh_set; @@ -187,7 +187,7 @@ void ProfilesDialog::selectProfile(int profile) { // new style: multiple lessons int pos; line.remove(0, 1); - if ((pos = line.find(')')) > 0) + if ((pos = line.tqfind(')')) > 0) { s = line.left (pos); line.remove (0, pos+1); @@ -203,29 +203,29 @@ void ProfilesDialog::selectProfile(int profile) m_queryManager->setLessonItemStr(s); if (extract (line, s)) - Prefs::setCompType(Prefs::EnumType::Lesson, QCT(s.toInt())); + Prefs::setCompType(Prefs::EnumType::Lesson, TQCT(s.toInt())); if (extract (line, s)) Prefs::setTypeItem(s); // s.toInt() if (extract (line, s)) - Prefs::setCompType(Prefs::EnumType::WordType, QCT(s.toInt())) /*manager.setTypeComp(QCT(s.toInt()))*/; + Prefs::setCompType(Prefs::EnumType::WordType, TQCT(s.toInt())) /*manager.setTypeComp(TQCT(s.toInt()))*/; if (extract (line, s)) Prefs::setGradeItem(s.toInt()); if (extract (line, s)) - Prefs::setCompType(Prefs::EnumType::Grade, QCT(s.toInt())); + Prefs::setCompType(Prefs::EnumType::Grade, TQCT(s.toInt())); if (extract (line, s)) Prefs::setQueryItem(s.toInt()); if (extract (line, s)) - Prefs::setCompType(Prefs::EnumType::Query, QCT(s.toInt())); + Prefs::setCompType(Prefs::EnumType::Query, TQCT(s.toInt())); if (extract (line, s)) Prefs::setBadItem(s.toInt()); if (extract (line, s)) - Prefs::setCompType(Prefs::EnumType::Bad, QCT(s.toInt())); + Prefs::setCompType(Prefs::EnumType::Bad, TQCT(s.toInt())); if (extract (line, s)) Prefs::setDateItem(s.toInt()); if (extract (line, s)) - Prefs::setCompType(Prefs::EnumType::Date, QCT(s.toInt())); + Prefs::setCompType(Prefs::EnumType::Date, TQCT(s.toInt())); -#undef QCT +#undef TQCT line = profiles[profile].block_set; Prefs::setBlock(false); diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h index 165eb534..057acaa5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h +++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h @@ -46,9 +46,10 @@ public: class ProfilesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ProfilesDialog(QueryManager * m, TQWidget *parent = 0, const char *name = 0, bool modal = true); + ProfilesDialog(QueryManager * m, TQWidget *tqparent = 0, const char *name = 0, bool modal = true); signals: void profileActivated(); diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp index 2b4e6c5a..94c6c6da 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp @@ -34,8 +34,8 @@ #include "queryoptions.h" #include "prefs.h" -QueryOptions::QueryOptions(TQWidget* parent, const char* name, WFlags fl) -: QueryOptionsBase(parent,name,fl) +QueryOptions::QueryOptions(TQWidget* tqparent, const char* name, WFlags fl) +: QueryOptionsBase(tqparent,name,fl) { kcfg_MaxTimePer->setDisabled(r_no_limit->isChecked()); kcfg_ShowCounter->setDisabled(r_no_limit->isChecked()); diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h index 409a597e..4aa6b1a5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h @@ -23,17 +23,18 @@ * * ***************************************************************************/ -#ifndef QUERYOPTIONS_H -#define QUERYOPTIONS_H +#ifndef TQUERYOPTIONS_H +#define TQUERYOPTIONS_H #include "queryoptionsbase.h" class QueryOptions : public QueryOptionsBase { Q_OBJECT + TQ_OBJECT public: - QueryOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + QueryOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); void updateWidgets(); }; diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui index 24e70c58..c7895160 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui @@ -1,10 +1,10 @@ QueryOptionsBase - + QueryOptionsBase - + 0 0 @@ -22,7 +22,7 @@ 6 - + kcfg_AltLearn @@ -36,7 +36,7 @@ By checking this, you will use the Leitner method of learning which requires you to answer correctly to each question 4 times in a row. - + kcfg_SwapDirection @@ -44,7 +44,7 @@ S&wap direction randomly - + unnamed @@ -55,7 +55,7 @@ unnamed - + kcfg_Suggestions @@ -72,7 +72,7 @@ When this options is enabled, you can enter part of an answer, then press F5 or F6 to get a list of translations starting with or containing the text you typed. - + kcfg_Split @@ -89,7 +89,7 @@ When this options is enabled, the program will split translations into several parts, show multiple answer fields, and you will need to answer each one of them. This is useful for example when a word has several meanings that have different translations in the other language. - + label_split_max_fields @@ -106,7 +106,7 @@ Enter the maximum number of answer fields you want to have. When splitting translations, the program will only split into this many parts, and the last part will contain the rest of the translation. - + kcfg_IKnow @@ -123,7 +123,7 @@ If this is checked, the I Know button will be available. It allows you to tell the query that you know the result without writing it or having it checked. This is available by default. If you uncheck this, the I Know button will not be available. - + label_at @@ -139,7 +139,7 @@ at - + kcfg_Periods @@ -156,7 +156,7 @@ When this options is enabled, translations will be split at periods if they have any (except any trailing periods that will be removed). - + kcfg_Semicolons @@ -173,7 +173,7 @@ When this options is enabled, translations that have not been split at periods or colons will be split at semicolons if they have any. - + kcfg_Commas @@ -198,7 +198,7 @@ When this options is enabled, translations that have not been split at periods, colons or semicolons will be split at commas if they have any. - + kcfg_Colons @@ -215,7 +215,7 @@ When this options is enabled, translations that have not been split at periods will be split at colons if they have any. - + kcfg_ShowMore @@ -242,7 +242,7 @@ Minimum - + 16 48 @@ -261,7 +261,7 @@ 0 - + 32767 32767 @@ -290,7 +290,7 @@ Expanding - + 111 20 @@ -309,14 +309,14 @@ Expanding - + 290 20 - + QueryTimeout @@ -333,7 +333,7 @@ 6 - + kcfg_QueryTimeout @@ -350,7 +350,7 @@ 0 - + r_show_to @@ -361,7 +361,7 @@ 1 - + r_no_limit @@ -378,7 +378,7 @@ When this is checked, there is no time limitation for each query - + r_cont_to @@ -388,15 +388,15 @@ - + - layout3 + tqlayout3 unnamed - + label_mqtime @@ -407,7 +407,7 @@ kcfg_MaxTimePer - + kcfg_ShowCounter @@ -439,7 +439,7 @@ Minimum - + 83 20 @@ -475,7 +475,7 @@ Expanding - + 200 16 @@ -563,7 +563,7 @@ kcfg_ShowMore kcfg_IKnow - + knuminput.h knuminput.h diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp index b54d60f6..f7a3cac6 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp @@ -101,8 +101,8 @@ static ThreshListRef Threshdate_itemlist [] = }; -ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent, const char* name, WFlags fl) -: ThresholdOptionsBase(parent, name, fl), m_lessons(lessons) +ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* tqparent, const char* name, WFlags fl) +: ThresholdOptionsBase(tqparent, name, fl), m_lessons(lessons) { connect(lessoncomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetLessonComp(int))); connect(lessonlist, TQT_SIGNAL(selectionChanged()), TQT_SIGNAL(widgetModified())); diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h index e3d5b9da..c34beed0 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h @@ -34,9 +34,10 @@ class KComboBox; class ThresholdOptions : public ThresholdOptionsBase { Q_OBJECT + TQ_OBJECT public: - ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); void updateWidgets(); bool hasChanged(); diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui index 4cf771c2..fa569c1c 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui @@ -1,10 +1,10 @@ ThresholdOptionsBase - + ThresholdOptionsBase - + 0 0 @@ -22,7 +22,7 @@ 6 - + typecomp @@ -35,17 +35,17 @@ - + querycomp - + badcomp - + label_grade @@ -56,7 +56,7 @@ gradecomp - + label_bcount @@ -67,7 +67,7 @@ badcomp - + label_qdate @@ -78,27 +78,27 @@ datecomp - + datecomp - + badlist - + querylist - + datelist - + typelist @@ -111,7 +111,7 @@ - + label_type @@ -122,17 +122,17 @@ typecomp - + gradelist - + gradecomp - + label_qcount @@ -143,15 +143,15 @@ querycomp - + - layout8 + tqlayout8 unnamed - + b_all_less @@ -167,7 +167,7 @@ &All - + lessonlist @@ -183,7 +183,7 @@ Multi - + b_none_less @@ -191,7 +191,7 @@ &None - + l_lesson @@ -209,7 +209,7 @@ Expanding - + 20 50 @@ -226,14 +226,14 @@ MinimumExpanding - + 20 80 - + l_count @@ -249,7 +249,7 @@ - - + label_lesson @@ -260,7 +260,7 @@ lessoncomp - + lessoncomp @@ -285,7 +285,7 @@ Expanding - + 290 16 @@ -294,5 +294,5 @@ - + diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp index 773f263f..9be23a47 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp @@ -27,8 +27,8 @@ #include "viewoptions.h" -ViewOptions::ViewOptions(TQWidget* parent, const char* name, WFlags fl) -: ViewOptionsBase(parent,name,fl) +ViewOptions::ViewOptions(TQWidget* tqparent, const char* name, WFlags fl) +: ViewOptionsBase(tqparent,name,fl) { kcfg_GradeCol0->setEnabled(kcfg_UseGradeCol->isChecked()); kcfg_GradeCol1->setEnabled(kcfg_UseGradeCol->isChecked()); diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h index db3eb409..5ee876db 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h @@ -31,9 +31,10 @@ class ViewOptions : public ViewOptionsBase { Q_OBJECT + TQ_OBJECT public: - ViewOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ViewOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); }; diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui index 3bb2af24..37f152fe 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui @@ -1,10 +1,10 @@ ViewOptionsBase - + ViewOptionsBase - + 0 0 @@ -27,7 +27,7 @@ kcfg_TableFont - + TableFontLabel @@ -43,7 +43,7 @@ kcfg_IPAFont - + IPAFontLabel @@ -54,7 +54,7 @@ kcfg_IPAFont - + gradegroup @@ -79,7 +79,7 @@ 6 - + l_lev4 @@ -98,7 +98,7 @@ kcfg_GradeCol4 - + l_lev5 @@ -117,7 +117,7 @@ kcfg_GradeCol5 - + l_lev7 @@ -136,7 +136,7 @@ kcfg_GradeCol7 - + l_lev6 @@ -171,7 +171,7 @@ &N - + l_lev0 @@ -215,7 +215,7 @@ Click here to change the color for grade 1. - + l_lev1 @@ -234,7 +234,7 @@ kcfg_GradeCol1 - + l_lev2 @@ -278,7 +278,7 @@ Click here to change the color for grade 2. - + l_lev3 @@ -422,7 +422,7 @@ Click here to change the color for grade 7. - + kcfg_UseGradeCol @@ -448,7 +448,7 @@ Expanding - + 61 20 @@ -520,7 +520,7 @@ kcolorbutton.h - + kfontrequester.h kfontrequester.h diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp index f1c8d62d..73ceab50 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp @@ -28,7 +28,7 @@ #include -DocOptionsPage::DocOptionsPage(bool sort, TQWidget *parent, const char *name):DocOptionsPageForm(parent, name) +DocOptionsPage::DocOptionsPage(bool sort, TQWidget *tqparent, const char *name):DocOptionsPageForm(tqparent, name) { sorter = sort; docsort->setChecked(sort); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h index 948a37af..b2ee07e6 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h @@ -32,10 +32,11 @@ class DocOptionsPage : public DocOptionsPageForm { Q_OBJECT + TQ_OBJECT public: - DocOptionsPage(bool sort, TQWidget *parent, const char *name); + DocOptionsPage(bool sort, TQWidget *tqparent, const char *name); bool getSorting () const { return sorter; } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui index 137d3df5..d1b3d34d 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui @@ -1,10 +1,10 @@ DocOptionsPageForm - + Document_options - + 0 0 @@ -25,7 +25,7 @@ 6 - + GroupBox1 @@ -42,7 +42,7 @@ 6 - + docsort @@ -54,5 +54,5 @@ - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp index a49fd65e..34979fc1 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp @@ -47,12 +47,12 @@ DocPropsDlg::DocPropsDlg vector types, vector tenses, vector usages, - TQWidget *parent, + TQWidget *tqparent, const char *name, bool modal ) : - KDialogBase(Tabbed, i18n("Document Properties"), Ok|Cancel, Ok, parent, name, modal) + KDialogBase(Tabbed, i18n("Document Properties"), Ok|Cancel, Ok, tqparent, name, modal) { TQFrame *page = addPage( i18n("&General") ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h index 9e6080d7..0ed586ed 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h @@ -44,6 +44,7 @@ class LangPropPage; class DocPropsDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: @@ -59,7 +60,7 @@ public: vector types, vector tenses, vector usages, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL, bool modal = true ); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp index 76013ebf..c359f65f 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp @@ -42,9 +42,9 @@ class kvoctraindoc; -DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent, const char *name, bool modal) +DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *tqparent, const char *name, bool modal) : - KDialogBase(Tabbed, i18n("Language Properties"), Ok|Cancel, Ok, parent, name, modal) + KDialogBase(Tabbed, i18n("Language Properties"), Ok|Cancel, Ok, tqparent, name, modal) { TQFrame * page; TQVBoxLayout * topLayout; diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h index a6b7c14f..6b1a6170 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h @@ -39,10 +39,11 @@ class LangSet; class DocPropsLangDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent = NULL, const char *name = NULL, bool modal = true); + DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *tqparent = NULL, const char *name = NULL, bool modal = true); Conjugation getConjugation(int idx) const; Article getArticle(int idx) const; diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp index a9d255e6..3ec0a6f5 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp @@ -40,11 +40,11 @@ LangPropPage::LangPropPage TQString curr_lang, const Conjugation &conjug, const Article &art, - TQWidget *parent, + TQWidget *tqparent, const char *name ) : - LangPropPageForm( parent, name ), + LangPropPageForm( tqparent, name ), doc(_doc), conjugations(conjug), articles(art) diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h index d7ab00f5..4748e7b3 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h @@ -36,6 +36,7 @@ class kvoctrainDoc; class LangPropPage : public LangPropPageForm { Q_OBJECT + TQ_OBJECT public: @@ -45,7 +46,7 @@ public: TQString curr_lang, const Conjugation &conjugations, const Article &article, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui index cce69a3f..42446585 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui @@ -1,10 +1,10 @@ LangPropPageForm - + LangPropPage - + 0 0 @@ -25,7 +25,7 @@ 6 - + GroupBox2 @@ -42,7 +42,7 @@ 6 - + unnamed @@ -58,7 +58,7 @@ Language code (ISO 639): - + l_langcode @@ -70,7 +70,7 @@ 0 - + 70 0 @@ -93,14 +93,14 @@ MinimumExpanding - + 20 20 - + GroupBox3 @@ -125,7 +125,7 @@ 6 - + female_label @@ -136,7 +136,7 @@ def_female - + male_label @@ -147,7 +147,7 @@ def_male - + indef_male @@ -160,7 +160,7 @@ - + TextLabel3 @@ -176,7 +176,7 @@ Definite - + def_male @@ -189,7 +189,7 @@ - + indef_female @@ -202,7 +202,7 @@ - + def_female @@ -225,14 +225,14 @@ Minimum - + 50 20 - + def_natural @@ -245,7 +245,7 @@ - + indef_natural @@ -258,7 +258,7 @@ - + natural_label @@ -269,7 +269,7 @@ def_natural - + TextLabel4 @@ -279,7 +279,7 @@ - + GroupBox4 @@ -304,7 +304,7 @@ 6 - + pers1_label @@ -315,7 +315,7 @@ first_singular - + pers2_label @@ -326,7 +326,7 @@ second_singular - + pers3_label @@ -334,7 +334,7 @@ 3. Person: - + thirdF_plural @@ -347,7 +347,7 @@ - + thirdN_plural @@ -360,7 +360,7 @@ - + thirdM_plural @@ -373,7 +373,7 @@ - + thirdP_common @@ -389,7 +389,7 @@ C&ommon - + female_c_label @@ -400,7 +400,7 @@ thirdF_singular - + male_c_label @@ -411,7 +411,7 @@ thirdM_singular - + natural_c_label @@ -422,7 +422,7 @@ thirdN_singular - + TextLabel4_2 @@ -430,7 +430,7 @@ Plural - + thirdS_common @@ -446,7 +446,7 @@ &Common - + TextLabel4_2 @@ -464,14 +464,14 @@ Minimum - + 50 20 - + second_singular @@ -484,7 +484,7 @@ - + thirdF_singular @@ -497,7 +497,7 @@ - + thirdM_singular @@ -510,7 +510,7 @@ - + thirdN_singular @@ -523,7 +523,7 @@ - + first_singular @@ -536,7 +536,7 @@ - + first_plural @@ -549,7 +549,7 @@ - + second_plural @@ -588,5 +588,5 @@ thirdM_plural thirdN_plural - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp index d7015435..4b0c1155 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp @@ -42,11 +42,11 @@ LessOptPage::LessOptPage ( TQComboBox *lessons, kvoctrainDoc *_doc, - TQWidget *parent, + TQWidget *tqparent, const char *name ) : - LessOptPageForm( parent, name ) + LessOptPageForm( tqparent, name ) { connect( lessonList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotLessonChosen(int)) ); connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewLesson()) ); @@ -85,7 +85,7 @@ void LessOptPage::slotNewLesson() { bool ok; TQString getLesson = KInputDialog::getText( - i18n( "Lesson Description" ), i18n( "Enter lesson description:" ), TQString::null, &ok ); + i18n( "Lesson Description" ), i18n( "Enter lesson description:" ), TQString(), &ok ); if( !ok ) return; TQString str; @@ -107,7 +107,7 @@ void LessOptPage::slotModifyLesson() if (lessonList->count() != 0 && (int) lessonList->count() > act_lesson) { TQString str = lessonList->text (act_lesson); - int pos = str.find (LESS_TAG); + int pos = str.tqfind (LESS_TAG); str.remove (0, pos+strlen (LESS_TAG)); bool ok; TQString getLesson = KInputDialog::getText( @@ -129,7 +129,7 @@ void LessOptPage::updateListBox(int start) for (int i = start; i < (int) lessonList->count(); i++) { str = lessonList->text (i); - int pos = str.find (LESS_TAG); + int pos = str.tqfind (LESS_TAG); str.remove (0, pos+strlen (LESS_TAG)); str2.setNum (i+1); if (i <= 9) @@ -179,7 +179,7 @@ void LessOptPage::getLesson (TQComboBox *ret_lesson, vector &ret_Index) TQString str; for (int i = 0; i < (int) lessonList->count(); i++) { str = lessonList->text(i); - int pos = str.find (LESS_TAG); + int pos = str.tqfind (LESS_TAG); str.remove (0, pos+strlen (LESS_TAG)); ret_lesson->insertItem (str); } @@ -228,7 +228,7 @@ void LessOptPage::cleanUnused (kvoctrainDoc *doc, ///////////////////////////////////////////////////// // translate_index contains new index number for each // old index - for (int i = 0; i <= QMAX (old_lessons, (int) lessonIndex.size()); i++) + for (int i = 0; i <= TQMAX (old_lessons, (int) lessonIndex.size()); i++) translate_index.push_back(0); // now adjust lesson descriptions to new index diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h index b5a54e06..9531eed6 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h @@ -37,6 +37,7 @@ class TQComboBox; class LessOptPage : public LessOptPageForm { Q_OBJECT + TQ_OBJECT public: @@ -44,7 +45,7 @@ public: ( TQComboBox *lessons, kvoctrainDoc *doc, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui index 311ab3bc..a37885ff 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui @@ -1,10 +1,10 @@ LessOptPageForm - + Lesson_Descriptions - + 0 0 @@ -25,7 +25,7 @@ 6 - + lesson_group @@ -52,14 +52,14 @@ Expanding - + 20 20 - + b_new @@ -75,7 +75,7 @@ &New... - + b_modify @@ -91,7 +91,7 @@ &Modify... - + b_delete @@ -107,7 +107,7 @@ &Delete - + b_cleanup @@ -123,7 +123,7 @@ &Clean Up - + lessonList @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp index 00325b7b..30ed7369 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp @@ -40,11 +40,11 @@ TenseOptPage::TenseOptPage ( const vector &tenses, kvoctrainDoc *_doc, - TQWidget *parent, + TQWidget *tqparent, const char *name ) : - TenseOptPageForm( parent, name ) + TenseOptPageForm( tqparent, name ) { connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) ); connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); @@ -83,7 +83,7 @@ void TenseOptPage::slotNewTense() { bool ok; TQString getTense = KInputDialog::getText( - i18n( "Tense Description" ), i18n( "Enter tense description:" ), TQString::null, &ok ); + i18n( "Tense Description" ), i18n( "Enter tense description:" ), TQString(), &ok ); if( !ok ) return; @@ -106,7 +106,7 @@ void TenseOptPage::slotModifyTense() if (tenseList->count() != 0 && (int) tenseList->count() > act_tense) { TQString str = tenseList->text (act_tense); - int pos = str.find (TENSE_TAG); + int pos = str.tqfind (TENSE_TAG); str.remove (0, pos+strlen (TENSE_TAG)); bool ok; TQString getTense = KInputDialog::getText( @@ -128,7 +128,7 @@ void TenseOptPage::updateListBox(int start) for (int i = start; i < (int) tenseList->count(); i++) { str = tenseList->text (i); - int pos = str.find (TENSE_TAG); + int pos = str.tqfind (TENSE_TAG); str.remove (0, pos+strlen (TENSE_TAG)); str2.setNum (i+1); if (i <= 9) @@ -146,7 +146,7 @@ void TenseOptPage::slotDeleteTense() TQString t; t.setNum(tenseIndex[act_tense]+1); - t.insert (0, QM_USER_TYPE); + t.insert (0, TQM_USER_TYPE); for (int ent = 0; ent < doc->numEntries(); ent++) { // FIXME: ProgressDlg here? kvoctrainExpr *exp = doc->getEntry(ent); @@ -185,7 +185,7 @@ void TenseOptPage::getTenseNames (vector &ret_tense, vector &ret_ for (int i = 0; i < (int) tenseList->count(); i++) { str = tenseList->text(i); - int pos = str.find (TENSE_TAG); + int pos = str.tqfind (TENSE_TAG); str.remove (0, pos+strlen (TENSE_TAG)); ret_tense.push_back (str); } @@ -239,7 +239,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector &tenseIndex, ///////////////////////////////////////////////////// // translate_index contains new index number for each // old index - for (int i = 0; i <= QMAX (old_tenses, (int) tenseIndex.size()); i++) + for (int i = 0; i <= TQMAX (old_tenses, (int) tenseIndex.size()); i++) translate_index.push_back(0); // now adjust lesson descriptions to new index @@ -260,7 +260,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector &tenseIndex, bool dirty = false; for (int ci = 0; ci < conj.numEntries(); ci++) { TQString old = conj.getType(ci); - if (!old.isEmpty() && old.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) { + if (!old.isEmpty() && old.left(strlen(TQM_USER_TYPE)) == TQM_USER_TYPE) { old.remove (0, 1); int o = old.toInt(); @@ -268,7 +268,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector &tenseIndex, TQString newtense; if (translate_index[o] != 0) { newtense.setNum (translate_index[o]); - newtense.insert (0, QM_USER_TYPE); + newtense.insert (0, TQM_USER_TYPE); conj.setType(ci, newtense); } else diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h index 1cc3913b..e2430173 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h @@ -38,6 +38,7 @@ class TQStrList; class TenseOptPage : public TenseOptPageForm { Q_OBJECT + TQ_OBJECT public: @@ -45,7 +46,7 @@ public: ( const vector &tenses, kvoctrainDoc *doc, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui index b0471df8..7a1df330 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui @@ -1,10 +1,10 @@ TenseOptPageForm - + Tense_Descriptions - + 0 0 @@ -25,7 +25,7 @@ 6 - + tense_group @@ -52,14 +52,14 @@ Expanding - + 20 20 - + b_new @@ -75,7 +75,7 @@ &New... - + b_modify @@ -91,7 +91,7 @@ &Modify... - + b_delete @@ -107,7 +107,7 @@ &Delete - + b_cleanup @@ -123,7 +123,7 @@ &Clean Up - + tenseList @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp index 96f71bd4..57dd5f2d 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp @@ -39,11 +39,11 @@ TitlePage::TitlePage TQString _author, TQString _license, TQString _doc_remark, - TQWidget* parent, + TQWidget* tqparent, const char* name ) : - TitlePageForm( parent, name ) + TitlePageForm( tqparent, name ) { title = _title; author = _author; diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h index d656342a..52954e1e 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h @@ -32,6 +32,7 @@ class TitlePage : public TitlePageForm { Q_OBJECT + TQ_OBJECT public: @@ -41,7 +42,7 @@ public: TQString author, TQString license, TQString doc_remark, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui index b2a49e51..aa2bcb03 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui @@ -1,10 +1,10 @@ TitlePageForm - + TitlePage - + 0 0 @@ -25,7 +25,7 @@ 6 - + tiltle_group @@ -42,7 +42,7 @@ 6 - + label_title @@ -53,7 +53,7 @@ e_title - + e_title @@ -66,7 +66,7 @@ - + label_author @@ -77,7 +77,7 @@ e_author - + label_remark @@ -88,7 +88,7 @@ e_remark - + label_license @@ -109,7 +109,7 @@ Expanding - + 20 20 @@ -126,14 +126,14 @@ Expanding - + 20 20 - + e_remark @@ -146,7 +146,7 @@ - + e_author @@ -159,7 +159,7 @@ - + e_license @@ -182,5 +182,5 @@ e_license e_remark - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp index c89129b8..48fc09e1 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp @@ -40,11 +40,11 @@ TypeOptPage::TypeOptPage ( const vector &types, kvoctrainDoc *_doc, - TQWidget *parent, + TQWidget *tqparent, const char *name ) : - TypeOptPageForm( parent, name ), + TypeOptPageForm( tqparent, name ), doc(_doc) { connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) ); @@ -83,7 +83,7 @@ void TypeOptPage::slotNewType() { bool ok; TQString getType = KInputDialog::getText( - i18n( "Type Description" ), i18n( "Enter type description:" ), TQString::null, &ok ); + i18n( "Type Description" ), i18n( "Enter type description:" ), TQString(), &ok ); if( !ok ) return; TQString str; @@ -105,7 +105,7 @@ void TypeOptPage::slotModifyType() if (typeList->count() != 0 && (int) typeList->count() > act_type) { TQString str = typeList->text (act_type); - int pos = str.find (TYPE_TAG); + int pos = str.tqfind (TYPE_TAG); str.remove (0, pos+strlen (TYPE_TAG)); bool ok; TQString getType = KInputDialog::getText( @@ -126,7 +126,7 @@ void TypeOptPage::updateListBox(int start) TQString str, str2; for (int i = start; i < (int) typeList->count(); i++) { str = typeList->text (i); - int pos = str.find (TYPE_TAG); + int pos = str.tqfind (TYPE_TAG); str.remove (0, pos+strlen (TYPE_TAG)); str2.setNum (i+1); if (i <= 9) @@ -144,7 +144,7 @@ void TypeOptPage::slotDeleteType() TQString t; t.setNum(typeIndex[act_type]+1); - t.insert (0, QM_USER_TYPE); + t.insert (0, TQM_USER_TYPE); for (int ent = 0; ent < doc->numEntries(); ent++) { // FIXME: ProgressDlg here? kvoctrainExpr *exp = doc->getEntry(ent); @@ -179,7 +179,7 @@ void TypeOptPage::getTypeNames (vector &ret_type, vector &ret_Ind TQString str; ret_type.clear(); for (int i = 0; i < (int) typeList->count(); i++) { str = typeList->text(i); - int pos = str.find (TYPE_TAG); + int pos = str.tqfind (TYPE_TAG); str.remove (0, pos+strlen (TYPE_TAG)); ret_type.push_back (str); } @@ -196,7 +196,7 @@ void TypeOptPage::slotCleanup() for (int col = 0; col < doc->numLangs(); col++) for (int i = 0; i < (int) doc->numEntries(); i++) { TQString t = doc->getEntry(i)->getType(col); - if (t.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) { + if (t.left(strlen(TQM_USER_TYPE)) == TQM_USER_TYPE) { t.remove (0, 1); int idx = t.toInt(); if ((int) used_type.size() < idx) @@ -230,7 +230,7 @@ void TypeOptPage::cleanUnused(kvoctrainDoc *doc, const vector &typeIndex, i ///////////////////////////////////////////////////// // translate_index contains new index number for each // old index - for (int i = 0; i <= QMAX (old_types, (int) typeIndex.size()); i++) + for (int i = 0; i <= TQMAX (old_types, (int) typeIndex.size()); i++) translate_index.push_back(0); // now adjust lesson descriptions to new index @@ -248,14 +248,14 @@ void TypeOptPage::cleanUnused(kvoctrainDoc *doc, const vector &typeIndex, i for (int col = 0; col < doc->numLangs(); col++) { for (int i = 0; i < doc->numEntries(); i++) { TQString old = doc->getEntry(i)->getType (col); - if (!old.isEmpty() && old.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) { + if (!old.isEmpty() && old.left(strlen(TQM_USER_TYPE)) == TQM_USER_TYPE) { old.remove (0, 1); int o = old.toInt(); TQString newtype; if (translate_index[o] != 0) { newtype.setNum (translate_index[o]); - newtype.insert (0, QM_USER_TYPE); + newtype.insert (0, TQM_USER_TYPE); doc->getEntry(i)->setType (col, newtype); } else diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h index 68e50b26..7b550b6d 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h @@ -37,6 +37,7 @@ class TQStrList; class TypeOptPage : public TypeOptPageForm { Q_OBJECT + TQ_OBJECT public: @@ -44,7 +45,7 @@ public: ( const vector &types, kvoctrainDoc *doc, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui index f1735015..48141b18 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui @@ -1,10 +1,10 @@ TypeOptPageForm - + Type_Descriptions - + 0 0 @@ -25,7 +25,7 @@ 6 - + type_group @@ -52,14 +52,14 @@ Expanding - + 20 20 - + b_new @@ -75,7 +75,7 @@ &New... - + b_modify @@ -91,7 +91,7 @@ &Modify... - + b_delete @@ -107,7 +107,7 @@ &Delete - + b_cleanup @@ -123,7 +123,7 @@ &Clean Up - + typeList @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp index 96c4a093..76452f4b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp @@ -41,11 +41,11 @@ UsageOptPage::UsageOptPage ( const vector &usages, kvoctrainDoc *_doc, - TQWidget *parent, + TQWidget *tqparent, const char *name ) : - UsageOptPageForm( parent, name ), + UsageOptPageForm( tqparent, name ), doc(_doc) { connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); @@ -84,7 +84,7 @@ void UsageOptPage::slotNewUsage() { bool ok; TQString getUsage = KInputDialog::getText( - i18n( "usage (area) of an expression", "Usage Description" ), i18n( "Enter usage description:" ), TQString::null, &ok ); + i18n( "usage (area) of an expression", "Usage Description" ), i18n( "Enter usage description:" ), TQString(), &ok ); if( !ok ) return; TQString str; @@ -106,7 +106,7 @@ void UsageOptPage::slotModifyUsage() if (usageList->count() != 0 && (int) usageList->count() > act_usage) { TQString str = usageList->text (act_usage); - int pos = str.find (USAGE_TAG); + int pos = str.tqfind (USAGE_TAG); str.remove (0, pos+strlen (USAGE_TAG)); bool ok; @@ -129,7 +129,7 @@ void UsageOptPage::updateListBox(int start) for (int i = start; i < (int) usageList->count(); i++) { str = usageList->text (i); - int pos = str.find (USAGE_TAG); + int pos = str.tqfind (USAGE_TAG); str.remove (0, pos+strlen (USAGE_TAG)); str2.setNum (i+1); if (i <= 9) @@ -153,7 +153,7 @@ void UsageOptPage::slotDeleteUsage() kvoctrainExpr *exp = doc->getEntry(ent); for (int lang = 0; lang < doc->numLangs(); lang++) { TQString ul = exp->getUsageLabel(lang) + UL_USAGE_DIV; - if (ul.find(t) >= 0 ) { + if (ul.tqfind(t) >= 0 ) { KMessageBox::information(this, i18n("usage (area) of an expression", "This user-defined usage label could not be deleted " @@ -187,7 +187,7 @@ void UsageOptPage::getUsageLabels (vector &ret_usage, TQString str; ret_usage.clear(); for (int i = 0; i < (int) usageList->count(); i++) { str = usageList->text(i); - int pos = str.find (USAGE_TAG); + int pos = str.tqfind (USAGE_TAG); str.remove (0, pos+strlen (USAGE_TAG)); ret_usage.push_back (str); } @@ -209,7 +209,7 @@ void UsageOptPage::slotCleanup() t.remove (0, 1); int next; - if ((next = t.find(UL_USAGE_DIV)) >= 0) { + if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) { n = t.left(next); t.remove (0, next+1); } @@ -253,7 +253,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc, ///////////////////////////////////////////////////// // translate_index contains new index number for each // old index - for (int i = 0; i <= QMAX (old_usages, (int) usageIndex.size()); i++) + for (int i = 0; i <= TQMAX (old_usages, (int) usageIndex.size()); i++) translate_index.push_back(0); // now adjust lesson descriptions to new index @@ -277,7 +277,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc, TQString n; t.remove (0, 1); int next; - if ((next = t.find(UL_USAGE_DIV)) >= 0) { + if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) { n = t.left(next); t.remove (0, next+1); } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h index 8d669571..4a30b2d5 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h @@ -39,6 +39,7 @@ class TQStrList; class UsageOptPage : public UsageOptPageForm { Q_OBJECT + TQ_OBJECT public: @@ -46,7 +47,7 @@ public: ( const vector &usages, kvoctrainDoc *doc, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui index dbdf58fe..0d106b58 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui @@ -1,10 +1,10 @@ UsageOptPageForm - + Usage_Labels - + 0 0 @@ -25,7 +25,7 @@ 6 - + usage_group @@ -52,14 +52,14 @@ Expanding - + 20 20 - + b_new @@ -75,7 +75,7 @@ &New... - + b_modify @@ -91,7 +91,7 @@ &Modify... - + b_delete @@ -107,7 +107,7 @@ &Delete - + b_cleanup @@ -123,7 +123,7 @@ &Clean Up - + usageList @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp index 0bdae252..29380370 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp @@ -32,8 +32,8 @@ #include -AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent, const char *name) - : AdjEntryPageForm( parent, name ), dlgbook(_dlgbook) +AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent, const char *name) + : AdjEntryPageForm( tqparent, name ), dlgbook(_dlgbook) { comparisons = comp; diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h index efbae74f..3750fb3c 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h @@ -35,9 +35,10 @@ class EntryDlg; class AdjEntryPage : public AdjEntryPageForm { Q_OBJECT + TQ_OBJECT public: - AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent = NULL, const char *name = NULL); + AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent = NULL, const char *name = NULL); void setData (bool multi_sel, const Comparison &comp); diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui index a2213edb..4005b0c6 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui @@ -1,10 +1,10 @@ AdjEntryPageForm - + AdjEntryPageForm - + 0 0 @@ -25,7 +25,7 @@ 6 - + GroupBox1 @@ -42,7 +42,7 @@ 6 - + lev1Label @@ -61,7 +61,7 @@ lev1Field - + lev2Label @@ -80,7 +80,7 @@ lev2Field - + lev3Label @@ -99,7 +99,7 @@ lev3Field - + lev1Field @@ -112,7 +112,7 @@ - + lev2Field @@ -125,7 +125,7 @@ - + lev3Field @@ -142,5 +142,5 @@ - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp index 87e0fe59..a42e5d01 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp @@ -41,10 +41,10 @@ AuxInfoEntryPage::AuxInfoEntryPage TQString exam, TQString rem, TQString para, - TQWidget *parent, + TQWidget *tqparent, const char *name ) - : AuxInfoEntryPageForm( parent, name ), dlgbook(_dlgbook) + : AuxInfoEntryPageForm( tqparent, name ), dlgbook(_dlgbook) { TQFontMetrics fm (synonym_line->font()); diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h index e8e88535..59a62c28 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h @@ -33,6 +33,7 @@ class EntryDlg; class AuxInfoEntryPage : public AuxInfoEntryPageForm { Q_OBJECT + TQ_OBJECT public: AuxInfoEntryPage @@ -44,7 +45,7 @@ public: TQString example, TQString remark, TQString para, - TQWidget *parent = 0, + TQWidget *tqparent = 0, const char *name = 0 ); diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui index 632973bc..c936e8ce 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui @@ -1,10 +1,10 @@ AuxInfoEntryPageForm - + AuxInfoEntryPageForm - + 0 0 @@ -33,7 +33,7 @@ 6 - + GroupBox1 @@ -58,7 +58,7 @@ 6 - + examp_line @@ -70,14 +70,14 @@ 0 - + 32767 80 - + remark_line @@ -89,14 +89,14 @@ 0 - + 32767 80 - + para_line @@ -108,14 +108,14 @@ 0 - + 32767 80 - + synonym_label @@ -126,7 +126,7 @@ synonym_line - + antonym_label @@ -137,7 +137,7 @@ antonym_line - + examp_label @@ -148,7 +148,7 @@ examp_line - + remark_label @@ -159,7 +159,7 @@ remark_line - + para_label @@ -170,7 +170,7 @@ para_line - + synonym_line @@ -182,7 +182,7 @@ 0 - + 32767 80 @@ -195,7 +195,7 @@ - + antonym_line @@ -207,7 +207,7 @@ 0 - + 32767 80 @@ -225,5 +225,5 @@ remark_line para_line - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp index 9a7d44fb..6b4e8ea6 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp @@ -63,11 +63,11 @@ CommonEntryPage::CommonEntryPage QueryManager &_querymanager, bool active, const TQFont& _ipafont, - TQWidget *parent, + TQWidget *tqparent, const char *name ) : - CommonEntryPageForm( parent, name ), + CommonEntryPageForm( tqparent, name ), pronunce(pron), expression(expr), usageCollection (act_usage), @@ -177,13 +177,13 @@ void CommonEntryPage::setTypeBox(const TQString &act_type) all_types = QueryManager::getRelation(false); all_maintypes = QueryManager::getRelation(true); - TQString s = QueryManager::getMainType(act_type)+QM_TYPE_DIV; + TQString s = QueryManager::getMainType(act_type)+TQM_TYPE_DIV; int curr_type = 0; type_box->clear(); type_box->insertItem (i18n("")); for (int i = 0; i < (int) all_maintypes.size(); i++) { type_box->insertItem (all_maintypes[i].longStr()); - if (s == all_maintypes[i].shortStr()+QM_TYPE_DIV) + if (s == all_maintypes[i].shortStr()+TQM_TYPE_DIV) curr_type = i+1; } type_box->setCurrentItem(curr_type); @@ -208,7 +208,7 @@ void CommonEntryPage::setUsageBox(const TQString & act_usage) usage_box->clear(); for (int i = 0; i < (int) usages.size(); i++) { usage_box->insertItem (usages[i].longStr()); - if (UsageManager::contains(TQString(usages[i].identStr()), act_usage)) { + if (UsageManager::tqcontains(TQString(usages[i].identStr()), act_usage)) { usage_box->setSelected (i, true); } } @@ -293,7 +293,7 @@ void CommonEntryPage::slotTypeSelected(int idx) else { type = all_maintypes[idx-1].shortStr(); emit typeSelected(type); - TQString main_patt = all_maintypes[idx-1].shortStr()+QM_TYPE_DIV; + TQString main_patt = all_maintypes[idx-1].shortStr()+TQM_TYPE_DIV; int sub_idx; if ( idx-1 < (int) all_types.size() ){ for (sub_idx = 0; sub_idx < (int) all_types.size(); sub_idx++) { diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h index 9d3652d2..b20d59ce 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h @@ -37,6 +37,7 @@ class EntryDlg; class CommonEntryPage : public CommonEntryPageForm { Q_OBJECT + TQ_OBJECT public: CommonEntryPage @@ -55,7 +56,7 @@ public: QueryManager &querymanager, bool active, const TQFont& ipafont, - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui index 5e67f8a4..11c06fe1 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui @@ -1,10 +1,10 @@ CommonEntryPageForm - + CommonEntryPageForm - + 0 0 @@ -36,7 +36,7 @@ 6 - + asdf @@ -61,7 +61,7 @@ 6 - + Frame4 @@ -81,7 +81,7 @@ 6 - + expr_line @@ -94,7 +94,7 @@ - + pronunce_line @@ -107,7 +107,7 @@ - + lesson_box @@ -120,7 +120,7 @@ - + expr_label @@ -131,7 +131,7 @@ expr_line - + pronunce_label @@ -142,7 +142,7 @@ pronunce_line - + lesson_label @@ -153,7 +153,7 @@ lesson_box - + b_LessDlg @@ -165,13 +165,13 @@ 0 - + 30 0 - + 30 30 @@ -184,7 +184,7 @@ Invokes input dialog for lessons - + b_pronDlg @@ -196,13 +196,13 @@ 0 - + 30 0 - + 30 30 @@ -217,7 +217,7 @@ - + type_label @@ -234,7 +234,7 @@ 6 - + type_box @@ -257,14 +257,14 @@ Minimum - + 20 20 - + subtype_label @@ -275,7 +275,7 @@ subtype_box - + subtype_box @@ -288,7 +288,7 @@ - + b_TypeDlg @@ -300,13 +300,13 @@ 0 - + 30 0 - + 30 30 @@ -321,7 +321,7 @@ - + usage_label @@ -346,7 +346,7 @@ 6 - + b_usageDlg @@ -358,13 +358,13 @@ 0 - + 30 0 - + 30 24 @@ -387,14 +387,14 @@ Preferred - + 20 20 - + usage_box @@ -406,7 +406,7 @@ 0 - + 32767 90 @@ -416,7 +416,7 @@ Multi - + usage_line @@ -428,7 +428,7 @@ 0 - + 0 80 @@ -440,7 +440,7 @@ Sunken - + WordBreak|AlignTop|AlignLeft @@ -450,7 +450,7 @@ - + c_active @@ -475,5 +475,5 @@ b_usageDlg c_active - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp index c0b249aa..4de1b843 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp @@ -73,14 +73,14 @@ EntryDlg::EntryDlg( const TQString &title, bool active, const TQFont& ipafont, - TQWidget *parent, + TQWidget *tqparent, const char *name, bool modal) : - KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, parent, name, modal, false, + KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, tqparent, name, modal, false, KGuiItem(i18n("&Reset")), - KGuiItem(TQString::null, "view_left_right"), - KGuiItem(TQString::null, "view_top_bottom")) + KGuiItem(TQString(), "view_left_right"), + KGuiItem(TQString(), "view_top_bottom")) { mainwin = main; @@ -105,7 +105,7 @@ EntryDlg::EntryDlg( topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel, - i18n("Original &expression in %1:").arg(s), querymanager, active, + i18n("Original &expression in %1:").tqarg(s), querymanager, active, ipafont, page, name); topLayout->addWidget(comm_page); @@ -135,7 +135,7 @@ EntryDlg::EntryDlg( topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel, - i18n("Translated &expression in %1:").arg(s), querymanager, active, + i18n("Translated &expression in %1:").tqarg(s), querymanager, active, ipafont, page, name); topLayout->addWidget(comm_page); @@ -246,10 +246,10 @@ void EntryDlg::setData( if (origin) comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel, - i18n("Original &expression in %1:").arg(s), querymanager, active); + i18n("Original &expression in %1:").tqarg(s), querymanager, active); else comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel, - i18n("Translated &expression in %1:").arg(s), querymanager, active); + i18n("Translated &expression in %1:").tqarg(s), querymanager, active); adj_page->setData(multi_sel, comp); aux_page->setData(multi_sel, synonym, antonym, example, rem, paraphrase); @@ -269,16 +269,16 @@ void EntryDlg::updatePages(const TQString &type) { TQString main; int pos; - if ((pos = type.find (QM_TYPE_DIV)) < 0) // only use main type + if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0) // only use main type main = type; else main = type.left(pos); - if (main == QM_VERB) { + if (main == TQM_VERB) { tense_page->setEnabled(EntryDlg::EnableAll); adj_page->setEnabled(EntryDlg::EnableNone); } - else if (main == QM_ADJ) { + else if (main == TQM_ADJ) { tense_page->setEnabled(EntryDlg::EnableNone); adj_page->setEnabled(EntryDlg::EnableAll); } @@ -311,7 +311,7 @@ void EntryDlg::setEnabled(int enable) TQString type = comm_page->getType(); TQString main; int pos; - if ((pos = type.find (QM_TYPE_DIV)) < 0) // only use main type + if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0) // only use main type main = type; else main = type.left(pos); @@ -321,9 +321,9 @@ void EntryDlg::setEnabled(int enable) comm_page->setEnabled(EnableAll); aux_page->setEnabled(EnableAll); mc_page->setEnabled(EnableAll); - tense_page->setEnabled(main == QM_VERB ? EnableAll : EnableNone); + tense_page->setEnabled(main == TQM_VERB ? EnableAll : EnableNone); mc_page->setEnabled(EnableAll); - adj_page->setEnabled(main == QM_ADJ ? EnableAll : EnableNone); + adj_page->setEnabled(main == TQM_ADJ ? EnableAll : EnableNone); if (from_page != 0) from_page->setEnabled(EnableNone); if (to_page != 0) @@ -334,9 +334,9 @@ void EntryDlg::setEnabled(int enable) comm_page->setEnabled(enable); aux_page->setEnabled(enable); mc_page->setEnabled(enable); - tense_page->setEnabled(main == QM_VERB ? enable : EnableNone); + tense_page->setEnabled(main == TQM_VERB ? enable : EnableNone); mc_page->setEnabled(enable); - adj_page->setEnabled(main == QM_ADJ ? enable : EnableNone); + adj_page->setEnabled(main == TQM_ADJ ? enable : EnableNone); if (from_page != 0) from_page->setEnabled(enable); if (to_page != 0) diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h index 9850e107..04af7e7a 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h @@ -45,6 +45,7 @@ class kvoctrainDoc; class EntryDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: @@ -89,7 +90,7 @@ public: const TQString &title, bool active, const TQFont& ipafont, - TQWidget *parent = 0, + TQWidget *tqparent = 0, const char *name = 0, bool modal = false ); @@ -135,24 +136,24 @@ public: bool fromDateDirty () const { return from_page ? from_page->dateDirty() : false; } bool fromGradeDirty () const { return from_page ? from_page->gradeDirty() : false; } bool fromBCountDirty () const { return from_page ? from_page->bCountDirty() : false; } - bool fromQCountDirty () const { return from_page ? from_page->qCountDirty() : false; } + bool fromTQCountDirty () const { return from_page ? from_page->tqCountDirty() : false; } TQString getFromFauxAmi () const { return from_page ? from_page->getFauxAmi() : TQString(""); } time_t getFromDate () const { return from_page ? from_page->getDate() : 0; } grade_t getFromGrade () const { return from_page ? from_page->getGrade() : KV_NORM_GRADE; } count_t getFromBCount () const { return from_page ? from_page->getBCount() : 0; } - count_t getFromQCount () const { return from_page ? from_page->getQCount() : 0; } + count_t getFromTQCount () const { return from_page ? from_page->getTQCount() : 0; } bool toDateDirty () const { return to_page ? to_page->dateDirty() : false; } bool toGradeDirty () const { return to_page ? to_page->gradeDirty() : false; } bool toBCountDirty () const { return to_page ? to_page->bCountDirty() : false; } - bool toQCountDirty () const { return to_page ? to_page->qCountDirty() : false; } + bool toTQCountDirty () const { return to_page ? to_page->tqCountDirty() : false; } TQString getToFauxAmi () const { return to_page ? to_page->getFauxAmi() : TQString(""); } time_t getToDate () const { return to_page ? to_page->getDate() : 0; } grade_t getToGrade () const { return to_page ? to_page->getGrade() : KV_NORM_GRADE; } count_t getToBCount () const { return to_page ? to_page->getBCount() : 0; } - count_t getToQCount () const { return to_page ? to_page->getQCount() : 0; } + count_t getToTQCount () const { return to_page ? to_page->getTQCount() : 0; } bool lessonDirty () const { return comm_page->lessonDirty(); } bool usageDirty () const { return comm_page->usageDirty(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp index 0a8bd0cb..75018f70 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp @@ -54,11 +54,11 @@ FromToEntryPage::FromToEntryPage count_t _bcount, TQString faux, TQString label, - TQWidget *parent, + TQWidget *tqparent, const char *name ) : - FromToEntryPageForm( parent, name ), fauxami(faux), dlgbook(_dlgbook) + FromToEntryPageForm( tqparent, name ), fauxami(faux), dlgbook(_dlgbook) { monthnames.clear(); monthnames.append (""); @@ -76,7 +76,7 @@ FromToEntryPage::FromToEntryPage monthnames.append (i18n("December")); connect( bcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotBCount(const TQString&)) ); - connect( qcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotQCount(const TQString&)) ); + connect( qcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTQCount(const TQString&)) ); connect( fauxami_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFauxAmiSelected(const TQString&)) ); connect( never, TQT_SIGNAL(clicked()), TQT_SLOT(slotNever()) ); @@ -137,9 +137,9 @@ void FromToEntryPage::setData( day_spin->setValue(day); month_spin->setValue(month); year_spin->setValue(year); - year_spin->setSpecial(TQString::null); - month_spin->setSpecial(TQString::null); - day_spin->setSpecial(TQString::null); + year_spin->setSpecial(TQString()); + month_spin->setSpecial(TQString()); + day_spin->setSpecial(TQString()); } else { dt.setTime_t (time(0L)); @@ -200,7 +200,7 @@ void FromToEntryPage::slotGradeSelected (int g) } -void FromToEntryPage::slotQCount(const TQString& s) +void FromToEntryPage::slotTQCount(const TQString& s) { setModified(true); qcount_dirty = true; @@ -249,7 +249,7 @@ void FromToEntryPage::slotYearChanged(int new_year) new_year = year; } - year_spin->setSpecial(TQString::null); + year_spin->setSpecial(TQString()); year = new_year; validate(); @@ -278,7 +278,7 @@ void FromToEntryPage::slotMonthChanged(int new_month) new_month = month; } - month_spin->setSpecial(TQString::null); + month_spin->setSpecial(TQString()); month = new_month; validate(); @@ -306,7 +306,7 @@ void FromToEntryPage::slotDayChanged(int new_day) new_day = day; } - day_spin->setSpecial(TQString::null); + day_spin->setSpecial(TQString()); day = new_day; validate(); @@ -339,9 +339,9 @@ void FromToEntryPage::slotToday() day_spin->setValue(day); month_spin->setValue(month); year_spin->setValue(year); - year_spin->setSpecial(TQString::null); - month_spin->setSpecial(TQString::null); - day_spin->setSpecial(TQString::null); + year_spin->setSpecial(TQString()); + month_spin->setSpecial(TQString()); + day_spin->setSpecial(TQString()); validate(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h index 238f4462..16a1980c 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h @@ -38,6 +38,7 @@ class EntryDlg; class FromToEntryPage : public FromToEntryPageForm { Q_OBJECT + TQ_OBJECT public: @@ -51,7 +52,7 @@ public: count_t _bcount, TQString faux, TQString label, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); @@ -66,12 +67,12 @@ public: time_t dateDirty () const { return date_dirty; } grade_t gradeDirty () const { return grade_dirty; } - count_t qCountDirty () const { return qcount_dirty; } + count_t tqCountDirty () const { return qcount_dirty; } count_t bCountDirty () const { return bcount_dirty; } time_t getDate () const; grade_t getGrade () const { return grade; } - count_t getQCount () const { return qcount; } + count_t getTQCount () const { return qcount; } count_t getBCount () const { return bcount; } TQString getFauxAmi () const { return fauxami; } @@ -85,7 +86,7 @@ signals: protected slots: void slotGradeSelected(int); - void slotQCount(const TQString&); + void slotTQCount(const TQString&); void slotBCount(const TQString&); void slotIncYear(); diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui index 9fea8f70..48e4db86 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui @@ -1,10 +1,10 @@ FromToEntryPageForm - + FromToEntryPageForm - + 0 0 @@ -25,7 +25,7 @@ 6 - + direc_label @@ -42,7 +42,7 @@ 6 - + Frame3 @@ -72,14 +72,14 @@ Expanding - + 20 20 - + gradebox @@ -92,7 +92,7 @@ - + fauxami_line @@ -105,7 +105,7 @@ - + fauxami_label @@ -116,7 +116,7 @@ fauxami_line - + grade_label @@ -129,7 +129,7 @@ - + GroupBox2 @@ -150,7 +150,7 @@ year_spin - + 60 0 @@ -161,7 +161,7 @@ month_spin - + 110 0 @@ -172,7 +172,7 @@ day_spin - + 60 0 @@ -189,14 +189,14 @@ Expanding - + 20 20 - + today @@ -204,7 +204,7 @@ T&oday - + never @@ -214,7 +214,7 @@ - + GroupBox3 @@ -231,7 +231,7 @@ 6 - + bcount_label @@ -242,7 +242,7 @@ bcount_line - + qcount_label @@ -253,7 +253,7 @@ qcount_line - + qcount_line @@ -266,7 +266,7 @@ - + bcount_line @@ -316,5 +316,5 @@ qcount_line bcount_line - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp index a6967704..c58448c4 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp @@ -32,8 +32,8 @@ #include -MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent, const char *name) - : MCEntryPageForm( parent, name ), dlgbook(_dlgbook) +MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent, const char *name) + : MCEntryPageForm( tqparent, name ), dlgbook(_dlgbook) { multiplechoice = mc; diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h index c2938814..78aa4fc8 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h @@ -35,9 +35,10 @@ class EntryDlg; class MCEntryPage : public MCEntryPageForm { Q_OBJECT + TQ_OBJECT public: - MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent = NULL, const char *name = NULL); + MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent = NULL, const char *name = NULL); void setData(bool multi_sel, const MultipleChoice &mc); diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui index b03b2de6..1bb29a55 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui @@ -1,10 +1,10 @@ MCEntryPageForm - + MCEntryPageForm - + 0 0 @@ -25,7 +25,7 @@ 6 - + GroupBox1 @@ -42,7 +42,7 @@ 6 - + mc1Label @@ -61,7 +61,7 @@ mc1Field - + mc2Label @@ -80,7 +80,7 @@ mc2Field - + mc3Label @@ -99,7 +99,7 @@ mc3Field - + mc1Field @@ -112,7 +112,7 @@ - + mc2Field @@ -125,7 +125,7 @@ - + mc3Field @@ -138,7 +138,7 @@ - + mc5Field @@ -151,7 +151,7 @@ - + mc4Field @@ -164,7 +164,7 @@ - + mc4Label @@ -183,7 +183,7 @@ mc4Field - + mc5Label @@ -213,5 +213,5 @@ mc4Field mc5Field - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp index 9e7c7450..dc91a9cc 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp @@ -27,7 +27,7 @@ #include "MySpinBox.h" -MySpinBox::MySpinBox (TQWidget* parent, const char* name ): TQSpinBox(parent, name ), spin_names (0) +MySpinBox::MySpinBox (TQWidget* tqparent, const char* name ): TQSpinBox(tqparent, name ), spin_names (0) { setWrapping(true); } @@ -48,7 +48,7 @@ TQString MySpinBox::mapValueToText( int value ) if (spin_names != 0) return (*spin_names)[value]; else - return TQString("%1").arg(value); + return TQString("%1").tqarg(value); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h index f17ba8ba..dedb0914 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h +++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h @@ -28,12 +28,12 @@ #include -class QStringlist; +class TQStringlist; -class MySpinBox : public QSpinBox +class MySpinBox : public TQSpinBox { public: - MySpinBox (TQWidget* parent = 0, const char* name = 0); + MySpinBox (TQWidget* tqparent = 0, const char* name = 0); void setSpecial(const TQString &str); void setData (TQStringList *names, int minValue, int maxValue); diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index 47487624..b2fd3be8 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp @@ -43,11 +43,11 @@ struct KV_Unicode_Ref { wchar_t code; - const char *unicodename; + const char *tqunicodename; const char *audible; }; -KV_Unicode_Ref kv_unicode_ref[] = { +KV_Unicode_Ref kv_tqunicode_ref[] = { {0x00E6, "LATIN SMALL LETTER AE", I18N_NOOP_maybe("")}, {0x00E7, "LATIN SMALL LETTER C WITH CEDILLA", I18N_NOOP_maybe("")}, @@ -116,7 +116,7 @@ KV_Unicode_Ref kv_unicode_ref[] = { {0x0282, "LATIN SMALL LETTER S WITH HOOK", I18N_NOOP_maybe("voiceless retroflex fricative")}, {0x0283, "LATIN SMALL LETTER ESH", I18N_NOOP_maybe("voiceless postalveolar fricative")}, {0x0284, "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK", I18N_NOOP_maybe("implosive palatal stop")}, - {0x0285, "LATIN SMALL LETTER SQUAT REVERSED ESH", I18N_NOOP_maybe("apical retroflex vowel")}, + {0x0285, "LATIN SMALL LETTER STQUAT REVERSED ESH", I18N_NOOP_maybe("apical retroflex vowel")}, {0x0286, "LATIN SMALL LETTER ESH WITH CURL", I18N_NOOP_maybe("palatalized voiceless postalveolar fricative")}, {0x0287, "LATIN SMALL LETTER TURNED T", I18N_NOOP_maybe("dental click")}, {0x0288, "LATIN SMALL LETTER T WITH RETROFLEX HOOK", I18N_NOOP_maybe("voiceless retroflex stop")}, @@ -171,18 +171,18 @@ KV_Unicode_Ref kv_unicode_ref[] = { void PhoneticButton::slotClicked() { if (text().length() != 0) - emit page->charSelected(text()[0].unicode()); + emit page->charSelected(text()[0].tqunicode()); } -PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, const char *name, bool modal) - : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, parent, name, modal) +PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent, const char *name, bool modal) + : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, tqparent, name, modal) { - int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_ref[0]); + int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]); TQFrame * phoneticbox = plainPage(); TQGridLayout *gbox = new TQGridLayout(phoneticbox, KV_MAX_HORIZ, (num+KV_MAX_HORIZ-1)/KV_MAX_HORIZ, 1); - KV_Unicode_Ref *uni_ref = kv_unicode_ref; + KV_Unicode_Ref *uni_ref = kv_tqunicode_ref; int vert = 0; int horiz = 0; while (uni_ref->code != 0) { @@ -191,13 +191,13 @@ 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::fromLatin1(uni_ref->unicodename); + tip += TQString::tqfromLatin1(uni_ref->tqunicodename); tip += "\n"; tip += i18n("Describing the sound of the character", "Sound: "); tip += i18n(uni_ref->audible); butt->setFont(ipafont); - butt->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); - int sz = QMAX(14, int(1.7*ipafont.pointSize())); + butt->tqsetSizePolicy(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 ); TQToolTip::add (butt, tip); @@ -208,7 +208,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co } ++uni_ref; } - resize(sizeHint()); + resize(tqsizeHint()); } @@ -217,7 +217,7 @@ void PhoneticEntryPage::keyPressEvent( TQKeyEvent *e ) if ((e->state() & (ControlButton | AltButton)) == 0) { TQString s = e->text(); for (unsigned i = 0; i < s.length(); ++i) { - emit charSelected(s[i].unicode()); + emit charSelected(s[i].tqunicode()); } e->accept(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h index d2747015..c422c98a 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h @@ -34,9 +34,10 @@ class PhoneticEntryPage : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent = 0, const char *name = 0, bool modal = false); + PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent = 0, const char *name = 0, bool modal = false); signals: void charSelected(wchar_t); @@ -48,13 +49,14 @@ protected: }; -class PhoneticButton : public QPushButton +class PhoneticButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - PhoneticButton (const TQString & text, TQWidget * parent, PhoneticEntryPage *_page, const char * name = 0) - : TQPushButton (text, parent, name), page(_page) {} + PhoneticButton (const TQString & text, TQWidget * tqparent, PhoneticEntryPage *_page, const char * name = 0) + : TQPushButton (text, tqparent, name), page(_page) {} protected slots: void slotClicked(); diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp index c8c7d41e..f4823178 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp @@ -39,10 +39,10 @@ TenseEntryPage::TenseEntryPage bool multi_sel, const Conjugation &con_prefix, const Conjugation &conjug, - TQWidget *parent, + TQWidget *tqparent, const char *name ) - : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook) + : TenseEntryPageForm( tqparent, name ), multi_mode(multi_sel), dlgbook(_dlgbook) { connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) ); diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h index 94e7a74c..2473d36c 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h @@ -35,6 +35,7 @@ class EntryDlg; class TenseEntryPage : public TenseEntryPageForm { Q_OBJECT + TQ_OBJECT public: TenseEntryPage @@ -43,7 +44,7 @@ public: bool multi_sel, const Conjugation &con_prefix, const Conjugation &conjugations, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui index 1c3c4ee5..d0ccdc74 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui @@ -1,10 +1,10 @@ TenseEntryPageForm - + TenseEntryPageForm - + 0 0 @@ -25,7 +25,7 @@ 6 - + GroupBox8 @@ -42,15 +42,15 @@ 6 - + - layout3 + tqlayout3 unnamed - + thirdN_plural @@ -63,7 +63,7 @@ - + third_p_common @@ -71,7 +71,7 @@ C&ommon - + second_plural @@ -84,7 +84,7 @@ - + thirdM_plural @@ -97,7 +97,7 @@ - + third_s_common @@ -105,7 +105,7 @@ &Common - + pers1_label @@ -124,7 +124,7 @@ first_singular - + female_label @@ -135,7 +135,7 @@ thirdF_singular - + TextLabel4_2_2 @@ -143,7 +143,7 @@ Singular - + thirdF_plural @@ -156,7 +156,7 @@ - + thirdF_singular @@ -169,7 +169,7 @@ - + pers3_label @@ -180,7 +180,7 @@ third_s_common - + first_plural @@ -193,7 +193,7 @@ - + thirdM_singular @@ -206,7 +206,7 @@ - + first_singular @@ -229,14 +229,14 @@ Fixed - + 80 20 - + thirdN_singular @@ -249,7 +249,7 @@ - + natural_label @@ -260,7 +260,7 @@ thirdN_singular - + male_label @@ -271,7 +271,7 @@ thirdM_singular - + second_singular @@ -284,7 +284,7 @@ - + pers2_label @@ -295,7 +295,7 @@ second_singular - + TextLabel4_2 @@ -305,15 +305,15 @@ - + - layout5 + tqlayout5 unnamed - + tenselabel @@ -332,7 +332,7 @@ tensebox - + b_next @@ -348,7 +348,7 @@ Ne&xt - + tensebox @@ -383,5 +383,5 @@ thirdM_plural thirdN_plural - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/blockall.h b/kvoctrain/kvoctrain/entry-dialogs/blockall.h index f71230f6..f7d2747d 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/blockall.h +++ b/kvoctrain/kvoctrain/entry-dialogs/blockall.h @@ -28,7 +28,7 @@ #include -class BlockAllValidator : public QValidator +class BlockAllValidator : public TQValidator { public: BlockAllValidator (); diff --git a/kvoctrain/kvoctrain/kv_resource.h b/kvoctrain/kvoctrain/kv_resource.h index 6f704913..59318424 100644 --- a/kvoctrain/kvoctrain/kv_resource.h +++ b/kvoctrain/kvoctrain/kv_resource.h @@ -51,7 +51,7 @@ static const char *IDS_DEFAULT = I18N_NOOP("Ready."); #define IDH_NULL 0 #define IDH_REMOVE 1 #define IDH_APPEND 2 -#define IDH_START_QUERY 3 +#define IDH_START_TQUERY 3 #define IDH_RESET_GRADE 4 #define IDH_CREATE_LESSON 5 #define IDH_SET_LANG 6 @@ -65,7 +65,7 @@ static const char *IDS_DEFAULT = I18N_NOOP("Ready."); #define IDH_START_ANTONYM 14 #define IDH_START_EXAMPLE 15 #define IDH_START_PARAPHRASE 16 -#define ID_RESUME_QUERY 13070 +#define ID_RESUME_TQUERY 13070 #define ID_RESUME_MULTIPLE 13110 diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp index d441cc2e..12dbc3da 100644 --- a/kvoctrain/kvoctrain/kva_clip.cpp +++ b/kvoctrain/kvoctrain/kva_clip.cpp @@ -38,12 +38,12 @@ using namespace std; void kvoctrainApp::slotSmartSearchClip() { TQString s; - TQString entries = TQApplication::clipboard()->text(); + TQString entries = TQApplication::tqclipboard()->text(); if (!entries.isEmpty()) { - int pos = entries.find ('\n'); // search for a line end + int pos = entries.tqfind ('\n'); // search for a line end if (pos < 0) - pos = entries.find ('\r'); + pos = entries.tqfind ('\r'); if (pos < 0) // just first "line" s = entries; @@ -148,11 +148,11 @@ void kvoctrainApp::slotEditCopy() } if (!exp.isEmpty()) { #if defined(_WS_X11_) -// disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0); +// disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),this,0); #endif - TQApplication::clipboard()->setText(exp); + TQApplication::tqclipboard()->setText(exp); #if defined(_WS_X11_) -// connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); +// connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); #endif } @@ -167,7 +167,7 @@ void kvoctrainApp::slotEditPaste() TQApplication::setOverrideCursor( waitCursor ); TQString s; - TQString entries = TQApplication::clipboard()->text(); + TQString entries = TQApplication::tqclipboard()->text(); vector csv_order = getCsvOrder(doc); @@ -175,9 +175,9 @@ void kvoctrainApp::slotEditPaste() TQString num; // view->setView(0, langset, gradecols); while (!entries.isEmpty()) { - int pos = entries.find ('\n'); // search for a line end + int pos = entries.tqfind ('\n'); // search for a line end if (pos < 0) { - pos = entries.find ('\r'); // mac style ? + pos = entries.tqfind ('\r'); // mac style ? } if (pos < 0) { diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp index 875ecd04..c5ebcfc3 100644 --- a/kvoctrain/kvoctrain/kva_config.cpp +++ b/kvoctrain/kvoctrain/kva_config.cpp @@ -123,19 +123,19 @@ void kvoctrainApp::saveProperties(KConfig *config ) config->writeEntry(CFG_TITLE,doc->getTitle()); config->writeEntry(CFG_MODIFIED,doc->isModified()); - config->writeEntry(CFG_QUERYMODE, querymode); + config->writeEntry(CFG_TQUERYMODE, querymode); TQString filename=doc->URL().path(); TQString tempname = kapp->tempSaveName(filename); saveDocProps(doc); - doc->saveAs(this, KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic); + doc->saveAs(TQT_TQOBJECT(this), KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic); } } void kvoctrainApp::readProperties(KConfig *config) { - querymode = config->readBoolEntry(CFG_QUERYMODE, 0); + querymode = config->readBoolEntry(CFG_TQUERYMODE, 0); TQString filename = config->readEntry(CFG_FILENAME); TQString title = config->readEntry(CFG_TITLE); @@ -147,7 +147,7 @@ void kvoctrainApp::readProperties(KConfig *config) if(b_canRecover){ pdlg = new ProgressDlg(TQString(), TQString(), kapp->makeStdCaption("")); pdlg->show(); - doc = new kvoctrainDoc(this, KURL(tempname)); + doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(tempname)); removeProgressBar(); doc->setModified(); doc->setTitle(title); @@ -160,7 +160,7 @@ void kvoctrainApp::readProperties(KConfig *config) pdlg = new ProgressDlg (TQString(), TQString(), kapp->makeStdCaption("")); pdlg->show(); - doc = new kvoctrainDoc(this, KURL(filename)); + doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(filename)); removeProgressBar(); setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); } diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp index d1572659..7faa3dad 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(slotHeaderStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); header_m->exec(TQPoint (x, y)); return; @@ -90,15 +90,15 @@ 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(slotHeaderStatus(int))); + connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); header_m = new TQPopupMenu(); if (header != KV_COL_ORG - KV_EXTRA_COLS ) { - header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_QUERY); + header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_TQUERY); header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), (header << 16) | IDH_START_MULTIPLE); header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, doc->numLangs() > 1); - header_m->setItemEnabled((header << 16) | IDH_START_QUERY, doc->numLangs() > 1); + header_m->setItemEnabled((header << 16) | IDH_START_TQUERY, doc->numLangs() > 1); header_m->insertSeparator(); header_m->insertItem(i18n("&Verbs"), (header << 16) | IDH_START_VERB); header_m->insertItem(i18n("&Articles"), (header << 16) | IDH_START_ARTICLE); @@ -134,27 +134,27 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ if((j = langset.indexShortId(doc->getIdent(i))) >= 0 && !langset.PixMapFile(j).isEmpty() && !langset.longId(j).isEmpty() ) { - query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]), - (i << (16+8)) | IDH_START_QUERY); // hack: IDs => header-ids + cmd + query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(names[i-1]), + (i << (16+8)) | IDH_START_TQUERY); // hack: IDs => header-ids + cmd } else { - query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_QUERY); + query_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) | IDH_START_TQUERY); } } 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(slotHeaderStatus(int))); + connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available int j; if((j = langset.indexShortId(doc->getIdent(i))) >= 0 && !langset.PixMapFile(j).isEmpty() && !langset.longId(j).isEmpty() ) { - multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]), + multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(names[i-1]), (i << (16+8)) | IDH_START_MULTIPLE); // hack: IDs => header-ids + cmd } else { - multiple_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_MULTIPLE); + multiple_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) | IDH_START_MULTIPLE); } } header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), multiple_m, (4 << 16) | IDH_NULL); @@ -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(slotHeaderStatus(int))); + connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(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(slotHeaderStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); header_m->exec(TQPoint(x, y)); } @@ -226,7 +226,7 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/ } -void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ +void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ { int header1 = (header_and_cmd >> 16) & 0xFF; int header2 = header_and_cmd >> (16+8); @@ -238,7 +238,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ case IDH_NULL: break; - case ID_RESUME_QUERY: + case ID_RESUME_TQUERY: slotStatusHelpMsg(i18n("Resumes random query with existing selection")); break; @@ -262,11 +262,11 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ TQString msg; if (header1 == 0) { TQString format = i18n("Sets %1 as language for original"); - msg = format.arg(from); + msg = format.tqarg(from); } else { TQString format = i18n("Sets %1 as language for translation %2"); - msg = format.arg(from).arg(header1); + msg = format.tqarg(from).tqarg(header1); } slotStatusHelpMsg(msg); } @@ -282,7 +282,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ else if (header1 < (int) langset.size() ) { TQString from = langset.longId(header1); TQString format = i18n("Appends %1 as new language"); - msg = format.arg(from); + msg = format.tqarg(from); slotStatusHelpMsg(msg); } } @@ -294,12 +294,12 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ from = langset.findLongId(from); TQString msg; TQString format = i18n("Removes %1 irrevocably from dictionary"); - msg = format.arg(from); + msg = format.tqarg(from); slotStatusHelpMsg(msg); } break; - case IDH_START_QUERY: + case IDH_START_TQUERY: case IDH_START_MULTIPLE: { TQString to = header1 ? doc->getIdent(header1) : doc->getOriginalIdent(); if (!langset.findLongId(to).isEmpty()) @@ -313,18 +313,18 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ TQString format; if (doc->numLangs() == 1) { - if (cmd == IDH_START_QUERY) + if (cmd == IDH_START_TQUERY) format = i18n("Creates and starts query to %1"); else format = i18n("Creates and starts multiple choice to %1"); - msg = format.arg(to); + msg = format.tqarg(to); } else { - if (cmd == IDH_START_QUERY) + if (cmd == IDH_START_TQUERY) format = i18n("Creates and starts query from %1 to %2"); else format = i18n("Creates and starts multiple choice from %1 to %2"); - msg = format.arg(from).arg(to); + msg = format.tqarg(from).tqarg(to); } slotStatusHelpMsg(msg); @@ -376,13 +376,13 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ if (!langset.findLongId(from).isEmpty()) from = langset.findLongId(from); TQString format = i18n("Resets all properties for %1"); - TQString msg = format.arg(from); + TQString msg = format.tqarg(from); slotStatusHelpMsg(msg); } break; default: - kdError() << "kvoctrainApp::slotHeaderStatus: got unknown command :" << cmd << endl; + kdError() << "kvoctrainApp::slotHeadertqStatus: got unknown command :" << cmd << endl; } } @@ -421,13 +421,13 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ case IDH_NULL: break; - case ID_RESUME_QUERY: - queryType = QT_Random; + case ID_RESUME_TQUERY: + queryType = TQT_Random; slotRestartQuery(); break; case ID_RESUME_MULTIPLE: - queryType = QT_Multiple; + queryType = TQT_Multiple; slotRestartQuery(); break; @@ -443,7 +443,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ TQString format = i18n("You are about to delete a language completely.\n" "Do you really want to delete \"%1\"?"); - msg = format.arg(name); + msg = format.tqarg(name); int exit = KMessageBox::warningContinueCancel(this, msg, kapp->makeStdCaption(""),KStdGuiItem::del()); @@ -455,10 +455,10 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ } break; - case IDH_START_QUERY: + case IDH_START_TQUERY: delete randomQueryDlg; randomQueryDlg = 0; - queryType = QT_Random; + queryType = TQT_Random; slotStartQuery(header1 ? doc->getIdent(header1) : doc->getOriginalIdent(), header2 ? doc->getIdent(header2) : doc->getOriginalIdent(), true); break; @@ -466,7 +466,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ case IDH_START_MULTIPLE: delete mcQueryDlg; mcQueryDlg = 0; - queryType = QT_Multiple; + queryType = TQT_Multiple; slotStartQuery(header1 ? doc->getIdent(header1) : doc->getOriginalIdent(), header2 ? doc->getIdent(header2) : doc->getOriginalIdent(), true); break; @@ -474,52 +474,52 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ case IDH_START_VERB: { delete verbQueryDlg; verbQueryDlg = 0; - queryType = QT_Conjugation; - slotStartTypeQuery (header1, QM_VERB); + queryType = TQT_Conjugation; + slotStartTypeQuery (header1, TQM_VERB); } break; case IDH_START_ARTICLE: { delete artQueryDlg; artQueryDlg = 0; - queryType = QT_Articles; - slotStartTypeQuery (header1, QM_NOUN); + queryType = TQT_Articles; + slotStartTypeQuery (header1, TQM_NOUN); } break; case IDH_START_ADJECTIVE: { delete adjQueryDlg; adjQueryDlg = 0; - queryType = QT_Comparison; - slotStartTypeQuery (header1, QM_ADJ); + queryType = TQT_Comparison; + slotStartTypeQuery (header1, TQM_ADJ); } break; case IDH_START_SYNONYM: { delete simpleQueryDlg; simpleQueryDlg = 0; - slotStartPropertyQuery (header1, QT_Synonym); + slotStartPropertyQuery (header1, TQT_Synonym); } break; case IDH_START_ANTONYM: { delete simpleQueryDlg; simpleQueryDlg = 0; - slotStartPropertyQuery (header1, QT_Antonym); + slotStartPropertyQuery (header1, TQT_Antonym); } break; case IDH_START_EXAMPLE: { delete simpleQueryDlg; simpleQueryDlg = 0; - slotStartPropertyQuery (header1, QT_Example); + slotStartPropertyQuery (header1, TQT_Example); } break; case IDH_START_PARAPHRASE: { delete simpleQueryDlg; simpleQueryDlg = 0; - slotStartPropertyQuery (header1, QT_Paraphrase); + slotStartPropertyQuery (header1, TQT_Paraphrase); } break; @@ -548,7 +548,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ "lesson.\n\nDo you really want to reset \"%1\"?"); } - msg = format.arg(name); + msg = format.tqarg(name); int exit = KMessageBox::warningContinueCancel(this, msg, kapp->makeStdCaption(""),i18n("Reset")); diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index c1b3ebe8..bf9d1d9e 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -40,8 +40,8 @@ #include "prefs.h" -kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name) -: KMainWindow(parent, name) +kvoctrainApp::kvoctrainApp(TQWidget *tqparent, const char *name) +: KMainWindow(tqparent, name) { doc = 0; view = 0; @@ -98,128 +98,128 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name) void kvoctrainApp::initActions() { - fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setToolTip(fileNew->whatsThis()); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenExample = new KAction(i18n("Open &Example..."), "fileopen", 0, this, TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); + fileOpenExample = new KAction(i18n("Open &Example..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); fileOpen->setWhatsThis(i18n("Open a vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns"); + fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileMerge = new KAction(i18n("&Merge..."), 0, 0, this, TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge"); + fileMerge = new KAction(i18n("&Merge..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge"); fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one")); fileMerge->setToolTip(fileOpen->whatsThis()); - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); + fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); fileSave->setWhatsThis(i18n("Save the active vocabulary document")); fileSave->setToolTip(fileSave->whatsThis()); - fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs->setWhatsThis(i18n("Save the active vocabulary document with a different name")); fileSaveAs->setToolTip(fileSaveAs->whatsThis()); - filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); + filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); filePrint->setWhatsThis(i18n("Print the active vocabulary document")); filePrint->setToolTip(filePrint->whatsThis()); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); fileQuit->setWhatsThis(i18n("Quit KVocTrain")); fileQuit->setToolTip(fileQuit->whatsThis()); - editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); + editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); editCopy->setWhatsThis(i18n("Copy")); editCopy->setToolTip(editCopy->whatsThis()); - editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); + editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); editPaste->setWhatsThis(i18n("Paste")); editPaste->setToolTip(editPaste->whatsThis()); - editSelectAll = KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection()); + editSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); editSelectAll->setWhatsThis(i18n("Select all rows")); editSelectAll->setToolTip(editSelectAll->whatsThis()); - editClearSelection = KStdAction::deselect(this, TQT_SLOT(slotCancelSelection()), actionCollection()); + editClearSelection = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotCancelSelection()), actionCollection()); editClearSelection->setWhatsThis(i18n("Deselect all rows")); editClearSelection->setToolTip(editClearSelection->whatsThis()); - editSearchFromClipboard = KStdAction::find(this, TQT_SLOT(slotSmartSearchClip()), actionCollection()); + editSearchFromClipboard = KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotSmartSearchClip()), actionCollection()); editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary")); editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis()); - editAppend = new KAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append"); + editAppend = new KAction(i18n("&Append New Entry"), "insert_table_row", "Insert", TQT_TQOBJECT(this), TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append"); editAppend->setWhatsThis(i18n("Append a new row to the vocabulary")); editAppend->setToolTip(editAppend->whatsThis()); - editEditSelectedArea = new KAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area"); + editEditSelectedArea = new KAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", TQT_TQOBJECT(this), TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area"); editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows")); editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis()); - editRemoveSelectedArea = new KAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area"); + editRemoveSelectedArea = new KAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area"); editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows")); editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis()); - editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), KGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, this, TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); + editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), KGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary")); editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis()); - vocabShowStatistics = new KAction(i18n("Show &Statistics"), "statistics", 0, this, TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics"); + vocabShowStatistics = new KAction(i18n("Show &Statistics"), "statistics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics"); vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary")); vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis()); - vocabAssignLessons = new KAction(i18n("Assign L&essons..."), "rand_less", 0, this, TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons"); + vocabAssignLessons = new KAction(i18n("Assign L&essons..."), "rand_less", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons"); vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries")); vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis()); - vocabCleanUp = new KAction(i18n("&Clean Up"), "cleanup", 0, this, TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up"); + vocabCleanUp = new KAction(i18n("&Clean Up"), "cleanup", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up"); vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary")); vocabCleanUp->setToolTip(vocabCleanUp->whatsThis()); vocabAppendLanguage = new KSelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language"); - connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabAppendLanguage())); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAppendLang(int))); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + 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))); vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language"); - connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabSetLanguage())); + connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage())); vocabRemoveLanguage = new KSelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language"); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabRemoveLanguage())); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + 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))); - vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, this, TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); + vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); vocabDocumentProperties->setWhatsThis(i18n("Edit document properties")); vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis()); - vocabLanguageProperties = new KAction(i18n("Lan&guage Properties"), 0, 0, this, TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties"); + vocabLanguageProperties = new KAction(i18n("Lan&guage Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties"); vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document")); vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis()); lessons = new KComboBox(this); lessons->setMinimumWidth(160); connect(lessons, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotChooseLesson(int))); - lessons->setFocusPolicy(TQWidget::NoFocus); + lessons->setFocusPolicy(TQ_NoFocus); - vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, this, 0, actionCollection(), "vocab_lessons"); + vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_lessons"); vocabLessons->setWhatsThis(i18n("Choose current lesson")); vocabLessons->setToolTip(vocabLessons->whatsThis()); searchLine = new KLineEdit(this); - searchLine->setFocusPolicy(TQWidget::ClickFocus); + searchLine->setFocusPolicy(TQ_ClickFocus); connect (searchLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchNext())); connect (searchLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotResumeSearch(const TQString&))); - vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, this, 0, actionCollection(), "vocab_search"); + vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_search"); vocabSearch->setAutoSized(true); vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text ")); vocabSearch->setToolTip(vocabSearch->whatsThis()); @@ -232,7 +232,7 @@ void kvoctrainApp::initActions() //learningResumeMultipleChoice->setWhatsThis(i18n("")); learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis()); */ - configApp = KStdAction::preferences(this, TQT_SLOT( slotGeneralOptions()), actionCollection()); + configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotGeneralOptions()), actionCollection()); configApp->setWhatsThis(i18n("Show the configuration dialog")); configApp->setToolTip(configApp->whatsThis()); @@ -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(minimumSizeHint())); + resize( TQSize(550, 400).expandedTo(tqminimumSizeHint())); 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(slotHeaderStatus(int))); + connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn())); } @@ -280,9 +280,9 @@ void kvoctrainApp::initStatusBar() void kvoctrainApp::initDoc( ) { if (fileOpenRecent->items().count() > 0) - doc = new kvoctrainDoc(this, fileOpenRecent->items()[0]); + doc = new kvoctrainDoc(TQT_TQOBJECT(this), fileOpenRecent->items()[0]); else - doc = new kvoctrainDoc(this, KURL("")); + doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL("")); loadDocProps(doc); if (doc->numLangs() == 0) diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index c809cc3a..22c75a4e 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -46,7 +46,7 @@ static const char *PATTERN_ALL = I18N_NOOP("*|All Files (*)\n"); static const char *PATTERN_ML = I18N_NOOP("*.kvtml|KVocTrain Markup (*.kvtml)\n"); static const char *PATTERN_LEX = I18N_NOOP("*.lex|Vocabulary Trainer 5.0 (*.lex)\n"); static const char *PATTERN_VL = I18N_NOOP("*.vl|KVoclearn (*.vl)\n"); -static const char *PATTERN_QVO = I18N_NOOP("*.qvo|QVocab (*.qvo)\n"); +static const char *PATTERN_TQVO = I18N_NOOP("*.qvo|TQVocab (*.qvo)\n"); static const char *PATTERN_VOC = I18N_NOOP("*.voc|Vokabeltrainer (*.voc)\n"); static const char *PATTERN_CSV = I18N_NOOP("*.csv|Text (*.csv)\n"); static const char *PATTERN_VCB = I18N_NOOP("*.vocab|Vocabbox (*.vocab)\n"); @@ -160,7 +160,7 @@ void kvoctrainApp::slotFileNew() view->setView (0, langset); delete doc; TQString name = ""; - doc = new kvoctrainDoc (this, 0 /*KURL(name)*/); + doc = new kvoctrainDoc (TQT_TQOBJECT(this), 0 /*KURL(name)*/); loadDocProps(doc); if (doc->numLangs() == 0) { TQString l = "en"; @@ -182,7 +182,7 @@ void kvoctrainApp::slotFileOpen() if (queryExit() ) { TQString s; - KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Open Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, tqparentWidget(), i18n("Open Vocabulary File")); loadfileFromPath(url, true); } slotStatusMsg(IDS_DEFAULT); @@ -198,11 +198,11 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) doc = 0; TQString format = i18n("Loading %1"); - TQString msg = format.arg(url.path()); + TQString msg = format.tqarg(url.path()); slotStatusMsg(msg); prepareProgressBar(); - doc = new kvoctrainDoc (this, url); + doc = new kvoctrainDoc (TQT_TQOBJECT(this), url); removeProgressBar(); loadDocProps(doc); view->setView(doc, langset); @@ -222,10 +222,10 @@ void kvoctrainApp::slotFileOpenExample() if (queryExit() ) { TQString s; s = locate("data", "kvoctrain/examples/"); - KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, parentWidget(), i18n("Open Example Vocabulary File")); + KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, tqparentWidget(), i18n("Open Example Vocabulary File")); loadfileFromPath(url, false); if (doc) - doc->URL().setFileName(TQString::null); + doc->URL().setFileName(TQString()); } slotStatusMsg(IDS_DEFAULT); } @@ -244,16 +244,16 @@ void kvoctrainApp::slotFileMerge() slotStatusMsg(i18n("Merging file...")); TQString s; - KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Merge Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, tqparentWidget(), i18n("Merge Vocabulary File")); if (!url.isEmpty() ) { TQString format = i18n("Loading %1"); - TQString msg = format.arg(url.path()); + TQString msg = format.tqarg(url.path()); slotStatusMsg(msg); prepareProgressBar(); - kvoctrainDoc *new_doc = new kvoctrainDoc (this, url); + kvoctrainDoc *new_doc = new kvoctrainDoc (TQT_TQOBJECT(this), url); connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); doc->setModified(false); removeProgressBar(); @@ -274,7 +274,7 @@ void kvoctrainApp::slotFileMerge() vector new_usages = new_doc->getUsageDescr(); format = i18n("Merging %1"); - msg = format.arg(url.path()); + msg = format.tqarg(url.path()); slotStatusMsg(msg); TQApplication::setOverrideCursor( waitCursor ); @@ -332,11 +332,11 @@ void kvoctrainApp::slotFileMerge() for (int lang = 0; lang <= (int) expr->numTranslations(); lang++) { TQString t = expr->getType (lang); // adjust type offset - if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) { + if (!t.isEmpty() && t.left(1) == TQM_USER_TYPE) { TQString t2; t.remove (0, 1); t2.setNum (t.toInt()+types_offset); - t2.insert (0, QM_USER_TYPE); + t2.insert (0, TQM_USER_TYPE); expr->setType (lang, t2); } @@ -349,7 +349,7 @@ void kvoctrainApp::slotFileMerge() TQString n; t.remove (0, 1); int next; - if ((next = t.find(UL_USAGE_DIV)) >= 0) { + if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) { n = t.left(next); t.remove (0, next+1); } @@ -399,7 +399,7 @@ void kvoctrainApp::slotFileMerge() vector move_matrix; vector cs_equal; - for (int i = 0; i < QMAX (doc->numLangs(), new_doc->numLangs()); i++) + for (int i = 0; i < TQMAX (doc->numLangs(), new_doc->numLangs()); i++) cs_equal.push_back (false); move_matrix.push_back(new_doc->findIdent(doc->getOriginalIdent())); @@ -434,31 +434,31 @@ void kvoctrainApp::slotFileMerge() new_expr.setRemark (i, r); TQString t = expr->getType(lpos); - if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) { + if (!t.isEmpty() && t.left(1) == TQM_USER_TYPE) { TQString t2; t.remove (0, 1); t2.setNum (t.toInt()+types_offset); - t2.insert (0, QM_USER_TYPE); + t2.insert (0, TQM_USER_TYPE); new_expr.setType (i, t2); } t = expr->getUsageLabel(lpos); - if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) { + if (!t.isEmpty() && t.left(1) == TQM_USER_TYPE) { TQString t2; t.remove (0, 1); t2.setNum (t.toInt()+usages_offset); - t2.insert (0, QM_USER_TYPE); + t2.insert (0, TQM_USER_TYPE); new_expr.setUsageLabel (i, t2); } Conjugation conj = expr->getConjugation(lpos); for (int ci = 0; ci < conj.numEntries(); ci++) { t = conj.getType(ci); - if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) { - t.remove (0, strlen(QM_USER_TYPE)); + if (!t.isEmpty() && t.left(1) == TQM_USER_TYPE) { + t.remove (0, strlen(TQM_USER_TYPE)); TQString t2; t2.setNum (t.toInt()+tenses_offset); - t2.insert (0, QM_USER_TYPE); + t2.insert (0, TQM_USER_TYPE); conj.setType(ci, t2); } } @@ -500,7 +500,7 @@ void kvoctrainApp::slotFileSave() } TQString format = i18n("Saving %1"); - TQString msg = format.arg(doc->URL().path()); + TQString msg = format.tqarg(doc->URL().path()); slotStatusMsg(msg); // remove previous backup @@ -510,7 +510,7 @@ void kvoctrainApp::slotFileSave() prepareProgressBar(); saveDocProps(doc); - doc->saveAs(this, doc->URL(), doc->getTitle(), kvoctrainDoc::automatic); + doc->saveAs(TQT_TQOBJECT(this), doc->URL(), doc->getTitle(), kvoctrainDoc::automatic); fileOpenRecent->addURL(doc->URL()); removeProgressBar(); @@ -592,13 +592,13 @@ void kvoctrainApp::slotFileSaveAs() if (entryDlg != 0) commitEntryDlg(false); - KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("The file
    %1
    already exists. Do you want to overwrite it?    ") - .arg(url.path()),TQString::null,i18n("Overwrite")) == KMessageBox::Cancel) + .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel) { // do nothing } @@ -606,7 +606,7 @@ void kvoctrainApp::slotFileSaveAs() if (doc) { TQString format = i18n("Saving %1"); - TQString msg = format.arg(url.path()); + TQString msg = format.tqarg(url.path()); slotStatusMsg(msg); TQFile::remove(TQFile::encodeName(url.path()+"~")); // remove previous backup @@ -614,7 +614,7 @@ void kvoctrainApp::slotFileSaveAs() saveDocProps(doc); prepareProgressBar(); - doc->saveAs(this, url, doc->getTitle(), kvoctrainDoc::automatic); + doc->saveAs(TQT_TQOBJECT(this), url, doc->getTitle(), kvoctrainDoc::automatic); fileOpenRecent->addURL(doc->URL()); removeProgressBar(); } @@ -631,7 +631,7 @@ void kvoctrainApp::slotSaveSelection () slotStatusMsg(i18n("Saving selected area under new filename...")); TQString save_separator = Prefs::separator(); Prefs::setSeparator("\t"); - kvoctrainDoc seldoc(this, ""); + kvoctrainDoc seldoc(TQT_TQOBJECT(this), ""); // transfer most important parts seldoc.appendLang(doc->getOriginalIdent()); for (int i = 1; i < doc->numLangs(); i++) @@ -644,21 +644,21 @@ void kvoctrainApp::slotSaveSelection () if (doc->getEntry(i)->isInQuery() ) seldoc.appendEntry(doc->getEntry(i)); - KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("The file
    %1
    already exists. Do you want to overwrite it?    ") - .arg(url.path()),TQString::null,i18n("Overwrite")) == KMessageBox::Cancel) + .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel) { // do nothing } else { TQString format = i18n("Saving %1"); - TQString msg = format.arg(url.path()); + TQString msg = format.tqarg(url.path()); slotStatusMsg(msg); TQFile::remove(url.path()+"~"); // remove previous backup @@ -667,7 +667,7 @@ void kvoctrainApp::slotSaveSelection () saveDocProps(&seldoc); prepareProgressBar(); - seldoc.saveAs(this, url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic); + seldoc.saveAs(TQT_TQOBJECT(this), url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic); removeProgressBar(); } } diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp index 0f2ca08d..564566c9 100644 --- a/kvoctrain/kvoctrain/kva_query.cpp +++ b/kvoctrain/kvoctrain/kva_query.cpp @@ -36,7 +36,7 @@ #include "query-dialogs/SimpleQueryDlg.h" #include "prefs.h" -#define MAX_QUERY_TIMEOUT 3 +#define MAX_TQUERY_TIMEOUT 3 static const char not_answered[] = I18N_NOOP( @@ -205,7 +205,7 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res) doc->setModified(); switch (res) { case QueryDlgBase::Timeout: - if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { + if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), kapp->makeStdCaption(i18n("Stopping Query"))); @@ -339,7 +339,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) hide(); querymode = true; - if (queryType == QT_Conjugation) { + if (queryType == TQT_Conjugation) { verbQueryDlg = new VerbQueryDlg (exp->getType(act_query_col), random_expr1[random_query_nr].nr, act_query_col, @@ -359,7 +359,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); verbQueryDlg->show(); } - else if (queryType == QT_Articles) { + else if (queryType == TQT_Articles) { artQueryDlg = new ArtQueryDlg(exp->getType(act_query_col), random_expr1[random_query_nr].nr, act_query_col, @@ -376,7 +376,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); artQueryDlg->show(); } - else if (queryType == QT_Comparison) { + else if (queryType == TQT_Comparison) { adjQueryDlg = new AdjQueryDlg(exp->getType(act_query_col), random_expr1[random_query_nr].nr, act_query_col, @@ -411,7 +411,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) doc->setModified(); switch (res) { case QueryDlgBase::Timeout: - if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { + if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), kapp->makeStdCaption(i18n("Stopping Query"))); @@ -486,7 +486,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) random_query_nr = random.getLong(random_expr1.size()); kvoctrainExpr *exp = random_expr1[random_query_nr].exp; - if (queryType == QT_Conjugation) { + if (queryType == TQT_Conjugation) { if (verbQueryDlg == 0) { kdError() << "verbQueryDlg == 0\n"; slotStopQuery(true); @@ -505,7 +505,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) verbQueryDlg->initFocus(); } - else if (queryType == QT_Articles) { + else if (queryType == TQT_Articles) { if (artQueryDlg == 0) { kdError() << "artQueryDlg == 0\n"; slotStopQuery(true); @@ -522,7 +522,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) doc->getArticle(act_query_col)); artQueryDlg->initFocus(); } - else if (queryType == QT_Comparison) { + else if (queryType == TQT_Comparison) { if (adjQueryDlg == 0) { kdError() << "adjQueryDlg == 0\n"; slotStopQuery(true); @@ -629,7 +629,7 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o q_trans = exp->getOriginal(); } - if (queryType == QT_Random) { + if (queryType == TQT_Random) { randomQueryDlg = new RandomQueryDlg ( q_org, q_trans, @@ -648,7 +648,7 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o this, TQT_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result))); randomQueryDlg->show(); } - else if (queryType == QT_Multiple) { + else if (queryType == TQT_Multiple) { mcQueryDlg = new MCQueryDlg( q_org, q_trans, @@ -678,14 +678,14 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o void kvoctrainApp::slotTimeOutRandomQuery(QueryDlgBase::Result res) { - queryType = QT_Random; + queryType = TQT_Random; slotTimeOutQuery(res); } void kvoctrainApp::slotTimeOutMultipleChoice(QueryDlgBase::Result res) { - queryType = QT_Multiple; + queryType = TQT_Multiple; slotTimeOutQuery(res); } @@ -715,7 +715,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res) switch (res) { case QueryDlgBase::Timeout: - if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { + if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), kapp->makeStdCaption(i18n("Stopping Query"))); @@ -957,7 +957,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res) q_trans = exp->getOriginal(); } - if (queryType == QT_Random) { + if (queryType == TQT_Random) { if (randomQueryDlg == 0) { kdError() << "randomQueryDlg == 0\n"; slotStopQuery(true); @@ -975,7 +975,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res) doc); randomQueryDlg->initFocus(); } - else if (queryType == QT_Multiple) { + else if (queryType == TQT_Multiple) { if (mcQueryDlg == 0) { kdError() << "mcQueryDlg == 0\n"; slotStopQuery(true); diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index 62d2e901..1469c354 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -96,13 +96,13 @@ void kvoctrainApp::slotCurrentCellChanged(int row, int col) if (rem_label != 0) rem_label->setText(i18n("Abbreviation for R)emark","R: %1") - .arg(noData ? TQString::null : expr->getRemark(col))); + .tqarg(noData ? TQString() : expr->getRemark(col))); if (pron_label != 0) pron_label->setText(i18n("Abbreviation for P)ronouncation","P: %1") - .arg(noData ? TQString::null : expr->getPronunce(col))); + .tqarg(noData ? TQString() : expr->getPronunce(col))); if (type_label != 0) type_label->setText(i18n("Abbreviation for T)ype of word", "T: %1") - .arg(noData ? TQString::null : QueryManager::typeStr(expr->getType(col)))); + .tqarg(noData ? TQString() : QueryManager::typeStr(expr->getType(col)))); if (entryDlg != 0) { if (noData) @@ -144,7 +144,7 @@ void kvoctrainApp::slotEditCallBack(int res) { int lesson = doc->getEntry(row)->getLesson(); if (lesson >= lessons->count()) - lesson = QMAX (0, lessons->count()-1); + lesson = TQMAX (0, lessons->count()-1); slotChooseLesson(lesson); TQString exp; @@ -219,8 +219,8 @@ void kvoctrainApp::commitEntryDlg(bool force) expr->setFauxAmi (col, entryDlg->getToFauxAmi(), true); expr->setGrade(col, entryDlg->getFromGrade(), false); expr->setGrade(col, entryDlg->getToGrade(), true); - expr->setQueryCount(col, entryDlg->getFromQCount(), false); - expr->setQueryCount(col, entryDlg->getToQCount(), true); + expr->setQueryCount(col, entryDlg->getFromTQCount(), false); + expr->setQueryCount(col, entryDlg->getToTQCount(), true); expr->setBadCount(col, entryDlg->getFromBCount(), false); expr->setBadCount(col, entryDlg->getToBCount(), true); expr->setQueryDate(col, entryDlg->getFromDate(), false); @@ -258,10 +258,10 @@ void kvoctrainApp::commitEntryDlg(bool force) if (entryDlg->toGradeDirty() ) expr->setGrade(col, entryDlg->getToGrade(), true); - if (entryDlg->fromQCountDirty() ) - expr->setQueryCount(col, entryDlg->getFromQCount(), false); - if (entryDlg->toQCountDirty() ) - expr->setQueryCount(col, entryDlg->getToQCount(), true); + if (entryDlg->fromTQCountDirty() ) + expr->setQueryCount(col, entryDlg->getFromTQCount(), false); + if (entryDlg->toTQCountDirty() ) + expr->setQueryCount(col, entryDlg->getToTQCount(), true); if (entryDlg->fromBCountDirty() ) expr->setBadCount(col, entryDlg->getFromBCount(), false); @@ -315,7 +315,7 @@ void kvoctrainApp::createEntryDlg(int row, int col) int lesson = doc->getEntry(row)->getLesson(); if (lesson >= lessons->count()) - lesson = QMAX (0, lessons->count()-1); + lesson = TQMAX (0, lessons->count()-1); if (col < KV_EXTRA_COLS) { title = i18n("Edit General Properties"); @@ -333,21 +333,21 @@ void kvoctrainApp::createEntryDlg(int row, int col) 0, 0, 0, - TQString::null, - TQString::null, - TQString::null, + TQString(), + TQString(), + TQString(), lesson, lessons, doc->getOriginalIdent(), langset, - TQString::null, + TQString(), doc->getEntry(row)->getType(col), - TQString::null, - TQString::null, - TQString::null, - TQString::null, - TQString::null, - TQString::null, + TQString(), + TQString(), + TQString(), + TQString(), + TQString(), + TQString(), doc->getConjugation(0), Conjugation(), doc->getArticle(0), @@ -474,7 +474,7 @@ void kvoctrainApp::setDataEntryDlg (int row, int col) int lesson = expr->getLesson(); if (lesson >= lessons->count()) - lesson = QMAX (0, lessons->count()-1); + lesson = TQMAX (0, lessons->count()-1); bool hasSel = hasSelection(); @@ -492,21 +492,21 @@ void kvoctrainApp::setDataEntryDlg (int row, int col) 0, 0, 0, - TQString::null, - TQString::null, - TQString::null, + TQString(), + TQString(), + TQString(), lesson, lessons, doc->getOriginalIdent(), langset, - TQString::null, + TQString(), doc->getEntry(row)->getType(0), - TQString::null, - TQString::null, - TQString::null, - TQString::null, - TQString::null, - TQString::null, + TQString(), + TQString(), + TQString(), + TQString(), + TQString(), + TQString(), doc->getConjugation(0), Conjugation(), doc->getArticle(0), @@ -1114,11 +1114,11 @@ void kvoctrainApp::aboutToShowLearn() int j; header_m = new TQPopupMenu(); if (header != 0 ) { - header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_QUERY); + header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_TQUERY); header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), (header << 16) | IDH_START_MULTIPLE); header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, doc->numLangs() > 1); - header_m->setItemEnabled((header << 16) | IDH_START_QUERY, doc->numLangs() > 1); + header_m->setItemEnabled((header << 16) | IDH_START_TQUERY, doc->numLangs() > 1); header_m->insertSeparator(); header_m->insertItem(i18n("&Verbs"), (header << 16) | IDH_START_VERB); @@ -1140,17 +1140,17 @@ void kvoctrainApp::aboutToShowLearn() if((j = langset.indexShortId(doc->getIdent(i))) >= 0 && !langset.PixMapFile(j).isEmpty() && !langset.longId(j).isEmpty() ) { - query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]), - (i << (16+8)) | IDH_START_QUERY); // hack: IDs => header-ids + cmd + query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(main_names[i]), + (i << (16+8)) | IDH_START_TQUERY); // hack: IDs => header-ids + cmd } else { - query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_QUERY); + query_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) | IDH_START_TQUERY); } } 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(slotHeaderStatus(int))); + connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available @@ -1158,11 +1158,11 @@ void kvoctrainApp::aboutToShowLearn() if((j = langset.indexShortId(doc->getIdent(i))) >= 0 && !langset.PixMapFile(j).isEmpty() && !langset.longId(j).isEmpty() ) { - multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]), + multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(main_names[i]), (i << (16+8)) | IDH_START_MULTIPLE); // hack: IDs => header-ids + cmd } else { - multiple_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_MULTIPLE); + multiple_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) | IDH_START_MULTIPLE); } } header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), multiple_m, (4 << 16) | IDH_NULL); @@ -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(slotHeaderStatus(int))); + connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); } connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); TQString id = header == 0 ? doc->getOriginalIdent() : doc->getIdent(header); @@ -1197,10 +1197,10 @@ void kvoctrainApp::aboutToShowLearn() } learn_menu->insertSeparator(); - learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_QUERY ); + learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_TQUERY ); learn_menu->insertItem(SmallIconSet("run_multi"), i18n("Resume &Multiple Choice"), ID_RESUME_MULTIPLE ); - learn_menu->setItemEnabled(ID_RESUME_QUERY, query_num != 0); + learn_menu->setItemEnabled(ID_RESUME_TQUERY, query_num != 0); learn_menu->setItemEnabled(ID_RESUME_MULTIPLE, query_num != 0); } @@ -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(slotHeaderStatus(int))); + connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); if (header == 0) set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL); @@ -1272,7 +1272,7 @@ void kvoctrainApp::aboutToShowVocabSetLanguage() if (doc->numLangs() <= 2) set_m->insertItem(i18n("&Translation"), langs_m, (2 << 16) | IDH_NULL); else - set_m->insertItem(i18n("&%1. Translation").arg(header), langs_m, (2 << 16) | IDH_NULL); + set_m->insertItem(i18n("&%1. Translation").tqarg(header), langs_m, (2 << 16) | IDH_NULL); } } } diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h index a1be3c54..5e3e56c7 100644 --- a/kvoctrain/kvoctrain/kvoctrain.h +++ b/kvoctrain/kvoctrain/kvoctrain.h @@ -76,10 +76,11 @@ class KVTNewStuff; class kvoctrainApp : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** construtor */ - kvoctrainApp(TQWidget *parent = NULL, const char *name = NULL); + kvoctrainApp(TQWidget *tqparent = NULL, const char *name = NULL); /** destructor */ ~kvoctrainApp(); void initActions(); @@ -145,7 +146,7 @@ public: // void slotSearchClip(); void slotSetHeaderProp (int header_and_id); void slotHeaderCallBack (int cmd_and_id); - void slotHeaderStatus (int cmd_and_id); + void slotHeadertqStatus (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 7dc54b45..1dbfacc2 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -39,8 +39,8 @@ #include "kv_resource.h" #include "prefs.h" -KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *parent, const char *name) - : TQTable(parent, name), langs(ls) +KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *tqparent, const char *name) + : TQTable(tqparent, name), langs(ls) { m_doc = doc; defaultItem = 0; @@ -76,7 +76,7 @@ void KVocTrainTable::setCurrentItem(int row) setCurrentRow(row, currentColumn()); } /* -TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace) +TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace) { if (KApplication::dcopClient()->isApplicationRegistered("kxkb")) { @@ -103,12 +103,12 @@ TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace) } } } - return TQTable::beginEdit(row, col, replace); + return TQTable::beginEdit(row, col, tqreplace); } -void KVocTrainTable::endEdit(int row, int col, bool accept, bool replace) +void KVocTrainTable::endEdit(int row, int col, bool accept, bool tqreplace) { - TQTable::endEdit(row, col, accept, replace); + TQTable::endEdit(row, col, accept, tqreplace); } */ void KVocTrainTable::sortByColumn(int header, bool alpha) { @@ -141,7 +141,7 @@ void KVocTrainTable::sortByColumn(int header, bool alpha) { sortdir = m_doc->sortByLesson_index(); } horizontalHeader()->setSortIndicator(header, sortdir); - repaintContents(); + tqrepaintContents(); m_doc->setModified(); emit currentChanged(currentRow(), currentColumn()); TQApplication::restoreOverrideCursor(); @@ -180,7 +180,7 @@ void KVocTrainTable::updateContents(int row, int col) int ncols, nrows; if (m_doc) { nrows = m_doc->numEntries(); - ncols = QMAX(1, m_doc->numLangs())+KV_EXTRA_COLS; + ncols = TQMAX(1, m_doc->numLangs())+KV_EXTRA_COLS; } else { nrows = 0; @@ -188,7 +188,7 @@ void KVocTrainTable::updateContents(int row, int col) } if (nrows != numRows()) { // remember number of new rows (typically one) - unsigned int new_rows = QMAX(0, nrows - numRows()); + unsigned int new_rows = TQMAX(0, nrows - numRows()); // adjust number of rows setNumRows(nrows); // adjust row heights for added rows @@ -197,8 +197,8 @@ void KVocTrainTable::updateContents(int row, int col) } if (ncols != numCols()) setNumCols(ncols); - current_row = QMIN(current_row, QMAX(0, numRows()-1)); - current_col = QMIN(current_col, QMAX(0, numCols()-1)); + current_row = TQMIN(current_row, TQMAX(0, numRows()-1)); + current_col = TQMIN(current_col, TQMAX(0, numCols()-1)); bool b = signalsBlocked(); blockSignals(true); setCurrentRow(current_row, current_col); @@ -226,7 +226,7 @@ void KVocTrainTable::setDoc(kvoctrainDoc * rows) if (rows) { m_doc = rows; setNumRows(rows->numEntries()); - setNumCols(QMAX(1+KV_EXTRA_COLS, m_doc->numLangs()+KV_EXTRA_COLS)); + setNumCols(TQMAX(1+KV_EXTRA_COLS, m_doc->numLangs()+KV_EXTRA_COLS)); setCurrentRow(0, 0); } else { @@ -263,7 +263,7 @@ void KVocTrainTable::menuTriggerTimeout() if (mt != KV_COL_MARK) emit rightButtonClicked(mt, mpos.x(), mpos.y()); - TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), TQMouseEvent::LeftButton, TQMouseEvent::LeftButton); + TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), Qt::LeftButton, Qt::LeftButton); TQApplication::sendEvent(header, &me); } @@ -303,7 +303,7 @@ int cellAlignment(const TQString & text) text.toDouble(&ok2); num = ok1 || ok2; - return ( num ? Qt::AlignRight : Qt::AlignAuto ) | Qt::AlignVCenter; + return ( num ? TQt::AlignRight : TQt::AlignAuto ) | TQt::AlignVCenter; } @@ -389,7 +389,7 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c TQString less_str; if (m_doc != 0 && expr->getLesson() != 0) less_str = m_doc->getLessonDescr(expr->getLesson()); - p->drawText( 3, fontpos, w, p->fontMetrics().lineSpacing(), Qt::AlignLeft, less_str); + p->drawText( 3, fontpos, w, p->fontMetrics().lineSpacing(), TQt::AlignLeft, less_str); } break; @@ -424,15 +424,15 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c } TQPen pen( p->pen() ); - int gridColor = style().styleHint( TQStyle::SH_Table_GridLineColor, this ); + int gridColor = tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, this ); if (gridColor != -1) { const TQPalette &pal = palette(); - if (cg != colorGroup() + if (cg != tqcolorGroup() && cg != pal.disabled() && cg != pal.inactive()) p->setPen(cg.mid()); else - p->setPen((QRgb)gridColor); + p->setPen((TQRgb)gridColor); } else { p->setPen(cg.mid()); } @@ -461,7 +461,7 @@ void KVocTrainTable::keyPressEvent(TQKeyEvent * e) { case Key_Right: { int topCell = rowAt(0); - int lastRowVisible = QMIN(numRows(), rowAt(contentsHeight())); + int lastRowVisible = TQMIN(numRows(), rowAt(contentsHeight())); if (numCols() > 2) for (int i = topCell; i <= lastRowVisible; i++) updateCell(i, KV_COL_ORG); @@ -476,7 +476,7 @@ void KVocTrainTable::keyPressEvent(TQKeyEvent * e) case Key_Left: { TQTable::keyPressEvent(e); int topCell = rowAt(0); - int lastRowVisible = QMIN(numRows(), rowAt(contentsHeight())); + int lastRowVisible = TQMIN(numRows(), rowAt(contentsHeight())); if (numCols() > 2) for (int i = topCell; i <= lastRowVisible; i++) updateCell(i, KV_COL_ORG); @@ -533,12 +533,12 @@ void KVocTrainTable::contentsMousePressEvent(TQMouseEvent * e) update_org = true; int topCell = rowAt(0); - int lastRowVisible = QMIN(numRows(), rowAt(contentsHeight())); + int lastRowVisible = TQMIN(numRows(), rowAt(contentsHeight())); if (update_org) for (int i = topCell; i <= lastRowVisible; i++) updateCell(i, KV_COL_ORG); } - if(e->button() == LeftButton) + if(e->button() == Qt::LeftButton) setCurrentCell(cr, cc); } diff --git a/kvoctrain/kvoctrain/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h index 77fffa77..5bd84d06 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.h +++ b/kvoctrain/kvoctrain/kvoctraintable.h @@ -37,12 +37,13 @@ /** @author Peter Hedlund */ -class KVocTrainTable : public QTable +class KVocTrainTable : public TQTable { Q_OBJECT + TQ_OBJECT public: public: - KVocTrainTable( kvoctrainDoc *_doc, const LangSet *ls, TQWidget *parent = NULL, const char *name = NULL ); + KVocTrainTable( kvoctrainDoc *_doc, const LangSet *ls, TQWidget *tqparent = NULL, const char *name = NULL ); friend class kvoctrainView; @@ -80,8 +81,8 @@ public: protected: int current; - //TQWidget* beginEdit(int row, int col, bool replace); - //void endEdit(int row, int col, bool accept, bool replace); + //TQWidget* beginEdit(int row, int col, bool tqreplace); + //void endEdit(int row, int col, bool accept, bool tqreplace); void paintCell(TQPainter *p, int row, int col, const TQRect &cr, bool selected, const TQColorGroup &cg); void setItem(int row, int col, TQTableItem * item); TQTableItem* item (int row, int col) const; diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp index 80a2dd53..d4bc0343 100644 --- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp +++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp @@ -33,7 +33,7 @@ KVocTrainTableItem::KVocTrainTableItem( TQTable *t, EditType et, kvoctrainDoc *doc) - : TQTableItem( t, et, TQString::null ) + : TQTableItem( t, et, TQString() ) { m_doc = doc; // we do not want that this item can be replaced @@ -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->sizeHint(); + TQSize sz = statebox->tqsizeHint(); sz.setHeight(table()->rowHeight(row())); statebox->setMinimumSize(sz); if (!m_doc->getEntry(row())->isActive() ) diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.h b/kvoctrain/kvoctrain/kvoctraintableitem.h index aa3b7cdd..1495b7e3 100644 --- a/kvoctrain/kvoctrain/kvoctraintableitem.h +++ b/kvoctrain/kvoctrain/kvoctraintableitem.h @@ -34,7 +34,7 @@ /** @author Peter Hedlund */ -class KVocTrainTableItem : public QTableItem +class KVocTrainTableItem : public TQTableItem { public: KVocTrainTableItem( TQTable *t, EditType et, kvoctrainDoc *doc ); diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp index ebad99ee..9017525d 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -50,7 +50,7 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *_parent) : TQWidget(_parent) { m_doc = doc; - parent = _parent; + tqparent = _parent; m_table = new KVocTrainTable(m_doc, &ls, this, "ListBox_1"); m_table->setFont(Prefs::tableFont()); @@ -60,12 +60,12 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp m_doc->appendLang(i18n("Original")); connect(m_table, TQT_SIGNAL(selected(int)), m_table, TQT_SLOT(sortByColumn_alpha(int))); - connect(m_table, TQT_SIGNAL(rightButtonClicked(int, int, int)), parent, TQT_SLOT(slotHeaderMenu(int, int, int))); - connect(m_table, TQT_SIGNAL(edited(int, int)), parent, TQT_SLOT(slotEditEntry(int, int))); - connect(m_table, TQT_SIGNAL(currentChanged(int, int)), parent, TQT_SLOT(slotCurrentCellChanged(int, int))); + connect(m_table, TQT_SIGNAL(rightButtonClicked(int, int, int)), tqparent, TQT_SLOT(slotHeaderMenu(int, int, int))); + connect(m_table, TQT_SIGNAL(edited(int, int)), tqparent, TQT_SLOT(slotEditEntry(int, int))); + connect(m_table, TQT_SIGNAL(currentChanged(int, int)), tqparent, TQT_SLOT(slotCurrentCellChanged(int, int))); connect(m_table, TQT_SIGNAL(selectionChanged()), m_table, TQT_SLOT(slotSelectionChanged())); - connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQT_SLOT(keyPressEvent(TQKeyEvent *))); - connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *))); + connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), tqparent, TQT_SLOT(keyPressEvent(TQKeyEvent *))); + connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), tqparent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *))); list_layout = new TQGridLayout( this, 2, 1/*, 4 */); list_layout->addWidget(m_table, 1, 0); @@ -136,20 +136,20 @@ void kvoctrainView::resizeEvent (TQResizeEvent *r_ev) header->resizeSection(KV_COL_MARK, KV_COLWIDTH_MARK); m_table->setColumnWidth(KV_COL_MARK, KV_COLWIDTH_MARK); int remain = newwidth - KV_COLWIDTH_MARK; - int x = QMAX(20, (int)((header->sectionSize(KV_COL_LESS) * grow) + 0.5)); + int x = TQMAX(20, (int)((header->sectionSize(KV_COL_LESS) * grow) + 0.5)); header->resizeSection(KV_COL_LESS, x); m_table->setColumnWidth(KV_COL_LESS, x); remain -= x; for (int i = KV_COL_ORG; i < m_table->numCols() - 1; i++) { - x = QMAX(20, (int)((header->sectionSize(i) * grow) + 0.5)); + x = TQMAX(20, (int)((header->sectionSize(i) * grow) + 0.5)); remain -= x; header->resizeSection(i, x); m_table->setColumnWidth(i, x); } - header->resizeSection(m_table->numCols() - 1, QMAX(20, remain)); - m_table->setColumnWidth(m_table->numCols() - 1, QMAX(20, remain)); + header->resizeSection(m_table->numCols() - 1, TQMAX(20, remain)); + m_table->setColumnWidth(m_table->numCols() - 1, TQMAX(20, remain)); } break; @@ -176,8 +176,8 @@ void kvoctrainView::setView(kvoctrainDoc *doc, const LangSet& ls) if (m_doc) { int id = ls.indexShortId (m_doc->getOriginalIdent()); - setHeaderProp(KV_COL_LESS, i18n("Lesson"), TQString::null); - setHeaderProp(KV_COL_MARK, "", TQString::null); + setHeaderProp(KV_COL_LESS, i18n("Lesson"), TQString()); + setHeaderProp(KV_COL_MARK, "", TQString()); m_table->setColumnWidth(KV_COL_MARK, KV_COLWIDTH_MARK); if (id < 0) @@ -225,7 +225,7 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString //this is the code used by kxkb when a flag image can't be found //see kdebase/kxkb/pixmap.cpp/LayoutIcon::findPixmap() pix.resize(21, 14); - pix.fill(Qt::white); + pix.fill(TQt::white); TQPainter p(&pix); @@ -233,31 +233,31 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString font.setPixelSize(10); font.setWeight(TQFont::Bold); p.setFont(font); - p.setPen(Qt::red); - p.drawText(2, 1, pix.width(), pix.height()-2, Qt::AlignCenter, "err"); - p.setPen(Qt::blue); - p.drawText(1, 0, pix.width(), pix.height()-2, Qt::AlignCenter, "err"); + p.setPen(TQt::red); + p.drawText(2, 1, pix.width(), pix.height()-2, TQt::AlignCenter, "err"); + p.setPen(TQt::blue); + p.drawText(1, 0, pix.width(), pix.height()-2, TQt::AlignCenter, "err"); } int w = pix.width(); int h = pix.height(); TQPixmap arrow(w + 14, h); - TQBitmap mask(arrow.width(), arrow.height()); - arrow.fill(Qt::white); - mask.fill(Qt::black); + TQBitmap tqmask(arrow.width(), arrow.height()); + arrow.fill(TQt::white); + tqmask.fill(TQt::black); bitBlt(&arrow, 0, 0, &pix, 0, 0); - if (pix.mask() != 0) - bitBlt(&mask, 0, 0, pix.mask(), 0, 0); + if (pix.tqmask() != 0) + bitBlt(&tqmask, 0, 0, pix.tqmask(), 0, 0); else { TQBitmap bmp(pix.createHeuristicMask()); - bitBlt(&mask, 0, 0, &bmp, 0, 0); + bitBlt(&tqmask, 0, 0, &bmp, 0, 0); } TQPainter p, pm; p.begin(&arrow); - pm.begin(&mask); + pm.begin(&tqmask); p.setPen(TQColor(0, 0, 0)); p.drawLine(w + 5, h - 2, w + 5 + 1, h - 2); @@ -275,7 +275,7 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString pm.end(); p.end(); - arrow.setMask(mask); + arrow.setMask(tqmask); TQIconSet set(arrow, TQIconSet::Small); header->setLabel(id, set, name); @@ -369,7 +369,7 @@ void kvoctrainView::newPage(TQPainter & painter, int res, int startCol, int endC TQRect w = painter.window(); painter.resetXForm(); painter.setFont(KGlobalSettings::generalFont()); - painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").arg(m_doc->getTitle())); + painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").tqarg(m_doc->getTitle())); painter.translate(marg, marg); painter.drawLine(-1 , 0, -1, hh - 1); for (int i = startCol; i <= endCol && i < m_table->numCols(); ++i) diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h index f76e240e..d0e3f6b9 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.h +++ b/kvoctrain/kvoctrain/kvoctrainview.h @@ -48,13 +48,14 @@ class LangSet; * This class provides an incomplete base for your application view. */ -class kvoctrainView : public QWidget +class kvoctrainView : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** Constructor for the main view */ - kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *parent = 0); + kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *tqparent = 0); /** Destructor for the main view */ ~kvoctrainView(); @@ -63,7 +64,7 @@ class kvoctrainView : public QWidget void setView(kvoctrainDoc *doc, const LangSet &ls); KVocTrainTable* getTable() { return m_table; } - void setHeaderProp(int id, const TQString &name, const TQString &pixfile=TQString::null); + void setHeaderProp(int id, const TQString &name, const TQString &pixfile=TQString()); void adjustContent(); void print(KPrinter *pPrinter); @@ -77,7 +78,7 @@ protected: bool autoResize; kvoctrainDoc * m_doc; TQGridLayout * list_layout; - kvoctrainApp * parent; + kvoctrainApp * tqparent; /** resizes table when frame is resized */ virtual void resizeEvent(TQResizeEvent *); diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.cpp b/kvoctrain/kvoctrain/kvt-core/LineList.cpp index 4c38d530..f439278c 100644 --- a/kvoctrain/kvoctrain/kvt-core/LineList.cpp +++ b/kvoctrain/kvoctrain/kvt-core/LineList.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - maintain list of lines from QMultiLineEdit + maintain list of lines from TQMultiLineEdit ----------------------------------------------------------------------- @@ -39,11 +39,11 @@ void LineList::setLines(const TQString &the_lines ) multilines.clear(); TQString lines = the_lines; int pos; - if ((pos = lines.find ('\n')) >= 0) { + if ((pos = lines.tqfind ('\n')) >= 0) { while (pos >= 0) { multilines.push_back(lines.left(pos)); lines.remove (0, pos+1); - pos = lines.find ('\n'); + pos = lines.tqfind ('\n'); } } diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.h b/kvoctrain/kvoctrain/kvt-core/LineList.h index 15309c48..028c9e64 100644 --- a/kvoctrain/kvoctrain/kvt-core/LineList.h +++ b/kvoctrain/kvoctrain/kvt-core/LineList.h @@ -1,6 +1,6 @@ /*************************************************************************** - maintain list of lines from QMultiLineEdit + maintain list of lines from TQMultiLineEdit ----------------------------------------------------------------------- diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp index 7eb65e1a..f08246a5 100644 --- a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp +++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp @@ -50,40 +50,40 @@ struct t_type_rel static t_type_rel InternalTypeRelations [] = { - { QM_ADJ, I18N_NOOP("Adjective") }, + { TQM_ADJ, I18N_NOOP("Adjective") }, - { QM_ADV, I18N_NOOP("Adverb") }, + { TQM_ADV, I18N_NOOP("Adverb") }, - { QM_ART, I18N_NOOP("Article") }, - { QM_ART QM_TYPE_DIV QM_ART_DEF, I18N_NOOP("Article Definite") }, - { QM_ART QM_TYPE_DIV QM_ART_IND, I18N_NOOP("Article Indefinite") }, + { TQM_ART, I18N_NOOP("Article") }, + { TQM_ART TQM_TYPE_DIV TQM_ART_DEF, I18N_NOOP("Article Definite") }, + { TQM_ART TQM_TYPE_DIV TQM_ART_IND, I18N_NOOP("Article Indefinite") }, - { QM_CON, I18N_NOOP("Conjunction") }, + { TQM_CON, I18N_NOOP("Conjunction") }, - { QM_NAME, I18N_NOOP("Name") }, // old type "3" + { TQM_NAME, I18N_NOOP("Name") }, // old type "3" - { QM_NOUN, I18N_NOOP("Noun") }, // old type "2" - { QM_NOUN QM_TYPE_DIV QM_NOUN_M, I18N_NOOP("Noun Male") }, - { QM_NOUN QM_TYPE_DIV QM_NOUN_F, I18N_NOOP("Noun Female") }, - { QM_NOUN QM_TYPE_DIV QM_NOUN_S, I18N_NOOP("Noun Neutral") }, + { TQM_NOUN, I18N_NOOP("Noun") }, // old type "2" + { TQM_NOUN TQM_TYPE_DIV TQM_NOUN_M, I18N_NOOP("Noun Male") }, + { TQM_NOUN TQM_TYPE_DIV TQM_NOUN_F, I18N_NOOP("Noun Female") }, + { TQM_NOUN TQM_TYPE_DIV TQM_NOUN_S, I18N_NOOP("Noun Neutral") }, - { QM_NUM, I18N_NOOP("Numeral") }, - { QM_NUM QM_TYPE_DIV QM_NUM_ORD, I18N_NOOP("Numeral Ordinal") }, - { QM_NUM QM_TYPE_DIV QM_NUM_CARD, I18N_NOOP("Numeral Cardinal") }, + { TQM_NUM, I18N_NOOP("Numeral") }, + { TQM_NUM TQM_TYPE_DIV TQM_NUM_ORD, I18N_NOOP("Numeral Ordinal") }, + { TQM_NUM TQM_TYPE_DIV TQM_NUM_CARD, I18N_NOOP("Numeral Cardinal") }, - { QM_PHRASE, I18N_NOOP("Phrase") }, + { TQM_PHRASE, I18N_NOOP("Phrase") }, - { QM_PREP, I18N_NOOP("Preposition") }, + { TQM_PREP, I18N_NOOP("Preposition") }, - { QM_PRON, I18N_NOOP("Pronoun") }, - { QM_PRON QM_TYPE_DIV QM_PRON_POS, I18N_NOOP("Pronoun Possessive") }, - { QM_PRON QM_TYPE_DIV QM_PRON_PER, I18N_NOOP("Pronoun Personal") }, + { TQM_PRON, I18N_NOOP("Pronoun") }, + { TQM_PRON TQM_TYPE_DIV TQM_PRON_POS, I18N_NOOP("Pronoun Possessive") }, + { TQM_PRON TQM_TYPE_DIV TQM_PRON_PER, I18N_NOOP("Pronoun Personal") }, - { QM_QUEST, I18N_NOOP("Question") }, + { TQM_QUEST, I18N_NOOP("Question") }, - { QM_VERB, I18N_NOOP("Verb") }, // old type "1" - { QM_VERB QM_TYPE_DIV QM_VERB_IRR, I18N_NOOP("Verb Irregular") }, - { QM_VERB QM_TYPE_DIV QM_VERB_REG, I18N_NOOP("Verb Regular") }, + { TQM_VERB, I18N_NOOP("Verb") }, // old type "1" + { TQM_VERB TQM_TYPE_DIV TQM_VERB_IRR, I18N_NOOP("Verb Irregular") }, + { TQM_VERB TQM_TYPE_DIV TQM_VERB_REG, I18N_NOOP("Verb Regular") }, { 0, 0 } // the end }; @@ -93,19 +93,19 @@ TQString QueryManager::getSubType (const TQString & type) { int i; TQString t = type; - if ((i = t.find(QM_TYPE_DIV)) >= 0) { + if ((i = t.tqfind(TQM_TYPE_DIV)) >= 0) { t.remove(0, i+1); return t; } else - return TQString::null; + return TQString(); } TQString QueryManager::getMainType (const TQString & type) { int i; - if ((i = type.find(QM_TYPE_DIV)) >= 0) + if ((i = type.tqfind(TQM_TYPE_DIV)) >= 0) return type.left(i); else return type; @@ -238,7 +238,7 @@ QuerySelection QueryManager::select(kvoctrainDoc *doc, int act_lesson, int idx, bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, TQString query_type) { TQString qtype; - int pos = query_type.find (QM_TYPE_DIV); + int pos = query_type.tqfind (TQM_TYPE_DIV); if (pos >= 0) qtype = query_type.left (pos); else @@ -246,22 +246,22 @@ bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, TQStri TQString expr_type = expr->getType(idx); bool type_ok = false; - if (qtype == QM_NOUN) { - type_ok = expr_type == QM_NOUN QM_TYPE_DIV QM_NOUN_S - || expr_type == QM_NOUN QM_TYPE_DIV QM_NOUN_M - || expr_type == QM_NOUN QM_TYPE_DIV QM_NOUN_F; + if (qtype == TQM_NOUN) { + type_ok = expr_type == TQM_NOUN TQM_TYPE_DIV TQM_NOUN_S + || expr_type == TQM_NOUN TQM_TYPE_DIV TQM_NOUN_M + || expr_type == TQM_NOUN TQM_TYPE_DIV TQM_NOUN_F; } - else if (qtype == QM_VERB) { - type_ok = ( expr_type == QM_VERB - || expr_type == QM_VERB QM_TYPE_DIV QM_VERB_IRR - || expr_type == QM_VERB QM_TYPE_DIV QM_VERB_REG + else if (qtype == TQM_VERB) { + type_ok = ( expr_type == TQM_VERB + || expr_type == TQM_VERB TQM_TYPE_DIV TQM_VERB_IRR + || expr_type == TQM_VERB TQM_TYPE_DIV TQM_VERB_REG ) && expr->getConjugation(idx).numEntries() > 0; } - else if (qtype == QM_ADJ) { - type_ok = expr_type == QM_ADJ + else if (qtype == TQM_ADJ) { + type_ok = expr_type == TQM_ADJ && !expr->getComparison(idx).isEmpty(); } else @@ -315,16 +315,16 @@ QuerySelection QueryManager::select(kvoctrainDoc *doc, int act_lesson, int idx, bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, QueryType query_type) { bool type_ok = false; - if (query_type == QT_Synonym) { + if (query_type == TQT_Synonym) { type_ok = !expr->getSynonym(idx).stripWhiteSpace().isEmpty(); } - else if (query_type == QT_Antonym) { + else if (query_type == TQT_Antonym) { type_ok = !expr->getAntonym(idx).stripWhiteSpace().isEmpty(); } - else if (query_type == QT_Paraphrase) { + else if (query_type == TQT_Paraphrase) { type_ok = !expr->getParaphrase(idx).stripWhiteSpace().isEmpty(); } - else if (query_type == QT_Example) { + else if (query_type == TQT_Example) { type_ok = !expr->getExample(idx).stripWhiteSpace().isEmpty(); } @@ -393,14 +393,14 @@ vector QueryManager::getRelation (bool only_maintypes) for (int i = 0; i < (int) userTypes.size(); i++) { TQString s; s.setNum(i+1); - s.insert(0, QM_USER_TYPE); + s.insert(0, TQM_USER_TYPE); vec.push_back(TypeRelation(s, userTypes[i])); } t_type_rel *type = InternalTypeRelations; while (type->short_ref != 0) { - if (!only_maintypes || strstr (type->short_ref, QM_TYPE_DIV) == 0) + if (!only_maintypes || strstr (type->short_ref, TQM_TYPE_DIV) == 0) vec.push_back(TypeRelation(type->short_ref, i18n(type->long_ref))); type++; } @@ -411,14 +411,14 @@ vector QueryManager::getRelation (bool only_maintypes) TQString QueryManager::typeStr (const TQString id) { - if (id.left(1) == QM_USER_TYPE) { + if (id.left(1) == TQM_USER_TYPE) { TQString num = id; num.remove (0, 1); int i = num.toInt()-1; if (i >= 0 && i < (int) userTypes.size() ) return userTypes[i]; else - return TQString::null; + return TQString(); } else { t_type_rel *type = InternalTypeRelations; @@ -428,7 +428,7 @@ TQString QueryManager::typeStr (const TQString id) type++; } } - return TQString::null; + return TQString(); } @@ -648,7 +648,7 @@ void QueryManager::setLessonItemStr (const TQString & indices) int pos; TQString indices_copy = indices; lessonitems.clear(); - while ((pos = indices_copy.find(' ')) >= 0) { + while ((pos = indices_copy.tqfind(' ')) >= 0) { TQString s = indices_copy.left(pos); indices_copy.remove(0, pos+1); lessonitems.push_back(s.toInt()); diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.h b/kvoctrain/kvoctrain/kvt-core/QueryManager.h index bdd7d815..3277bd1b 100644 --- a/kvoctrain/kvoctrain/kvt-core/QueryManager.h +++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.h @@ -39,42 +39,42 @@ class Prefs; // internal types, indented are subtypes -#define QM_VERB "v" // go -#define QM_VERB_IRR "ir" -#define QM_VERB_REG "re" -#define QM_NOUN "n" // table, coffee -#define QM_NOUN_F "f" -#define QM_NOUN_M "m" -#define QM_NOUN_S "s" -#define QM_NAME "nm" -#define QM_ART "ar" // article -#define QM_ART_DEF "def" // definite a/an -#define QM_ART_IND "ind" // indefinite the -#define QM_ADJ "aj" // adjective expensive, good -#define QM_ADV "av" // adverb today, strongly -#define QM_PRON "pr" // pronoun you, she -#define QM_PRON_POS "pos" // possessive my, your -#define QM_PRON_PER "per" // personal -#define QM_PHRASE "ph" -#define QM_NUM "num" // numeral -#define QM_NUM_ORD "ord" // ordinal first, second -#define QM_NUM_CARD "crd" // cardinal one, two -#define QM_INFORMAL "ifm" -#define QM_FIG "fig" -#define QM_CON "con" // conjuncton and, but -#define QM_PREP "pre" // preposition behind, between -#define QM_QUEST "qu" // question who, what +#define TQM_VERB "v" // go +#define TQM_VERB_IRR "ir" +#define TQM_VERB_REG "re" +#define TQM_NOUN "n" // table, coffee +#define TQM_NOUN_F "f" +#define TQM_NOUN_M "m" +#define TQM_NOUN_S "s" +#define TQM_NAME "nm" +#define TQM_ART "ar" // article +#define TQM_ART_DEF "def" // definite a/an +#define TQM_ART_IND "ind" // indefinite the +#define TQM_ADJ "aj" // adjective expensive, good +#define TQM_ADV "av" // adverb today, strongly +#define TQM_PRON "pr" // pronoun you, she +#define TQM_PRON_POS "pos" // possessive my, your +#define TQM_PRON_PER "per" // personal +#define TQM_PHRASE "ph" +#define TQM_NUM "num" // numeral +#define TQM_NUM_ORD "ord" // ordinal first, second +#define TQM_NUM_CARD "crd" // cardinal one, two +#define TQM_INFORMAL "ifm" +#define TQM_FIG "fig" +#define TQM_CON "con" // conjuncton and, but +#define TQM_PREP "pre" // preposition behind, between +#define TQM_QUEST "qu" // question who, what // type delimiters -#define QM_USER_TYPE "#" // designates number of user type -#define QM_TYPE_DIV ":" // divide main from subtype +#define TQM_USER_TYPE "#" // designates number of user type +#define TQM_TYPE_DIV ":" // divide main from subtype //enum kvq_timeout_t { kvq_notimeout, kvq_show, kvq_cont }; -enum QueryType { QT_Random, QT_Multiple, - QT_Articles, QT_Conjugation, QT_Comparison, - QT_Synonym, QT_Antonym, QT_Example, QT_Paraphrase }; +enum QueryType { TQT_Random, TQT_Multiple, + TQT_Articles, TQT_Conjugation, TQT_Comparison, + TQT_Synonym, TQT_Antonym, TQT_Example, TQT_Paraphrase }; class TypeRelation diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp index 9180d6e4..ece91275 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp @@ -135,11 +135,11 @@ vector UsageManager::getRelation () } -bool UsageManager::contains (const TQString& label, const TQString& collection) +bool UsageManager::tqcontains (const TQString& label, const TQString& collection) { TQString s = collection; int pos; - while ((pos = s.find(UL_USAGE_DIV)) >= 0) { + while ((pos = s.tqfind(UL_USAGE_DIV)) >= 0) { if (s.left(pos) == label) return true; s.remove (0, pos+1); diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h index 647de685..dcbb2ae5 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h @@ -114,7 +114,7 @@ class UsageManager UsageManager (); - static bool contains (const TQString& label, const TQString& collection); + static bool tqcontains (const TQString& label, const TQString& collection); static vector getRelation (); static void setUsageNames (vector names); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index e4906935..f177fa14 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp @@ -106,7 +106,7 @@ bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &) } setModified (false); - return os.device()->status() == IO_Ok; + return os.tqdevice()->status() == IO_Ok; } @@ -125,7 +125,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is) is.setCodec(TQTextCodec::codecForName("ISO 8859-1")); is.setEncoding(TQTextStream::Latin1); - int size = is.device()->size (); + int size = is.tqdevice()->size (); int ln = size / 20 / 100; // assume each line about 20 chars float f_ent_percent = size / 100.0; emit progressChanged (this, 0); @@ -138,42 +138,42 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is) // autodetect utf8 if (!utf8_mode) { for (int i = 0; !utf8_mode && i < (int) s.length(); ++i) { - ushort trigger = s[i].unicode(); + ushort trigger = s[i].tqunicode(); if (trigger >= 0x80) { int remain = s.length() - i; if ((trigger & 0xE0) == 0xC0){ // 110x xxxx if ( (remain > 1) - && (s[i+1].unicode() & 0xC0) == 0x80) + && (s[i+1].tqunicode() & 0xC0) == 0x80) utf8_mode = true; } else if ((trigger & 0xF0) == 0xE0) { // 1110 xxxx if ( remain > 2 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xF8) == 0xF0) { // 1111 0xxx if ( remain > 3 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80 - && s[i+3].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80 + && s[i+3].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFC) == 0xF8) { // 1111 10xx if ( remain > 4 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80 - && s[i+3].unicode() & 0xC0 == 0x80 - && s[i+4].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80 + && s[i+3].tqunicode() & 0xC0 == 0x80 + && s[i+4].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFE) == 0xFC) { // 1111 110x if ( remain > 5 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80 - && s[i+3].unicode() & 0xC0 == 0x80 - && s[i+4].unicode() & 0xC0 == 0x80 - && s[i+5].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80 + && s[i+3].tqunicode() & 0xC0 == 0x80 + && s[i+4].tqunicode() & 0xC0 == 0x80 + && s[i+5].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } } @@ -190,7 +190,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is) ln--; if (ln <= 0) { ln = size / 20 / 100; // assume each line about 20 chars - emit progressChanged(this, is.device()->at() / (int) f_ent_percent); + emit progressChanged(this, is.tqdevice()->at() / (int) f_ent_percent); } // similar in kva_clip.cpp::slotEditPaste() @@ -200,7 +200,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is) kvoctrainExpr expr; // now move columns according to paste-order for (int i = 0; i < bucket.numTranslations()+1; i++) { - lang_num = QMAX (lang_num, bucket.numTranslations()+1); + lang_num = TQMAX (lang_num, bucket.numTranslations()+1); if (i == 0) expr.setOriginal(bucket.getOriginal()); else { @@ -228,7 +228,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is) } } setModified (false); - return is.device()->status() == IO_Ok; + return is.tqdevice()->status() == IO_Ok; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp index 7212f456..ae713937 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp @@ -93,7 +93,7 @@ Sachgebiete| static TQString extract (TQString &line) { TQString ret; - int lim = line.find ("|"); + int lim = line.tqfind ("|"); if (lim < 0) { ret = line; line = ""; @@ -116,7 +116,7 @@ bool kvoctrainDoc::saveTypeNameLex (TQTextStream &os) while (i++ < LEX_MAX_ATTR) os << "|\n"; - return os.device()->status() == IO_Ok; + return os.tqdevice()->status() == IO_Ok; } @@ -139,7 +139,7 @@ bool kvoctrainDoc::loadTypeNameLex (TQTextStream &is) type_descr.push_back (attr); } - return is.device()->status() == IO_Ok; + return is.tqdevice()->status() == IO_Ok; } @@ -152,7 +152,7 @@ bool kvoctrainDoc::saveLessonLex (TQTextStream &os) while (i++ < LEX_MAX_LESSON) os << "|\n"; - return os.device()->status() == IO_Ok; + return os.tqdevice()->status() == IO_Ok; } @@ -172,7 +172,7 @@ bool kvoctrainDoc::loadLessonLex (TQTextStream &is) lesson_descr.push_back (lesson); } - return is.device()->status() == IO_Ok; + return is.tqdevice()->status() == IO_Ok; } @@ -220,8 +220,8 @@ bool kvoctrainDoc::saveToLex (TQTextStream& os, TQString & /*title*/) os << "0" // type << " " << "255 255 255 255 255 255 255" - << " " << QMIN (2, (*first).getGrade(false)) - << " " << QMIN (2, (*first).getGrade(true)) + << " " << TQMIN (2, (*first).getGrade(false)) + << " " << TQMIN (2, (*first).getGrade(true)) << " " << (*first).getLesson() << " " << (*first).getOriginal() << " " << "||||" // synonyms @@ -234,7 +234,7 @@ bool kvoctrainDoc::saveToLex (TQTextStream& os, TQString & /*title*/) } setModified (false); - return os.device()->status() == IO_Ok; + return os.tqdevice()->status() == IO_Ok; } @@ -380,7 +380,7 @@ bool kvoctrainDoc::loadFromLex (TQTextStream& is) } setModified (false); - return is.device()->status() == IO_Ok; + return is.tqdevice()->status() == IO_Ok; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp index f07e906d..e268ce0f 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp @@ -83,7 +83,7 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_TYPE_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TYPE_GRP)); + i18n("expected ending tag <%1>").tqarg(KV_TYPE_GRP)); return false; } else @@ -109,14 +109,14 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml) } else if (elem.tag() != KV_TYPE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TYPE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_TYPE_DESC)); return false; } } else { if (elem.tag() != KV_TYPE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TYPE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_TYPE_DESC)); return false; } @@ -127,7 +127,7 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -157,7 +157,7 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_TENSE_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TENSE_GRP)); + i18n("expected ending tag <%1>").tqarg(KV_TENSE_GRP)); return false; } else @@ -183,14 +183,14 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml) } else if (elem.tag() != KV_TENSE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TENSE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_TENSE_DESC)); return false; } } else { if (elem.tag() != KV_TENSE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TENSE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_TENSE_DESC)); return false; } @@ -201,7 +201,7 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -231,7 +231,7 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_USAGE_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_USAGE_GRP)); + i18n("expected ending tag <%1>").tqarg(KV_USAGE_GRP)); return false; } else @@ -257,14 +257,14 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml) } else if (elem.tag() != KV_USAGE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_USAGE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_USAGE_DESC)); return false; } } else { if (elem.tag() != KV_USAGE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_USAGE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_USAGE_DESC)); return false; } @@ -275,7 +275,7 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -347,7 +347,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_GRADE) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { grade = s.left(pos).toInt(); rev_grade = s.mid(pos+1, s.length()).toInt(); } @@ -357,7 +357,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_COUNT) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { count = s.left(pos).toInt(); rev_count = s.mid(pos+1, s.length()).toInt(); } @@ -367,7 +367,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_BAD) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { bcount = s.left(pos).toInt(); rev_bcount = s.mid(pos+1, s.length()).toInt(); } else @@ -376,7 +376,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_DATE) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { date = s.left(pos).toInt(); rev_date = s.mid(pos+1, s.length()).toInt(); } @@ -387,7 +387,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_DATE2) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { date = decompressDate (s.left(pos)); rev_date = decompressDate (s.mid(pos+1, s.length())); } @@ -420,7 +420,7 @@ bool kvoctrainDoc::extract_O_T_attr ( usage = (*first).stringValue(); if (usage.length() != 0 && usage.left(1) == UL_USER_USAGE) { - int num = QMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check + int num = TQMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check if( num > (int) usage_descr.size() ) { // description missing ? TQString s; for (int i = usage_descr.size(); i < num; i++) { @@ -443,14 +443,14 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_EXPRTYPE) { type = (*first).stringValue(); if (type == "1") - type = QM_VERB; + type = TQM_VERB; else if (type == "2") // convert from pre-0.5 versions - type = QM_NOUN; + type = TQM_NOUN; else if (type == "3") - type = QM_NAME; + type = TQM_NAME; - if (type.length() != 0 && type.left(1) == QM_USER_TYPE) { - int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check + if (type.length() != 0 && type.left(1) == TQM_USER_TYPE) { + int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check if( num > (int) type_descr.size() ) { // description missing ? TQString s; for (int i = type_descr.size(); i < num; i++) { @@ -466,7 +466,7 @@ bool kvoctrainDoc::extract_O_T_attr ( pronunce = (*first).stringValue(); } - else if ((*first).name () == KV_QUERY) { + else if ((*first).name () == KV_TQUERY) { query_id = (*first).stringValue(); } @@ -504,14 +504,14 @@ bool kvoctrainDoc::extract_KVT_E_attr ( else if ((*first).name () == KV_EXPRTYPE) { type = (*first).stringValue(); if (type == "1") - type = QM_VERB; + type = TQM_VERB; else if (type == "2") // convert from pre-0.5 versions - type = QM_NOUN; + type = TQM_NOUN; else if (type == "3") - type = QM_NAME; + type = TQM_NAME; - if (type.length() != 0 && type.left(1) == QM_USER_TYPE) { - int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check + if (type.length() != 0 && type.left(1) == TQM_USER_TYPE) { + int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check if( num > (int) type_descr.size() ) { // description missing ? TQString s; for (int i = type_descr.size(); i < num; i++) { @@ -553,7 +553,7 @@ bool kvoctrainDoc::loadComparison (Comparison &comp, XmlElement elem, if (elem.tag () == KV_COMPARISON_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(elem.tag())); + i18n("expected ending tag <%1>").tqarg(elem.tag())); return false; } else @@ -582,7 +582,7 @@ bool kvoctrainDoc::loadComparison (Comparison &comp, XmlElement elem, else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>").arg(elem.tag())); + i18n("unexpected ending tag <%1>").tqarg(elem.tag())); return false; } else { @@ -620,7 +620,7 @@ bool kvoctrainDoc::loadMultipleChoice (MultipleChoice &mc, XmlElement elem, if (elem.tag () == KV_MULTIPLECHOICE_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(elem.tag())); + i18n("expected ending tag <%1>").tqarg(elem.tag())); return false; } else @@ -661,7 +661,7 @@ bool kvoctrainDoc::loadMultipleChoice (MultipleChoice &mc, XmlElement elem, else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>").arg(elem.tag())); + i18n("unexpected ending tag <%1>").tqarg(elem.tag())); return false; } else { @@ -702,7 +702,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_DOCTYPE) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(elem.tag())); + i18n("expected ending tag <%1>").tqarg(elem.tag())); return false; } else @@ -712,7 +712,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_LESS_GRP && !elem.isEndTag() ) { if (lessgroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } lessgroup = true; @@ -723,7 +723,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_ARTICLE_GRP && !elem.isEndTag() ) { if (articlegroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } articlegroup = true; @@ -734,7 +734,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_CONJUG_GRP && !elem.isEndTag() ) { if (conjuggroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } conjuggroup = true; @@ -745,7 +745,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_OPTION_GRP && !elem.isEndTag() ) { if (optgroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } optgroup = true; @@ -756,7 +756,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_TYPE_GRP && !elem.isEndTag() ) { if (attrgroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } attrgroup = true; @@ -767,7 +767,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_TENSE_GRP && !elem.isEndTag() ) { if (tensegroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } tensegroup = true; @@ -779,7 +779,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_USAGE_GRP && !elem.isEndTag() ) { if (usagegroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } usagegroup = true; @@ -801,7 +801,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -824,7 +824,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name, unknown_attr = true; - TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); + TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line); TQString format = i18n( "Your document contains an unknown attribute <%1> " // keep trailing space @@ -834,7 +834,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name, "If you proceed and save afterwards you are likely to lose data;\n" "do you want to proceed anyway?\n" ); - TQString msg = format.arg(attr).arg(name); + TQString msg = format.tqarg(attr).tqarg(name); TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Unknown attribute")); @@ -848,7 +848,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) { unknown_elem = true; - TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); + TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line); TQString format = i18n( "Your document contains an unknown tag <%1>. " // keep trailing space @@ -857,7 +857,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) "Loading is aborted because KVocTrain cannot " "read documents with unknown elements.\n" ); - TQString msg = format.arg(elem); + TQString msg = format.tqarg(elem); TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Unknown element")); KMessageBox::sorry(0, ln+msg, s); @@ -869,7 +869,7 @@ void kvoctrainDoc::errorKvtMl (int line, const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Error")); - TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); + TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line); TQString msg = text; KMessageBox::error(0, ln+msg, s); @@ -881,7 +881,7 @@ void kvoctrainDoc::warningKvtMl (int line, const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Warning")); - TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); + TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line); TQString msg = text; KMessageBox::information(0, ln+msg, s); TQApplication::restoreOverrideCursor(); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp index f4443ca5..de7cbd19 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp @@ -85,7 +85,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml) if (elem.tag() == KV_EXPR && !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(elem.tag())); + i18n("disallowed occurrence of tag <%1>").tqarg(elem.tag())); return false; } @@ -100,7 +100,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml) if (elem.tag() == KV_ORG && !elem.isEndTag() ) { if (org_found) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } org_found = true; @@ -204,14 +204,14 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml) if (elem.tag() != KV_ORG || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_ORG)); + i18n("expected ending tag <%1>").tqarg(KV_ORG)); return false; } } else { if (elem.tag() != KV_ORG || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_ORG)); + i18n("expected ending tag <%1>").tqarg(KV_ORG)); return false; } textstr = ""; @@ -259,7 +259,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml) else if (elem.tag() == KV_TRANS && !elem.isEndTag() ) { if (!org_found) { // must be preceded by "original" errorKvtMl (xml.lineNumber(), - i18n("starting tag <%1> is missing").arg(KV_ORG)); + i18n("starting tag <%1> is missing").tqarg(KV_ORG)); return false; } @@ -366,7 +366,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml) if (elem.tag() != KV_TRANS || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TRANS)); + i18n("expected ending tag <%1>").tqarg(KV_TRANS)); return false; } // expr ... @@ -374,7 +374,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml) else { if (elem.tag() != KV_TRANS || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TRANS)); + i18n("expected ending tag <%1>").tqarg(KV_TRANS)); return false; } textstr = ""; @@ -384,7 +384,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml) if (!org_found) { errorKvtMl (xml.lineNumber(), - i18n("starting tag <%1> is missing").arg(KV_ORG)); + i18n("starting tag <%1> is missing").tqarg(KV_ORG)); return false; } /* @@ -440,7 +440,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp index f952b38a..92896105 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp @@ -61,7 +61,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is) if (elem.tag () != KV_DOCTYPE) { errorKvtMl (xml.lineNumber(), i18n("Tag <%1> was expected " - "but tag <%2> was read." ).arg(KV_DOCTYPE).arg(elem.tag())); + "but tag <%2> was read." ).tqarg(KV_DOCTYPE).tqarg(elem.tag())); return false; } @@ -84,7 +84,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is) is.setEncoding(TQTextStream::Latin1); TQString format = i18n("Unknown document encoding \"%1\" was encountered.\n\n" "It will be ignored. Encoding is now \"%2\"."); - TQString msg =format.arg((*first).stringValue ().upper()).arg("ISO 8859-1"); + TQString msg =format.tqarg((*first).stringValue ().upper()).tqarg("ISO 8859-1"); warningKvtMl (xml.lineNumber(), msg); } @@ -103,7 +103,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is) } else if ((*first).name () == KV_GENERATOR) { generator = (*first).stringValue (); - int pos = generator.findRev (KVD_VERS_PREFIX); + int pos = generator.tqfindRev (KVD_VERS_PREFIX); if (pos >= 0) { doc_version = generator; doc_version.remove (0, pos+2); @@ -143,7 +143,7 @@ bool kvoctrainDoc::extract_L_DESCR_attr (XmlReader &xml, no = (*first).intValue(); else if ((*first).name () == KV_LESS_CURR) isCurr = (*first).intValue() != 0; - else if ((*first).name () == KV_LESS_QUERY) + else if ((*first).name () == KV_LESS_TQUERY) inQuery = (*first).intValue() != 0; else { if (!unknownAttribute(xml.lineNumber(), "descr", (*first).name ())) @@ -190,13 +190,13 @@ bool kvoctrainDoc::extract_simple_tag (TQString tag_name, return false; } else if (elem.tag() != tag_name || !elem.isEndTag() ) { - errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").arg(tag_name)); + errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").tqarg(tag_name)); return false; } } else { if (elem.tag() != tag_name || !elem.isEndTag() ) { - errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").arg(tag_name)); + errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").tqarg(tag_name)); return false; } data = ""; @@ -268,12 +268,12 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_ARTICLE_GRP) { if (inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_ARTICLE_GRP)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_ARTICLE_GRP)); return false; } if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_ARTICLE_GRP)); + i18n("expected ending tag <%1>").tqarg(KV_ARTICLE_GRP)); return false; } else @@ -283,7 +283,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml) if (! elem.isEndTag ()) { if (inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_ART_ENTRY)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_ENTRY)); return false; } inEntry = true; @@ -321,7 +321,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_ART_FD && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_ART_FD)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_FD)); return false; } if (!extract_simple_tag (KV_ART_FD, xml, elem, fem_def)) @@ -330,7 +330,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_ART_FI && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_ART_FI)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_FI)); return false; } if (!extract_simple_tag (KV_ART_FI, xml, elem, fem_indef)) @@ -339,7 +339,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_ART_MD && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_ART_MD)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_MD)); return false; } if (!extract_simple_tag (KV_ART_MD, xml, elem, mal_def)) @@ -348,7 +348,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_ART_MI && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_ART_MI)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_MI)); return false; } if (!extract_simple_tag (KV_ART_MI, xml, elem, mal_indef)) @@ -357,7 +357,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_ART_ND && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_ART_ND)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_ND)); return false; } if (!extract_simple_tag (KV_ART_ND, xml, elem, nat_def)) @@ -366,7 +366,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_ART_NI && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_ART_NI)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_NI)); return false; } if (!extract_simple_tag (KV_ART_NI, xml, elem, nat_indef)) @@ -375,7 +375,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -502,12 +502,12 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, if (elem.tag () == KV_CONJUG_GRP) { if (inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CONJUG_GRP)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CONJUG_GRP)); return false; } if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(elem.tag())); + i18n("expected ending tag <%1>").tqarg(elem.tag())); return false; } else @@ -517,7 +517,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, if (! elem.isEndTag ()) { if (inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(entry_tag)); + i18n("disallowed occurrence of tag <%1>").tqarg(entry_tag)); return false; } inEntry = true; @@ -544,7 +544,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, if (!extract_T_attr (xml, elem, type)) return false; if (type.length() != 0 && type.left(1) == UL_USER_TENSE) { - int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check + int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check if( num > (int) tense_descr.size() ) { // description missing ? TQString s; for (int i = tense_descr.size(); i < num; i++) { @@ -595,7 +595,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P1S && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P1S)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P1S)); return false; } if (!extract_simple_tag (KV_CON_P1S, xml, elem, pers1_sing) ) @@ -604,7 +604,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P2S && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P2S)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P2S)); return false; } if (!extract_simple_tag (KV_CON_P2S, xml, elem, pers2_sing)) @@ -613,7 +613,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P3SF && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3SF)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3SF)); return false; } @@ -627,7 +627,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P3SM && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3SM)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3SM)); return false; } if (!extract_simple_tag (KV_CON_P3SM, xml, elem, pers3_m_sing)) @@ -636,7 +636,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P3SN && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3SN)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3SN)); return false; } if (!extract_simple_tag (KV_CON_P3SN, xml, elem, pers3_n_sing)) @@ -645,7 +645,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P1P && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P1P)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P1P)); return false; } if (!extract_simple_tag (KV_CON_P1P, xml, elem, pers1_plur) ) @@ -654,7 +654,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P2P && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P2P)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P2P)); return false; } if (!extract_simple_tag (KV_CON_P2P, xml, elem, pers2_plur)) @@ -663,7 +663,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P3PF && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3PF)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3PF)); return false; } @@ -677,7 +677,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P3PM && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3PM)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3PM)); return false; } if (!extract_simple_tag (KV_CON_P3PM, xml, elem, pers3_m_plur)) @@ -686,7 +686,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else if (elem.tag () == KV_CON_P3PN && !elem.isEndTag() ) { if (!inEntry) { errorKvtMl (xml.lineNumber(), - i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3PN)); + i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3PN)); return false; } if (!extract_simple_tag (KV_CON_P3PN, xml, elem, pers3_n_plur)) @@ -695,7 +695,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector &curr_conjug, else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -748,7 +748,7 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_LESS_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(elem.tag())); + i18n("expected ending tag <%1>").tqarg(elem.tag())); return false; } else @@ -780,14 +780,14 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag() != KV_LESS_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_LESS_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_LESS_DESC)); return false; } } else { if (elem.tag() != KV_LESS_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_LESS_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_LESS_DESC)); return false; } s = ""; @@ -797,7 +797,7 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -823,7 +823,7 @@ bool kvoctrainDoc::loadOptionsKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_OPTION_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(elem.tag())); + i18n("expected ending tag <%1>").tqarg(elem.tag())); return false; } else @@ -841,7 +841,7 @@ bool kvoctrainDoc::loadOptionsKvtMl (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp index 72020b94..8821a9aa 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp @@ -91,7 +91,7 @@ bool kvoctrainDoc::saveToVcb (TQTextStream& os, TQString &/*title*/) } setModified (false); - return os.device()->status() == IO_Ok; + return os.tqdevice()->status() == IO_Ok; } @@ -103,7 +103,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is) loadTypeNameVcb (is); loadLessonVcb (is); - int size = is.device()->size (); + int size = is.tqdevice()->size (); int ln = size / 40 / 100; // assume each line about 40 chars float f_ent_percent = size / 100.0; emit progressChanged (this, 0); @@ -114,7 +114,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is) ln--; if (ln <= 0) { ln = size / 40 / 100; // assume each line about 40 chars - emit progressChanged(this, int(is.device()->at() / f_ent_percent)); + emit progressChanged(this, int(is.tqdevice()->at() / f_ent_percent)); } if (!s.stripWhiteSpace().isEmpty()) { @@ -124,13 +124,13 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is) size_t odate = time(0), tdate = time(0); - int pos = s.find (VCB_SEPARATOR); + int pos = s.tqfind (VCB_SEPARATOR); if (pos >= 0) { o = s.left(pos); s.remove (0, pos+TQString(VCB_SEPARATOR).length()); } - pos = s.find (VCB_SEPARATOR); + pos = s.tqfind (VCB_SEPARATOR); if (pos >= 0) { t = s.left(pos); s.remove (0, pos+TQString(VCB_SEPARATOR).length()); @@ -139,19 +139,19 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is) t = s; } - pos = s.find (VCB_SEPARATOR); + pos = s.tqfind (VCB_SEPARATOR); if (pos >= 0) { ograde = s.left(pos).toInt(); s.remove (0, pos+TQString(VCB_SEPARATOR).length()); } - pos = s.find (VCB_SEPARATOR); + pos = s.tqfind (VCB_SEPARATOR); if (pos >= 0) { tgrade = s.left(pos).toInt(); s.remove (0, pos+TQString(VCB_SEPARATOR).length()); } - pos = s.find (VCB_SEPARATOR); + pos = s.tqfind (VCB_SEPARATOR); if (pos >= 0) { odate = s.left(pos).toInt(); s.remove (0, pos+TQString(VCB_SEPARATOR).length()); @@ -184,7 +184,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is) langs.push_back("en"); setModified (false); - return is.device()->status() == IO_Ok; + return is.tqdevice()->status() == IO_Ok; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp index 7cce072b..d57f702c 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp @@ -62,7 +62,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is) while (keepGoing) { temp = is.readLine(); - keepGoing = !(temp.find("\",") > 0); + keepGoing = !(temp.tqfind("\",") > 0); title.append(temp); if (keepGoing) title.append(" "); @@ -83,7 +83,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is) keepGoing = true; while (keepGoing) - keepGoing = !(is.readLine().find("8. Lernhilfe") > 0); //DO NOT translate + keepGoing = !(is.readLine().tqfind("8. Lernhilfe") > 0); //DO NOT translate for (i = 0; i <= 14; i++) is.readLine(); @@ -96,7 +96,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is) while (c < 2) { temp = is.readLine(); - c+= temp.contains("\","); + c+= temp.tqcontains("\","); expression.append(temp); if (c < 2) expression.append(" "); @@ -137,5 +137,5 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is) setModified(false); doc_url.setFileName(i18n("Untitled")); - return is.device()->status() == IO_Ok; + return is.tqdevice()->status() == IO_Ok; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp index c3f546c7..c89782a5 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp @@ -126,7 +126,7 @@ bool kvoctrainDoc::saveLessonKvtMl (XmlWriter &xml) if (getCurrentLesson() == lfn+1) xml.addAttribute (KV_LESS_CURR, (TQString) "1" ); if (lfn < (int) lessons_in_query.size() && lessons_in_query[lfn]) - xml.addAttribute (KV_LESS_QUERY, (TQString) "1" ); + xml.addAttribute (KV_LESS_TQUERY, (TQString) "1" ); xml.closeTag(); xml.writeText (lesson_descr[lfn]); xml.endTag (KV_LESS_DESC, true); @@ -261,7 +261,7 @@ bool kvoctrainDoc::saveConjugHeader(vector &curr_conjug, xml.closeTag(false, true); TQString def, indef, s; - for (int ent = 0; ent < QMIN((int) curr_conjug.size(), numLangs()); ent++) { + for (int ent = 0; ent < TQMIN((int) curr_conjug.size(), numLangs()); ent++) { xml.writeText(" "); // indent entry a bit xml.startTag (KV_CON_ENTRY, false); @@ -485,7 +485,7 @@ bool kvoctrainDoc::saveArticleKvtMl (XmlWriter &xml) xml.closeTag(false, true); TQString def, indef, s; - for (int lfn = 0; lfn < QMIN((int) articles.size(), numLangs()); lfn++) { + for (int lfn = 0; lfn < TQMIN((int) articles.size(), numLangs()); lfn++) { xml.writeText(" "); // indent entry a bit xml.startTag (KV_ART_ENTRY, false); if (lfn == 0) { @@ -759,9 +759,9 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) { s = "original"; xml.addAttribute (KV_LANG, s); if (s == q_org) - xml.addAttribute (KV_QUERY, (TQString) KV_O); + xml.addAttribute (KV_TQUERY, (TQString) KV_O); else if (s == q_trans) - xml.addAttribute (KV_QUERY, (TQString) KV_T); + xml.addAttribute (KV_TQUERY, (TQString) KV_T); } @@ -804,19 +804,19 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) { TQString s; TQString entype = s = (*first).getType(0); - int pos = s.find (QM_TYPE_DIV); + int pos = s.tqfind (TQM_TYPE_DIV); if (pos >= 0) entype = s.left (pos); else entype = s; - if ( entype == QM_VERB + if ( entype == TQM_VERB && (*first).getConjugation(0).numEntries() > 0) { Conjugation conj = (*first).getConjugation(0); if (!saveConjugEntry(conj, xml, 1)) return false; } - else if (entype == QM_ADJ + else if (entype == TQM_ADJ && !(*first).getComparison(0).isEmpty()) { Comparison comp = (*first).getComparison(0); if (!saveComparison (comp, xml, 1)) @@ -841,9 +841,9 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) { } xml.addAttribute (KV_LANG, s); if (s == q_org) - xml.addAttribute (KV_QUERY, (TQString) KV_O); + xml.addAttribute (KV_TQUERY, (TQString) KV_O); else if (s == q_trans) - xml.addAttribute (KV_QUERY, (TQString) KV_T); + xml.addAttribute (KV_TQUERY, (TQString) KV_T); } TQString s1, s2; @@ -925,20 +925,20 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) { TQString s; TQString entype = s = (*first).getType(0); - int pos = s.find (QM_TYPE_DIV); + int pos = s.tqfind (TQM_TYPE_DIV); if (pos >= 0) entype = s.left (pos); else entype = s; - if ( entype == QM_VERB + if ( entype == TQM_VERB && (*first).getConjugation(trans).numEntries() > 0) { Conjugation conj = (*first).getConjugation(trans); if (!saveConjugEntry(conj, xml, 1+trans)) return false; } - if ( entype == QM_ADJ + if ( entype == TQM_ADJ && !(*first).getComparison(trans).isEmpty()) { Comparison comp = (*first).getComparison(trans); if (!saveComparison (comp, xml, 1+trans)) @@ -956,5 +956,5 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) { xml.endTag (KV_DOCTYPE, true); setModified (false); - return os.device()->status() == IO_Ok; + return os.tqdevice()->status() == IO_Ok; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h index 365882c6..d2403e7a 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h @@ -58,8 +58,8 @@ #define CFG_LESSONSIZE "LessonSize" -#define CFG_QUERYPROP "QueryProperties" -#define CFG_QUERYMODE "QueryMode" +#define CFG_TQUERYPROP "QueryProperties" +#define CFG_TQUERYMODE "QueryMode" #define CFG_DEFTRANS "DefaultTranslation" #define CFG_DEFORG "DefaultOriginal" @@ -72,32 +72,32 @@ #define CFG_L_FONT "Font" #define CFG_L_STDFONT "SpecialFont" -#define CFG_QUERYMANAG "QueryManager" -#define CFG_QM_DATE_ITEM "DateItem" -#define CFG_QM_DATE_COMP "DateComp" -#define CFG_QM_QUERY_ITEM "QueryItem" -#define CFG_QM_QUERY_COMP "QueryComp" -#define CFG_QM_BAD_ITEM "BadItem" -#define CFG_QM_BAD_COMP "BadComp" -#define CFG_QM_TYPE_ITEM "TypeItem" -#define CFG_QM_TYPE_COMP "TypeComp" -#define CFG_QM_GRADE_ITEM "GradeItem" -#define CFG_QM_GRADE_COMP "GradeComp" -#define CFG_QM_LESSON_ITEM "LessonItem" -#define CFG_QM_LESSON_COMP "LessonComp" -#define CFG_QM_BLOCK_ITEM "BlockItem" -#define CFG_QM_EXPIRE_ITEM "ExpireItem" - -#define CFG_QUERY_PRESETTING "QueryPreSettings" -#define CFG_QP_NUM "NumPreSetting" -#define CFG_QP_NAME "Name" -#define CFG_QP_THRESH "Threshhold" -#define CFG_QP_BLOCK "Blocking" -#define CFG_QP_QUERY "Query" +#define CFG_TQUERYMANAG "QueryManager" +#define CFG_TQM_DATE_ITEM "DateItem" +#define CFG_TQM_DATE_COMP "DateComp" +#define CFG_TQM_TQUERY_ITEM "QueryItem" +#define CFG_TQM_TQUERY_COMP "QueryComp" +#define CFG_TQM_BAD_ITEM "BadItem" +#define CFG_TQM_BAD_COMP "BadComp" +#define CFG_TQM_TYPE_ITEM "TypeItem" +#define CFG_TQM_TYPE_COMP "TypeComp" +#define CFG_TQM_GRADE_ITEM "GradeItem" +#define CFG_TQM_GRADE_COMP "GradeComp" +#define CFG_TQM_LESSON_ITEM "LessonItem" +#define CFG_TQM_LESSON_COMP "LessonComp" +#define CFG_TQM_BLOCK_ITEM "BlockItem" +#define CFG_TQM_EXPIRE_ITEM "ExpireItem" + +#define CFG_TQUERY_PRESETTING "QueryPreSettings" +#define CFG_TQP_NUM "NumPreSetting" +#define CFG_TQP_NAME "Name" +#define CFG_TQP_THRESH "Threshhold" +#define CFG_TQP_BLOCK "Blocking" +#define CFG_TQP_TQUERY "Query" #define KVTML_EXT "kvtml" #define VT5_LEX_EXT "lex" -#define QVOCAB_EXT "qvo" +#define TQVOCAB_EXT "qvo" #define VCB_EXT "vocab" #define KVL_EXT "vl" #define CSV_EXT "csv" diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp index a10aa28a..9f2c0124 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp @@ -91,13 +91,13 @@ void kvoctrainDoc::Init () } -kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url) +kvoctrainDoc::kvoctrainDoc(TQObject *tqparent, const KURL& url) { Init(); if (!url.isEmpty()) doc_url = url; - connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); + connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), tqparent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); TQString tmpfile; if (KIO::NetAccess::download( url, tmpfile, 0 )) @@ -105,7 +105,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url) TQFile f(tmpfile); if (!f.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("Cannot open file
    %1    ").arg(url.path())); + KMessageBox::error(0, i18n("Cannot open file
    %1    ").tqarg(url.path())); return; } @@ -166,7 +166,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url) return; } TQString format = i18n("Could not load \"%1\"\nDo you want to try again?"); - TQString msg = format.arg(url.path()); + TQString msg = format.tqarg(url.path()); int result = KMessageBox::warningContinueCancel(0, msg, kapp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); @@ -187,15 +187,15 @@ kvoctrainDoc::~kvoctrainDoc() } -bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft) +bool kvoctrainDoc::saveAs (TQObject *tqparent, const KURL & url, TQString title, FileType ft) { - connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); + connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), tqparent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); KURL tmp (url); if (title == i18n("Untitled")) - title = TQString::null; + title = TQString(); if (title == doc_url.fileName()) - title = TQString::null; + title = TQString(); if (ft == automatic) { @@ -222,7 +222,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F if (!f.open(IO_WriteOnly)) { - KMessageBox::error(0, i18n("Cannot write to file
    %1    ").arg(tmp.path())); + KMessageBox::error(0, i18n("Cannot write to file
    %1    ").tqarg(tmp.path())); return false; } @@ -262,7 +262,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F if (!saved) { TQString format = i18n("Could not save \"%1\"\nDo you want to try again?"); - TQString msg = format.arg(tmp.path()); + TQString msg = format.tqarg(tmp.path()); int result = KMessageBox::warningContinueCancel(0, msg, kapp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); @@ -848,10 +848,10 @@ int kvoctrainDoc::search(TQString substr, int id, { if (id == 0) { - if (getEntry(i)->getOriginal().find (substr, 0, false) == 0) // case insensitive + if (getEntry(i)->getOriginal().tqfind (substr, 0, false) == 0) // case insensitive return i; } else { - if (getEntry(i)->getTranslation(id).find (substr, 0, false) == 0) // case insensitive + if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) == 0) // case insensitive return i; } } @@ -861,10 +861,10 @@ int kvoctrainDoc::search(TQString substr, int id, if (id == 0) { - if (getEntry(i)->getOriginal().find (substr, 0, false) > -1) // case insensitive + if (getEntry(i)->getOriginal().tqfind (substr, 0, false) > -1) // case insensitive return i; } else { - if (getEntry(i)->getTranslation(id).find (substr, 0, false) > -1) // case insensitive + if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) > -1) // case insensitive return i; } } @@ -920,7 +920,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename) TQDataStream is( &f ); - Q_INT8 c1, c2, c3, c4, c5; + TQ_INT8 c1, c2, c3, c4, c5; is >> c1 >> c2 >> c3 @@ -937,19 +937,19 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename) line.insert (0, c1); f.close(); - bool stat = is.device()->status(); + bool stat = is.tqdevice()->status(); if (stat != IO_Ok) return kvd_none; if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l') return kvtml; - if (line.find (VCB_SEPARATOR) >= 0) + if (line.tqfind (VCB_SEPARATOR) >= 0) return vt_vcb; if (line == LEX_IDENT_50) return vt_lex; - if (c1 == '"' && (line.contains('"') == 1 || line.contains(TQRegExp("\",[0-9]")))) + if (c1 == '"' && (line.tqcontains('"') == 1 || line.tqcontains(TQRegExp("\",[0-9]")))) return vt_voc; return csv; diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h index c331aac0..383180a4 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h @@ -59,7 +59,7 @@ #define KV_ORG "o" // original expression in specified language #define KV_TRANS "t" // translated expression in specified language #define KV_LANG "l" // language: en, de, it, fr ... -#define KV_QUERY "q" // query: org or translation +#define KV_TQUERY "q" // query: org or translation #define KV_O "o" // org #define KV_T "t" // translation #define KV_GRADE "g" // grade of knowledge: 0=well known, x=not known for x times @@ -115,7 +115,7 @@ #define KV_LESS_GRP "lesson" // lesson descriptor group #define KV_LESS_CURR "current" // is current lesson #define KV_LESS_DESC "desc" // lesson descriptor -#define KV_LESS_QUERY "query" // lesson contained in query +#define KV_LESS_TQUERY "query" // lesson contained in query #define KV_LESS_NO "no" // lesson descriptor number /* @@ -250,9 +250,10 @@ class MultipleChoice; * This class contains the expressions of your vocabulary ************************************************************/ -class kvoctrainDoc : public QObject +class kvoctrainDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: enum FileType { kvd_none, automatic, @@ -424,7 +425,7 @@ class kvoctrainDoc : public QObject * @param url if url is empty (or NULL) actual name is preserved * @result true if successful */ - bool saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft); + bool saveAs (TQObject *tqparent, const KURL & url, TQString title, FileType ft); /** returns count of entries */ diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp index 5ce499d1..6b3501ed 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp @@ -62,7 +62,7 @@ kvoctrainExpr::kvoctrainExpr (TQString &s, TQString separator, int _lesson) lesson = _lesson; if (separator.length() ) { - int pos = s.find(separator); + int pos = s.tqfind(separator); if (pos == -1) { setOriginal(s.stripWhiteSpace()); @@ -74,7 +74,7 @@ kvoctrainExpr::kvoctrainExpr (TQString &s, TQString separator, int _lesson) // s.stripWhiteSpace(); // gather all translations - while ((pos = s.find(separator)) != -1) { + while ((pos = s.tqfind(separator)) != -1) { se = s.left(pos).stripWhiteSpace(); addTranslation(se, KV_NORM_GRADE, KV_NORM_GRADE); s.remove (0, pos+separator.length() ); diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h index f31cd1e9..a22b06e7 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h @@ -32,7 +32,7 @@ #define KV_MIN_GRADE 0 #define KV_NORM_GRADE 0 // not queried yet -#define KV_NORM_COLOR Qt::black +#define KV_NORM_COLOR TQt::black static const char *KV_NORM_TEXT = I18N_NOOP("Not Queried Yet"); #define KV_LEV1_GRADE 1 diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp index 819d79a6..d530ea87 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp @@ -42,7 +42,7 @@ bool XmlReader::validHeader () { // Check for: if (tokenizer.nextToken () != XmlTokenizer::Tok_Lt) return false; - if (tokenizer.nextToken () != XmlTokenizer::Tok_QSign) + if (tokenizer.nextToken () != XmlTokenizer::Tok_TQSign) return false; if (tokenizer.nextToken () != XmlTokenizer::Tok_Symbol) @@ -61,7 +61,7 @@ bool XmlReader::validHeader () { else if (tokenizer.element () != "1.0") return false; - if (tokenizer.nextToken () != XmlTokenizer::Tok_QSign) + if (tokenizer.nextToken () != XmlTokenizer::Tok_TQSign) return false; if (tokenizer.nextToken () != XmlTokenizer::Tok_Gt) return false; @@ -208,31 +208,31 @@ bool XmlReader::readAttributes (std::list& attrib_list) { // un-escape dangerous characters in reverted order KOXML_STRING val = tokenizer.element(); int pos = 0; - while ((pos = val.find(""", pos)) >= 0) { + while ((pos = val.tqfind(""", pos)) >= 0) { KOXML_STRING_REMOVE( val, pos, 6); KOXML_STRING_INSERT( val, pos, "\""); pos += 1; // skip " } pos = 0; - while ((pos = val.find("&lf;", pos)) >= 0) { + while ((pos = val.tqfind("&lf;", pos)) >= 0) { KOXML_STRING_REMOVE( val, pos, 4); KOXML_STRING_INSERT( val, pos, "\r"); pos += 1; // skip \r } pos = 0; - while ((pos = val.find("&nl;", pos)) >= 0) { + while ((pos = val.tqfind("&nl;", pos)) >= 0) { KOXML_STRING_REMOVE( val, pos, 4); KOXML_STRING_INSERT( val, pos, "\n"); pos += 1; // skip \n } pos = 0; - while ((pos = val.find("<", pos)) >= 0) { + while ((pos = val.tqfind("<", pos)) >= 0) { KOXML_STRING_REMOVE( val, pos, 4); KOXML_STRING_INSERT( val, pos, "<"); pos += 1; // skip < } pos = 0; - while ((pos = val.find ("&", pos)) >= 0) { + while ((pos = val.tqfind ("&", pos)) >= 0) { KOXML_STRING_REMOVE( val, pos+1, 4); pos += 1; // skip & } diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.cpp b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.cpp index b2fde685..0a147b70 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.cpp @@ -118,7 +118,7 @@ XmlTokenizer::Token XmlTokenizer::nextToken () { return last_tok = Tok_Gt; break; case '?': - return last_tok = Tok_QSign; + return last_tok = Tok_TQSign; break; case '/': return last_tok = Tok_Slash; @@ -380,7 +380,7 @@ int main (int argc, char** argv) { case XmlTokenizer::Tok_Gt: cout << "> "; break; - case XmlTokenizer::Tok_QSign: + case XmlTokenizer::Tok_TQSign: cout << "? "; break; case XmlTokenizer::Tok_Slash: diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h index df0d4031..564e3422 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h @@ -33,7 +33,7 @@ public: Tok_Comment, /* 5 */ Tok_Lt, /* < 6 */ Tok_Gt, /* > 7 */ - Tok_QSign, /* ? 8 */ + Tok_TQSign, /* ? 8 */ Tok_Eq, /* = 9 */ Tok_Slash, /* / 10 */ Tok_Exclam, /* ! 11 */ diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp index 38dfdbf2..afeeda73 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp @@ -116,30 +116,30 @@ void XmlWriter::addAttribute (KOXML_STRING name, const KOXML_STRING& value) KOXML_STRING val = value; // escape dangerous characters in sgml-style int pos = 0; - while ((pos = val.find ('&', pos)) >= 0) { + while ((pos = val.tqfind ('&', pos)) >= 0) { KOXML_STRING_INSERT( val, pos+1, "amp;"); pos += 5; // skip & } pos = 0; - while ((pos = val.find ('<', pos)) >= 0) { + while ((pos = val.tqfind ('<', pos)) >= 0) { KOXML_STRING_REMOVE( val, pos, 1); KOXML_STRING_INSERT( val, pos, "<"); pos += 4; // skip &nl; } pos = 0; - while ((pos = val.find ('\n', pos)) >= 0) { + while ((pos = val.tqfind ('\n', pos)) >= 0) { KOXML_STRING_REMOVE( val, pos, 1); KOXML_STRING_INSERT( val, pos, "&nl;"); pos += 4; // skip &nl; } pos = 0; - while ((pos = val.find ('\r', pos)) >= 0) { + while ((pos = val.tqfind ('\r', pos)) >= 0) { KOXML_STRING_REMOVE( val, pos, 1); KOXML_STRING_INSERT( val, pos+1, "lf;"); pos += 4; // skip &lf; } pos = 0; - while ((pos = val.find ('\"', pos)) >= 0) { + while ((pos = val.tqfind ('\"', pos)) >= 0) { KOXML_STRING_REMOVE( val, pos, 1); KOXML_STRING_INSERT( val, pos, """); pos += 6; // skip &qout; diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h index 2c95a515..866e7822 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h @@ -3,7 +3,7 @@ This file is part of KIllustrator. Copyright (C) 1998 Kai-Uwe Sattler (kus@iti.cs.uni-magdeburg.de) - modified for kvoctrain by Ewald Arnold kvoctrain@ewald-arnold.dein April ´99 + modified for kvoctrain by Ewald Arnold kvoctrain@ewald-arnold.dein April �99 */ @@ -32,8 +32,8 @@ class KOXML_OSTREAM; * * xml.startTag ("head"); // writes <head> * - * // write <layout format="a4" orientation="landscape"> - * xml.startTag ("layout", false); + * // write <tqlayout format="a4" orientation="landscape"> + * xml.startTag ("tqlayout", false); * xml.addAttribute ("format", "a4"); * xml.addAttribute ("orientation", "landscape"); * xml.closeTag (true); @@ -172,7 +172,7 @@ public: /** * Get the raw output stream. */ - inline TQIODevice *stream () { return strm.device(); } + inline TQIODevice *stream () { return strm.tqdevice(); } #endif private: diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h index 4587e25d..3e031331 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h @@ -9,14 +9,14 @@ #ifndef KOXML_USE_STL # include -# define KOXML_ISTREAM QTextStream -# define KOXML_OSTREAM QTextStream +# define KOXML_ISTREAM TQTextStream +# define KOXML_OSTREAM TQTextStream # include -# define KOXML_STRING QString +# define KOXML_STRING TQString // Unicode character -# define KOXML_CHAR QChar +# define KOXML_CHAR TQChar # define KOXML_STRING_REMOVE( string_var, pos, count) string_var.remove (pos, count) # define KOXML_STRING_INSERT( string_var, pos, str) string_var.insert(pos, str) diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp index 633e6f59..a9ed5dcb 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.cpp +++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp @@ -82,7 +82,7 @@ TQString LangSet::shortId (int index) const if (index >= 0 && index < (int) langs.size() ) return langs[index].shortId; - return TQString::null; + return TQString(); } @@ -91,7 +91,7 @@ TQString LangSet::shortId2 (int index) const if (index >= 0 && index < (int) langs.size() ) return langs[index].shortId2; - return TQString::null; + return TQString(); } @@ -100,7 +100,7 @@ TQString LangSet::longId (int index) const if (index >= 0 && index < (int) langs.size() ) return langs[index].longId; - return TQString::null; + return TQString(); } @@ -117,7 +117,7 @@ TQString LangSet::keyboardLayout (int index) const return langs[index].keyboardLayout; } else { - return TQString::null; + return TQString(); } } @@ -131,7 +131,7 @@ TQString LangSet::findShortId (const TQString &_longId) const if (_longId == langs[i].longId) return langs[i].shortId; - return TQString::null; + return TQString(); } @@ -145,7 +145,7 @@ TQString LangSet::findLongId (const TQString &_shortId) const || _shortId == langs[i].shortId2) return langs[i].longId; - return TQString::null; + return TQString(); } @@ -212,9 +212,9 @@ void LangSet::setPixMapFile (const TQString & s, int index) langs[index].PixMapFile = s; } -void LangSet::setKeyboardLayout(const TQString& layout, int index) +void LangSet::setKeyboardLayout(const TQString& tqlayout, int index) { if (index < (int) langs.size()) { - langs[index].keyboardLayout = layout; + langs[index].keyboardLayout = tqlayout; } } diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h index 526f330d..335402a9 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.h +++ b/kvoctrain/kvoctrain/kvt-core/langset.h @@ -42,12 +42,12 @@ class LangSet LangSet () {} void addSet (TQString shortId, TQString longId, TQString PixMapFile, - const TQString& shortId2 = TQString::null, - const TQString& keyboardLayout = TQString::null); + const TQString& shortId2 = TQString(), + const TQString& keyboardLayout = TQString()); /* void addSet (TQString shortId, TQString shortId2, TQString longId, */ /* TQString PixMapFile, */ -/* const TQString& keyboardLayout = TQString::null); */ +/* const TQString& keyboardLayout = TQString()); */ void appendSet(const LangSet &set); @@ -64,13 +64,13 @@ class LangSet int indexShortId (TQString shortId) const; int indexLongId (TQString longId) const; int indexPixMapFile (TQString PixMapFile) const; - // doesn't make sense for keyboard layouts since there is no 1-to-1 relation to languages + // doesn't make sense for keyboard tqlayouts since there is no 1-to-1 relation to languages void setShortId (const TQString & shortId, int index); void setShortId2 (const TQString & shortId2, int index); void setLongId (const TQString & longId, int index); void setPixMapFile (const TQString & PixMapFile, int index); - void setKeyboardLayout(const TQString & layout, int index); + void setKeyboardLayout(const TQString & tqlayout, int index); TQString findShortId (const TQString & longId) const; TQString findLongId (const TQString & shortId) const; diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp index 2714cf76..c5f01f62 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.cpp +++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp @@ -22,9 +22,9 @@ #include "kvtnewstuff.h" #include "prefs.h" -KVTNewStuff::KVTNewStuff(TQWidget *parent, const char * /*name*/) : TQObject(), KNewStuff("kdeedu/vocabulary", parent) +KVTNewStuff::KVTNewStuff(TQWidget *tqparent, const char * /*name*/) : TQObject(), KNewStuff("kdeedu/vocabulary", tqparent) { - m_app = (kvoctrainApp*) parent; + m_app = (kvoctrainApp*) tqparent; } @@ -63,7 +63,7 @@ TQString KVTNewStuff::destinationPath(KNS::Entry * entry) return file; } else - return TQString::null; + return TQString(); } @@ -73,17 +73,17 @@ TQString KVTNewStuff::downloadDestination(KNS::Entry * entry) if (KStandardDirs::exists(file)) { - int result = KMessageBox::warningContinueCancel(parentWidget(), + int result = KMessageBox::warningContinueCancel(tqparentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") - .arg(file), - TQString::null, i18n("Overwrite") ); + .tqarg(file), + TQString(), i18n("Overwrite") ); if (result == KMessageBox::Cancel) - return TQString::null; + return TQString(); } - KMessageBox::information(parentWidget(), + KMessageBox::information(tqparentWidget(), i18n("The selected file will now be downloaded and saved as\n'%1'.") - .arg(file), - TQString::null, + .tqarg(file), + TQString(), "NewStuffDownloadLocation"); return file; } diff --git a/kvoctrain/kvoctrain/kvtnewstuff.h b/kvoctrain/kvoctrain/kvtnewstuff.h index 1649868a..8c6fcc3a 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.h +++ b/kvoctrain/kvoctrain/kvtnewstuff.h @@ -22,8 +22,9 @@ class kvoctrainApp; class KVTNewStuff : public TQObject, public KNewStuff { Q_OBJECT + TQ_OBJECT public: - KVTNewStuff(TQWidget *parent = 0, const char *name = 0); + KVTNewStuff(TQWidget *tqparent = 0, const char *name = 0); /** Installs a downloaded file according to the application's configuration. diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp index 9eb124cd..efa812df 100644 --- a/kvoctrain/kvoctrain/main.cpp +++ b/kvoctrain/kvoctrain/main.cpp @@ -63,7 +63,7 @@ static const char version[] = KVOCTRAIN_VERSION_STRING; "http://www.ewald-arnold.de" ); aboutData.addCredit("Waldo Bastian", - I18N_NOOP("Help with port to Qt3/KDE3")); + I18N_NOOP("Help with port to TQt3/KDE3")); aboutData.addCredit("Andrea Marconi", I18N_NOOP("Initial Italian localization")); diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h index fd26f7bf..7643ba5c 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h @@ -33,6 +33,7 @@ class AdjQueryDlg : public QueryDlgBase { Q_OBJECT + TQ_OBJECT public: AdjQueryDlg diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui index b8218978..9f339e9c 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui @@ -1,10 +1,10 @@ AdjQueryDlgForm - + AdjQueryDlgForm - + 0 0 @@ -27,7 +27,7 @@ 0 - + TextLabel1 @@ -40,7 +40,7 @@ Fill in the missing comparison expressions: - + lev1Label @@ -51,7 +51,7 @@ lev1Field - + lev3Label @@ -62,7 +62,7 @@ lev3Field - + lev2Label @@ -73,7 +73,7 @@ lev2Field - + lev1Field @@ -86,7 +86,7 @@ - + lev2Field @@ -99,7 +99,7 @@ - + lev3Field @@ -122,22 +122,22 @@ Expanding - + 390 60 - + - layout7 + tqlayout7 unnamed - + status @@ -156,15 +156,15 @@ Plain - + - layout6 + tqlayout6 unnamed - + verify @@ -180,7 +180,7 @@ &Verify - + know_it @@ -196,7 +196,7 @@ I &Know It - + show_all @@ -212,7 +212,7 @@ Show &All - + dont_know @@ -230,7 +230,7 @@ - + progressgroup @@ -265,7 +265,7 @@ timebar - + countlabel @@ -281,7 +281,7 @@ Count: - + timelabel @@ -297,7 +297,7 @@ Time: - + Cyclelabel @@ -308,7 +308,7 @@ Cycle: - + progCount @@ -336,7 +336,7 @@ know_it dont_know - + kprogress.h kprogress.h diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp index 244141e0..0d6c5591 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp @@ -115,11 +115,11 @@ void ArtQueryDlg::setQuery(TQString, articles.female(def, indef); mw->rb_fem->setText (i18n("&female:\t")+def+" / "+indef); mw->rb_fem->setEnabled (!TQString(def+indef).isEmpty() ); - if (!removed && s.find(def+" ") == 0) { + if (!removed && s.tqfind(def+" ") == 0) { s.remove (0, def.length()+1); removed = true; } - if (!removed && s.find(indef+" ") == 0) { + if (!removed && s.tqfind(indef+" ") == 0) { s.remove (0, indef.length()+1); removed = true; } @@ -127,11 +127,11 @@ void ArtQueryDlg::setQuery(TQString, articles.male(def, indef); mw->male->setText (i18n("&male:\t")+def+" / "+indef); mw->male->setEnabled (!TQString(def+indef).isEmpty() ); - if (!removed && s.find(def+" ") == 0) { + if (!removed && s.tqfind(def+" ") == 0) { s.remove (0, def.length()+1); removed = true; } - if (!removed && s.find(indef+" ") == 0) { + if (!removed && s.tqfind(indef+" ") == 0) { s.remove (0, indef.length()+1); removed = true; } @@ -139,11 +139,11 @@ void ArtQueryDlg::setQuery(TQString, articles.natural(def, indef); mw->natural->setText (i18n("&natural:\t")+def+" / "+indef); mw->natural->setEnabled (!TQString(def+indef).isEmpty() ); - if (!removed && s.find(def+" ") == 0) { + if (!removed && s.tqfind(def+" ") == 0) { s.remove (0, def.length()+1); removed = true; } - if (!removed && s.find(indef+" ") == 0) { + if (!removed && s.tqfind(indef+" ") == 0) { s.remove (0, indef.length()+1); removed = true; } @@ -187,15 +187,15 @@ void ArtQueryDlg::showAllClicked() resetButton(mw->male); resetButton(mw->natural); - if (kv_exp->getType (q_ocol) == QM_NOUN QM_TYPE_DIV QM_NOUN_F) { + if (kv_exp->getType (q_ocol) == TQM_NOUN TQM_TYPE_DIV TQM_NOUN_F) { mw->rb_fem->setChecked (true); verifyButton(mw->rb_fem, true); } - else if (kv_exp->getType (q_ocol) == QM_NOUN QM_TYPE_DIV QM_NOUN_M) { + else if (kv_exp->getType (q_ocol) == TQM_NOUN TQM_TYPE_DIV TQM_NOUN_M) { mw->male->setChecked (true); verifyButton(mw->male, true); } - else if (kv_exp->getType (q_ocol) == QM_NOUN QM_TYPE_DIV QM_NOUN_S) { + else if (kv_exp->getType (q_ocol) == TQM_NOUN TQM_TYPE_DIV TQM_NOUN_S) { mw->natural->setChecked (true); verifyButton(mw->natural, true); } @@ -211,11 +211,11 @@ void ArtQueryDlg::showMoreClicked() void ArtQueryDlg::verifyClicked() { bool known = false; - if (kv_exp->getType (q_ocol) == QM_NOUN QM_TYPE_DIV QM_NOUN_F) + if (kv_exp->getType (q_ocol) == TQM_NOUN TQM_TYPE_DIV TQM_NOUN_F) known = mw->rb_fem->isChecked (); - else if (kv_exp->getType (q_ocol) == QM_NOUN QM_TYPE_DIV QM_NOUN_M) + else if (kv_exp->getType (q_ocol) == TQM_NOUN TQM_TYPE_DIV TQM_NOUN_M) known = mw->male->isChecked (); - else if (kv_exp->getType (q_ocol) == QM_NOUN QM_TYPE_DIV QM_NOUN_S) + else if (kv_exp->getType (q_ocol) == TQM_NOUN TQM_TYPE_DIV TQM_NOUN_S) known = mw->natural->isChecked (); if (mw->rb_fem->isChecked() ) { diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h index a2884d05..223c3fac 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h @@ -33,6 +33,7 @@ class ArtQueryDlg : public QueryDlgBase { Q_OBJECT + TQ_OBJECT public: ArtQueryDlg( diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui index 7792ca92..31b4fa6b 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui @@ -1,10 +1,10 @@ ArtQueryDlgForm - + ArtQueryDlgForm - + 0 0 @@ -27,7 +27,7 @@ 0 - + TextLabel1 @@ -40,7 +40,7 @@ Select the correct article for this noun: - + orgField @@ -62,7 +62,7 @@ - + artGroup @@ -80,7 +80,7 @@ - + @@ -92,7 +92,7 @@ 6 - + rb_fem @@ -100,7 +100,7 @@ &female - + male @@ -108,7 +108,7 @@ &male - + natural @@ -118,15 +118,15 @@ - + - layout10 + tqlayout10 unnamed - + progressgroup @@ -161,7 +161,7 @@ timebar - + countlabel @@ -177,7 +177,7 @@ Count: - + timelabel @@ -193,7 +193,7 @@ Time: - + Cyclelabel @@ -212,7 +212,7 @@ Cycle: - + progCount @@ -227,15 +227,15 @@ - + - layout9 + tqlayout9 unnamed - + verify @@ -254,7 +254,7 @@ &Verify - + know_it @@ -270,7 +270,7 @@ I &Know It - + show_all @@ -286,7 +286,7 @@ Show &All - + dont_know @@ -304,7 +304,7 @@ - + status @@ -339,7 +339,7 @@ know_it dont_know - + kprogress.h kprogress.h diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp index ac4345a1..c3bda4e8 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp @@ -153,7 +153,7 @@ void MCQueryDlg::setQuery(TQString org, solution = 0; MultipleChoice mc = exp->getMultipleChoice(q_tcol); - for (unsigned i = 0; i < QMIN(MAX_MULTIPLE_CHOICE, mc.size()); ++i) + for (unsigned i = 0; i < TQMIN(MAX_MULTIPLE_CHOICE, mc.size()); ++i) strings.push_back(mc.mc(i)); std::random_shuffle(strings.begin(), strings.end()); diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h index 4fcbccf7..3284ce4c 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h @@ -33,6 +33,7 @@ class MCQueryDlg : public QueryDlgBase { Q_OBJECT + TQ_OBJECT public: MCQueryDlg( diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui index 098bf7fa..4b8adf20 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui @@ -1,10 +1,10 @@ MCQueryDlgForm - + MCQueryDlgForm - + 0 0 @@ -19,7 +19,7 @@ 0 - + TextLabel1 @@ -32,7 +32,7 @@ Select the correct translation: - + orgField @@ -54,7 +54,7 @@ - + transgroup @@ -82,7 +82,7 @@ 6 - + rb_trans2 @@ -90,7 +90,7 @@ &2: - + rb_trans3 @@ -98,7 +98,7 @@ &3: - + rb_trans1 @@ -106,7 +106,7 @@ &1: - + rb_trans4 @@ -114,7 +114,7 @@ &4: - + rb_trans5 @@ -122,7 +122,7 @@ &5: - + trans3 @@ -137,11 +137,11 @@ - - + WordBreak|AlignVCenter - + trans2 @@ -156,11 +156,11 @@ - - + WordBreak|AlignVCenter - + trans1 @@ -175,11 +175,11 @@ - - + WordBreak|AlignVCenter - + trans4 @@ -194,11 +194,11 @@ - - + WordBreak|AlignVCenter - + trans5 @@ -213,29 +213,29 @@ - - + WordBreak|AlignVCenter - + - layout14 + tqlayout14 unnamed - + - layout12 + tqlayout12 unnamed - + dont_know @@ -251,7 +251,7 @@ &Do Not Know - + show_all @@ -267,7 +267,7 @@ Show &All - + know_it @@ -283,7 +283,7 @@ I &Know It - + verify @@ -307,7 +307,7 @@ - + progressgroup @@ -342,7 +342,7 @@ timebar - + countlabel @@ -358,7 +358,7 @@ Count: - + timelabel @@ -374,7 +374,7 @@ Time: - + Cyclelabel @@ -385,7 +385,7 @@ Cycle: - + progCount @@ -400,7 +400,7 @@ - + status @@ -436,7 +436,7 @@ know_it dont_know - + kprogress.h kprogress.h diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp index d70b92ed..82a9a4f0 100644 --- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp @@ -33,8 +33,8 @@ #include -QueryDlgBase::QueryDlgBase(const TQString & caption, TQWidget *parent, const char *name, bool modal) - : KDialogBase(Swallow, caption, User1|User2, NoDefault, parent, name, modal, false, +QueryDlgBase::QueryDlgBase(const TQString & caption, TQWidget *tqparent, const char *name, bool modal) + : KDialogBase(Swallow, caption, User1|User2, NoDefault, tqparent, name, modal, false, KGuiItem(i18n("&Stop Query")), KGuiItem(i18n("&Edit Expression..."))) { kv_doc = 0; @@ -66,9 +66,9 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really) if (!field->isEnabled() ) return true; - TQColorGroup u_normal = field->colorGroup(); + TQColorGroup u_normal = field->tqcolorGroup(); u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00)); - TQColorGroup k_normal = field->colorGroup(); + TQColorGroup k_normal = field->tqcolorGroup(); 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->colorGroup(); + TQColorGroup normal = field->tqcolorGroup(); 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->colorGroup(); + TQColorGroup u_normal = field->tqcolorGroup(); u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00)); - TQColorGroup k_normal = field->colorGroup(); + TQColorGroup k_normal = field->tqcolorGroup(); 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->colorGroup(); + TQColorGroup normal = field->tqcolorGroup(); 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->colorGroup(); + TQColorGroup u_normal = radio->tqcolorGroup(); u_normal.setColor(TQColorGroup::Foreground, TQColor(0xff, 0x00, 0x00)); - TQColorGroup k_normal = radio->colorGroup(); + TQColorGroup k_normal = radio->tqcolorGroup(); 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->colorGroup(); + TQColorGroup normal = radio->tqcolorGroup(); normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x00, 0x00)); TQPalette pal(radio->palette()); @@ -305,19 +305,19 @@ void QueryDlgBase::resetButton(TQRadioButton *radio, TQWidget *widget2) TQString QueryDlgBase::getOKComment(int percent_done) { - return i18n("Well done, you knew the correct answer. %1% done.").arg(percent_done); + return i18n("Well done, you knew the correct answer. %1% done.").tqarg(percent_done); } TQString QueryDlgBase::getTimeoutComment(int percent_done) { - return i18n("You waited too long to enter the correct answer. %1% done.").arg(percent_done); + return i18n("You waited too long to enter the correct answer. %1% done.").tqarg(percent_done); } TQString QueryDlgBase::getNOKComment(int percent_done) { - return i18n("Your answer was wrong. %1% done.").arg(percent_done); + return i18n("Your answer was wrong. %1% done.").tqarg(percent_done); } void QueryDlgBase::closeEvent(TQCloseEvent * /*e*/) diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h index 44f818c4..7036404b 100644 --- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h +++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h @@ -47,11 +47,12 @@ class QueryDlgBase : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum Result { Unknown, Known, Timeout, StopIt }; - QueryDlgBase(const TQString & caption, TQWidget *parent = 0, const char *name = 0, bool modal = false); + QueryDlgBase(const TQString & caption, TQWidget *tqparent = 0, const char *name = 0, bool modal = false); virtual ~QueryDlgBase (); diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp index 2e2a857b..34588847 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.capturedTexts(); + translations = regex.tqcapturedTexts(); 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.capturedTexts(); + translations = regex.tqcapturedTexts(); 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.capturedTexts(); + translations = regex.tqcapturedTexts(); 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.capturedTexts(); + translations = regex.tqcapturedTexts(); 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) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth())); + transCombos.at(i) -> tqsetSizePolicy (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) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth())); + transFields.at(i) -> tqsetSizePolicy (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 -> minimumSize().height()); + pdlg -> resize (pdlg -> width(), pdlg -> tqminimumSize().height()); pdlg -> show(); kapp -> processEvents(); } @@ -486,7 +486,7 @@ void RandomQueryDlg::slotTransChanged(const TQString&) { mw->verify->setDefault(true); bool suggestions = Prefs::suggestions(); - if ( suggestions && sender() && sender() -> isA (TQCOMBOBOX_OBJECT_NAME_STRING) ) + if ( suggestions && sender() && TQT_TQOBJECT(const_cast(sender())) -> isA (TQCOMBOBOX_OBJECT_NAME_STRING) ) { TQLineEdit* edit = ((TQComboBox*) sender()) -> lineEdit(); resetField (edit); @@ -497,7 +497,7 @@ void RandomQueryDlg::slotTransChanged(const TQString&) else mw->status -> clear(); } - else if ( ! suggestions && sender() && sender() -> isA (TQLINEEDIT_OBJECT_NAME_STRING) ) + else if ( ! suggestions && sender() && TQT_TQOBJECT(const_cast(sender())) -> isA (TQLINEEDIT_OBJECT_NAME_STRING) ) resetField ((TQLineEdit*) sender()); } @@ -650,8 +650,8 @@ void RandomQueryDlg::keyPressEvent( TQKeyEvent *e ) for ( uint i = 0; i < vocabulary.count(); i ++ ) { TQString trans (vocabulary[i]); - if ( (e -> key() == Key_F5 && trans.startsWith (curText, false) - || e -> key() == Key_F6 && trans.contains (curText, false)) ) + if ( (e -> key() == Key_F5 && trans.tqstartsWith (curText, false) + || e -> key() == Key_F6 && trans.tqcontains (curText, false)) ) combo -> insertItem (trans); } combo -> setEditText (curText); diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h index e1fd7362..2dbc38b0 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h @@ -38,6 +38,7 @@ class kvoctrainDoc; class RandomQueryDlg : public QueryDlgBase { Q_OBJECT + TQ_OBJECT public: RandomQueryDlg( diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui index fc573bf6..86cb075d 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui @@ -1,10 +1,10 @@ QueryDlgForm - + QueryDlgForm - + 0 0 @@ -19,7 +19,7 @@ 0 - + TextLabel1 @@ -40,7 +40,7 @@ Enter the correct translation: - + GroupBox12 @@ -65,7 +65,7 @@ 6 - + falseFriend @@ -81,7 +81,7 @@ - - + remark @@ -97,7 +97,7 @@ - - + type @@ -113,7 +113,7 @@ - - + c_remark @@ -121,7 +121,7 @@ &Remark: - + c_type @@ -129,7 +129,7 @@ T&ype: - + c_falsefriend @@ -137,7 +137,7 @@ &False friend: - + orgField @@ -161,7 +161,7 @@ - + TranslationFrame @@ -190,22 +190,22 @@ Expanding - + 450 40 - + - layout4 + tqlayout4 unnamed - + status @@ -227,15 +227,15 @@ - + - layout3 + tqlayout3 unnamed - + verify @@ -251,7 +251,7 @@ &Verify - + show_more @@ -267,7 +267,7 @@ Show &More - + show_all @@ -283,7 +283,7 @@ Show &All - + dont_know @@ -299,7 +299,7 @@ &Do Not Know - + know_it @@ -317,7 +317,7 @@ - + progressgroup @@ -342,7 +342,7 @@ 6 - + timelabel @@ -350,7 +350,7 @@ Time: - + countlabel @@ -368,7 +368,7 @@ countbar - + progCount @@ -381,7 +381,7 @@ - + Cyclelabel @@ -410,7 +410,7 @@ know_it dont_know - + kprogress.h kprogress.h diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp index 1c6f8469..a45d6cd6 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp @@ -103,19 +103,19 @@ void SimpleQueryDlg::setQuery(QueryType _querytype, TQString s; switch (querytype) { - case QT_Synonym: + case TQT_Synonym: { mw->queryLabel->setText(i18n("Expression")); mw->instructionLabel->setText(i18n("Enter the synonym:")); setCaption (i18n("Synonym Training")); answerstring = exp->getSynonym(column); - mw->queryField->setAlignment(Qt::AlignVCenter); + mw->queryField->tqsetAlignment(TQt::AlignVCenter); mw->queryField->setText(column == 0 ? exp->getOriginal() : exp->getTranslation(column)); setQueryFieldWordwrap(); } break; - case QT_Antonym: + case TQT_Antonym: { mw->queryLabel->setText(i18n("Expression")); mw->instructionLabel->setText(i18n("Enter the antonym:")); @@ -126,7 +126,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype, } break; - case QT_Paraphrase: + case TQT_Paraphrase: { mw->queryLabel->setText(i18n("Paraphrase")); mw->instructionLabel->setText(i18n("Enter the word:")); @@ -137,7 +137,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype, } break; - case QT_Example: + case TQT_Example: { mw->queryLabel->setText(i18n("Example sentence")); mw->instructionLabel->setText(i18n("Fill in the missing word:")); @@ -145,7 +145,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype, s = exp->getExample(column); answerstring = column == 0 ? exp->getOriginal().stripWhiteSpace() : exp->getTranslation(column).stripWhiteSpace(); int pos = -1; - while ((pos = s.find(answerstring)) > 0) + while ((pos = s.tqfind(answerstring)) > 0) { s.remove(pos, answerstring.length()); s.insert (pos, ".."); @@ -228,14 +228,14 @@ void SimpleQueryDlg::showMoreClicked() void SimpleQueryDlg::showAllClicked() { mw->answerField->setText (answerstring); - verifyField (mw->answerField, answerstring, querytype == QT_Synonym || querytype == QT_Antonym); + verifyField (mw->answerField, answerstring, querytype == TQT_Synonym || querytype == TQT_Antonym); mw->dont_know->setDefault(true); } void SimpleQueryDlg::verifyClicked() { - if (verifyField (mw->answerField, answerstring, querytype == QT_Synonym || querytype == QT_Antonym)) + if (verifyField (mw->answerField, answerstring, querytype == TQT_Synonym || querytype == TQT_Antonym)) knowItClicked(); else mw->dont_know->setDefault(true); @@ -265,25 +265,25 @@ void SimpleQueryDlg::slotUser2() // queryField->setText (exp->getTranslation(q_ocol)); switch (querytype) { - case QT_Synonym: { + case TQT_Synonym: { answerstring = exp->getSynonym(q_ocol); mw->queryField->setText(q_ocol == 0 ? exp->getOriginal() : exp->getTranslation(q_ocol)); } break; - case QT_Antonym: { + case TQT_Antonym: { answerstring = exp->getAntonym(q_ocol); mw->queryField->setText(q_ocol == 0 ? exp->getOriginal() : exp->getTranslation(q_ocol)); } break; - case QT_Paraphrase: { + case TQT_Paraphrase: { mw->queryField->setText(exp->getParaphrase(q_ocol)); answerstring = q_ocol == 0 ? exp->getOriginal() : exp->getTranslation(q_ocol); } break; - case QT_Example: { + case TQT_Example: { mw->queryField->setText(exp->getExample(q_ocol)); answerstring = q_ocol == 0 ? exp->getOriginal() : exp->getTranslation(q_ocol); } @@ -327,9 +327,9 @@ void SimpleQueryDlg::setQueryFieldWordwrap() int w = fm.width(mw->queryField->text()); int w2 = mw->width(); if (w > w2) - mw->queryField->setAlignment(Qt::AlignVCenter | Qt::WordBreak); + mw->queryField->tqsetAlignment(TQt::AlignVCenter | TQt::WordBreak); else - mw->queryField->setAlignment(Qt::AlignVCenter); + mw->queryField->tqsetAlignment(TQt::AlignVCenter); } diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h index 9d88cf4a..d1747864 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h @@ -33,6 +33,7 @@ class SimpleQueryDlg : public QueryDlgBase { Q_OBJECT + TQ_OBJECT public: SimpleQueryDlg (QueryType querytpe, diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui index 3ff31b5f..ed6a51d3 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui @@ -1,10 +1,10 @@ SimpleQueryDlgForm - + SimpleQueryDlgForm - + 0 0 @@ -27,15 +27,15 @@ 0 - + - layout5 + tqlayout5 unnamed - + queryLabel @@ -43,7 +43,7 @@ - - + queryField @@ -64,11 +64,11 @@ - + WordBreak|AlignVCenter - + instructionLabel @@ -81,7 +81,7 @@ - - + answerField @@ -106,22 +106,22 @@ Expanding - + 300 16 - + - layout17 + tqlayout17 unnamed - + status @@ -143,7 +143,7 @@ - + progressgroup @@ -180,7 +180,7 @@ timebar - + countlabel @@ -196,7 +196,7 @@ Count: - + timelabel @@ -212,7 +212,7 @@ Time: - + Cyclelabel @@ -223,7 +223,7 @@ Cycle: - + progCount @@ -238,15 +238,15 @@ - + - layout16 + tqlayout16 unnamed - + know_it @@ -262,7 +262,7 @@ I &Know It - + dont_know @@ -278,7 +278,7 @@ Do &Not Know - + show_all @@ -294,7 +294,7 @@ Show &All - + show_more @@ -310,7 +310,7 @@ Show &More - + verify @@ -340,7 +340,7 @@ know_it dont_know - + kprogress.h kprogress.h diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp index 72d749a2..644c60bf 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp @@ -180,7 +180,7 @@ bool VerbQueryDlg::next() type = conjugations.getType(current); TQString format = i18n("Current tense is: %1."); - TQString msg = format.arg(conjugations.getName(type)); + TQString msg = format.tqarg(conjugations.getName(type)); mw->instructionLabel->setText (msg); mw->baseLabel->setText (s); diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h index 910cd89a..2b22444e 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h @@ -33,6 +33,7 @@ class VerbQueryDlg : public QueryDlgBase { Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui index 0c7a5cb7..ed72fe45 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui @@ -1,10 +1,10 @@ VerbQueryDlgForm - + VerbQueryDlgForm - + 0 0 @@ -19,15 +19,15 @@ 0 - + - layout20 + tqlayout20 unnamed - + lab1 @@ -40,7 +40,7 @@ Enter the correct conjugation forms. - + instructionLabel @@ -63,23 +63,23 @@ - + - layout30 + tqlayout30 unnamed - + - layout29 + tqlayout29 unnamed - + p3smLabel @@ -90,17 +90,17 @@ p3smField - + p2sField - + p3smField - + p3snLabel @@ -111,7 +111,7 @@ p3snField - + p1sLabel @@ -122,7 +122,7 @@ p1sField - + p3sfLabel @@ -133,17 +133,17 @@ p3sfField - + p3snField - + p3sfField - + p2sLabel @@ -154,32 +154,32 @@ p2sField - + p1sField - + - layout27 + tqlayout27 unnamed - + p2pField - + p3pnField - + p1pLabel @@ -190,7 +190,7 @@ p1pField - + p2pLabel @@ -215,12 +215,12 @@ p2pField - + p3pmField - + p3pmLabel @@ -231,12 +231,12 @@ p3pmField - + p3pfField - + p3pfLabel @@ -247,12 +247,12 @@ p3pfField - + p1pField - + p3pnLabel @@ -267,15 +267,15 @@ - + - layout19 + tqlayout19 unnamed - + TextLabel2 @@ -283,7 +283,7 @@ Base form: - + baseLabel @@ -307,23 +307,23 @@ - + - layout32 + tqlayout32 unnamed - + - layout31 + tqlayout31 unnamed - + know_it @@ -339,7 +339,7 @@ I &Know It - + verify @@ -355,7 +355,7 @@ &Verify - + show_all @@ -371,7 +371,7 @@ Show &All - + dont_know @@ -389,7 +389,7 @@ - + status @@ -411,7 +411,7 @@ - + progressgroup @@ -446,7 +446,7 @@ timebar - + countlabel @@ -462,7 +462,7 @@ Count: - + timelabel @@ -478,7 +478,7 @@ Time: - + Cyclelabel @@ -489,7 +489,7 @@ Cycle: - + progCount @@ -516,7 +516,7 @@ Expanding - + 390 16 @@ -541,7 +541,7 @@ know_it dont_know - + kprogress.h kprogress.h diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp index c6f9c565..62533df7 100644 --- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp +++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp @@ -36,7 +36,7 @@ using namespace std; #include #define KVD_VERS_PREFIX " v" //#include "kvoctraindoc.h" -#define QM_VERB "v" //#include "QueryManager.h" +#define TQM_VERB "v" //#include "QueryManager.h" #include "kvoctraincore.h" @@ -92,11 +92,11 @@ void readToMem (TQTextStream &is, TQString month, TQString year) spotty spot; bool first_line = true; - while (!is.eof() && is.device()->status() == IO_Ok) { + while (!is.eof() && is.tqdevice()->status() == IO_Ok) { line = is.readLine(); int pos; - while ((pos = line.find(" ")) >= 0) + while ((pos = line.tqfind(" ")) >= 0) line.remove (pos, 1); bool head_line = (!line.stripWhiteSpace().isEmpty() && line == line.upper() ); @@ -107,32 +107,32 @@ void readToMem (TQTextStream &is, TQString month, TQString year) } first_line = false; - if ( line.find ("see p.") >= 0 - || line.find ("see pp.") >= 0 - || line.find ("see also p") >= 0) { + if ( line.tqfind ("see p.") >= 0 + || line.tqfind ("see pp.") >= 0 + || line.tqfind ("see also p") >= 0) { line = ""; } int c = 0x92; - while ((pos = line.find (c)) >= 0) + while ((pos = line.tqfind (c)) >= 0) line[pos] = '\''; c = 0x94; - while ((pos = line.find (c)) >= 0) + while ((pos = line.tqfind (c)) >= 0) line[pos] = ' '; pos = 0; - while ((pos = line.find ('&', pos)) >= 0) { + while ((pos = line.tqfind ('&', pos)) >= 0) { line.insert (pos+1, "amp;"); pos += 5; // skip & } - while ((pos = line.find ('<')) >= 0) { + while ((pos = line.tqfind ('<')) >= 0) { line.remove(pos, 1); line.insert (pos, "<"); } - while ((pos = line.find ('>')) >= 0) { + while ((pos = line.tqfind ('>')) >= 0) { line.remove(pos, 1); line.insert (pos, ">"); } @@ -144,9 +144,9 @@ void readToMem (TQTextStream &is, TQString month, TQString year) lesson_str = line + ", "+month+" "+year; } else { - pos = line.find ('\t'); + pos = line.tqfind ('\t'); if (pos < 0) - pos = line.find ('|'); + pos = line.tqfind ('|'); if (pos >= 0) { if (lesson_pending) { lesson_pending = false; @@ -159,54 +159,54 @@ void readToMem (TQTextStream &is, TQString month, TQString year) spot.de_rem = ""; if (line.left (3) == "to ") { - spot.type = QM_VERB; + spot.type = TQM_VERB; line.remove (0, 3); pos -= 3; } spot.en = line.mid(0, pos); spot.de = line.mid(pos+1, line.length()-pos-1); - if ((pos = spot.en.find(" UK") ) >= 0) { + if ((pos = spot.en.tqfind(" UK") ) >= 0) { spot.en_rem+= i18n("UK ").local8Bit(); spot.en.remove (pos, 3); } - if ((pos = spot.en.find("(UK)") ) >= 0) { + if ((pos = spot.en.tqfind("(UK)") ) >= 0) { spot.en_rem+= i18n("UK ").local8Bit(); spot.en.remove (pos, 4); } - if ((pos = spot.en.find(" N. Am.") ) >= 0) { + if ((pos = spot.en.tqfind(" N. Am.") ) >= 0) { spot.en_rem+= i18n("N. Am. ").local8Bit(); spot.en.remove (pos, 7); } - if ((pos = spot.en.find("(N. Am.)") ) >= 0) { + if ((pos = spot.en.tqfind("(N. Am.)") ) >= 0) { spot.en_rem+= i18n("N. Am. ").local8Bit(); spot.en.remove (pos, 8); } - if ((pos = spot.en.find(" US") ) >= 0) { + if ((pos = spot.en.tqfind(" US") ) >= 0) { spot.en_rem+= i18n("US ").local8Bit(); spot.en.remove (pos, 3); } - if ((pos = spot.en.find("(US)") ) >= 0) { + if ((pos = spot.en.tqfind("(US)") ) >= 0) { spot.en_rem+= i18n("US ").local8Bit(); spot.en.remove (pos, 4); } - if ((pos = spot.en.find("ifml.") ) >= 0) { + if ((pos = spot.en.tqfind("ifml.") ) >= 0) { spot.en_rem+= i18n("ifml. ").local8Bit(); spot.en.remove (pos, 5); } - if ((pos = spot.en.find("(ifml.)") ) >= 0) { + if ((pos = spot.en.tqfind("(ifml.)") ) >= 0) { spot.en_rem+= i18n("ifml. ").local8Bit(); spot.en.remove (pos, 7); } - if ((pos = spot.en.find("vulg.") ) >= 0) { + if ((pos = spot.en.tqfind("vulg.") ) >= 0) { spot.en_rem+= i18n("vulg. ").local8Bit(); spot.en.remove (pos, 5); } - if ((pos = spot.en.find("(vulg.)") ) >= 0) { + if ((pos = spot.en.tqfind("(vulg.)") ) >= 0) { spot.en_rem+= i18n("vulg. ").local8Bit(); spot.en.remove (pos, 7); } @@ -289,7 +289,7 @@ void writeToKvtml(TQTextStream &os, TQString month, TQString year) writeSpotty (os, spottys[0], true); int l = 1; - while (os.device()->status() == IO_Ok && l < (int) spottys.size() ) { + while (os.tqdevice()->status() == IO_Ok && l < (int) spottys.size() ) { writeSpotty (os, spottys[l], false); l++; } @@ -304,14 +304,14 @@ int main(int argc, char **argv) KApplication app(argc,argv, "kvoctrain"); if (argc != 4) { - cerr << i18n("usage: spotlight2kvtml spotfile month year\n\n").local8Bit(); + cerr << i18n("usage: spotlight2kvtml spotfile month year\n\n").local8Bit().data(); exit (1); } TQString spot (argv[1]); TQString kvtml; - int dot = spot.findRev('.'); + int dot = spot.tqfindRev('.'); if (dot < 0) { kvtml = spot + "." KVTML_EXT; } @@ -327,8 +327,8 @@ int main(int argc, char **argv) readToMem (is, argv[2], argv[3]); fs.close(); - if (is.device()->status() != IO_Ok ) { - cerr << i18n("Could not read ").local8Bit() << spot.local8Bit() << endl; + if (is.tqdevice()->status() != IO_Ok ) { + cerr << i18n("Could not read ").local8Bit().data() << spot.local8Bit().data() << endl; exit (1); } @@ -338,8 +338,8 @@ int main(int argc, char **argv) writeToKvtml(os, argv[2], argv[3]); fk.close(); - if (os.device()->status() != IO_Ok ) { - cerr << i18n("Could not write ").local8Bit() << kvtml.local8Bit() << endl; + if (os.tqdevice()->status() != IO_Ok ) { + cerr << i18n("Could not write ").local8Bit().data() << kvtml.local8Bit().data() << endl; exit (1); } diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp index 4537b42f..17f067a1 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp @@ -30,7 +30,7 @@ #include #include -GenStatPage::GenStatPage(kvoctrainDoc *doc, TQWidget* parent, const char* name): GenStatPageForm( parent, name ) +GenStatPage::GenStatPage(kvoctrainDoc *doc, TQWidget* tqparent, const char* name): GenStatPageForm( tqparent, name ) { l_filename->setText(doc->URL().path()); l_title->setText(doc->getTitle()); diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h index 38cb7854..21d4fd83 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h @@ -34,10 +34,11 @@ class kvoctrainDoc; class GenStatPage : public GenStatPageForm { Q_OBJECT + TQ_OBJECT public: - GenStatPage(kvoctrainDoc *doc, TQWidget* parent = NULL, const char* name = NULL); + GenStatPage(kvoctrainDoc *doc, TQWidget* tqparent = NULL, const char* name = NULL); }; #endif // GenStatPage_included diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui index 669ec746..b67cc491 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui @@ -1,10 +1,10 @@ GenStatPageForm - + Form1 - + 0 0 @@ -25,7 +25,7 @@ 6 - + TextLabel1 @@ -37,7 +37,7 @@ Filename: - + TextLabel1_2 @@ -49,7 +49,7 @@ Title: - + TextLabel1_2_2_2 @@ -61,7 +61,7 @@ Entries: - + TextLabel1_2_2 @@ -73,7 +73,7 @@ Author: - + TextLabel1_2_2_2_2 @@ -85,7 +85,7 @@ Lessons: - + l_lessons @@ -107,7 +107,7 @@ - + kcfg_entriesPerLesson @@ -129,7 +129,7 @@ - + l_author @@ -151,7 +151,7 @@ - + l_title @@ -173,7 +173,7 @@ - + l_filename @@ -205,7 +205,7 @@ Expanding - + 20 20 @@ -214,5 +214,5 @@ - + diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp index 7fd6bbb0..a3a65acd 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp @@ -34,8 +34,8 @@ #include #include -StatistikDlg::StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *parent, const char *name, bool modal) - : KDialogBase(Tabbed, i18n("Document Statistics"), Close, Close, parent, name, modal) +StatistikDlg::StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *tqparent, const char *name, bool modal) + : KDialogBase(Tabbed, i18n("Document Statistics"), Close, Close, tqparent, name, modal) { TQFrame * page; TQVBoxLayout * topLayout; diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h index 3199ae27..55480ef1 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h @@ -38,9 +38,10 @@ class GradeCols; class StatistikDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *parent = NULL, const char *name = NULL, bool modal = true); + StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *tqparent = NULL, const char *name = NULL, bool modal = true); }; diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp index 7453b75c..f634b4dd 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp @@ -47,10 +47,10 @@ #define TB_LESSON 3 -class GradeListItem : public QListViewItem +class GradeListItem : public TQListViewItem { public: - inline GradeListItem (TQListView* parent, int _lesson): TQListViewItem(parent), lesson(_lesson) {} + inline GradeListItem (TQListView* tqparent, int _lesson): TQListViewItem(tqparent), lesson(_lesson) {} inline int getLesson() const { return lesson; } private: @@ -58,8 +58,8 @@ private: }; -StatistikPage::StatistikPage(int col, kvoctrainDoc *_doc, TQWidget *parent, const char *name) - : StatistikPageForm( parent, name ), doc(_doc) +StatistikPage::StatistikPage(int col, kvoctrainDoc *_doc, TQWidget *tqparent, const char *name) + : StatistikPageForm( tqparent, name ), doc(_doc) { StatListView->setColumnWidth(0, SIZE_GRADE + 10); StatListView->setColumnWidth(1, SIZE_GRADE + 10); @@ -74,8 +74,8 @@ StatistikPage::StatistikPage(int col, kvoctrainDoc *_doc, TQWidget *parent, con // accumulate numbers of grades per lesson for (int i = 0; i < (int) doc->numEntries(); i++) { kvoctrainExpr *expr = doc->getEntry(i); - int fg = QMIN(KV_MAX_GRADE, expr->getGrade(col, false)); - int tg = QMIN(KV_MAX_GRADE, expr->getGrade(col, true)); + int fg = TQMIN(KV_MAX_GRADE, expr->getGrade(col, false)); + int tg = TQMIN(KV_MAX_GRADE, expr->getGrade(col, true)); int l = expr->getLesson(); if (l >= 0 && l <= (int) lesson.size() ) { fsc[l].grade[fg]++; @@ -123,7 +123,7 @@ void StatistikPage::setupPixmaps() } else { --num; - widths[j] = QMAX(MIN_COL_WIDTH, fsc[entry].grade[j] * maxw / fsc[entry].num); + widths[j] = TQMAX(MIN_COL_WIDTH, fsc[entry].grade[j] * maxw / fsc[entry].num); w -= widths[j]; } } @@ -181,7 +181,7 @@ void StatistikPage::setupPixmaps() } else { --num; - widths[j] = QMAX(MIN_COL_WIDTH, tsc[entry].grade[j] * maxw / tsc[entry].num); + widths[j] = TQMAX(MIN_COL_WIDTH, tsc[entry].grade[j] * maxw / tsc[entry].num); w -= widths[j]; } } diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h index 0e15231e..374d1ec5 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h @@ -38,9 +38,10 @@ class GradeCols; class StatistikPage : public StatistikPageForm { Q_OBJECT + TQ_OBJECT public: - StatistikPage(int col, kvoctrainDoc *doc, TQWidget *parent = NULL, const char *name = NULL); + StatistikPage(int col, kvoctrainDoc *doc, TQWidget *tqparent = NULL, const char *name = NULL); public slots: void slotPopupMenu(int row, int col); diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui index 7964f7e0..ede9c220 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui @@ -1,10 +1,10 @@ StatistikPageForm - + Form2 - + 0 0 @@ -22,7 +22,7 @@ 0 - + Grade FROM @@ -70,7 +70,7 @@ StatListView - + 500 0 @@ -82,5 +82,5 @@ - + diff --git a/kvoctrain/kvoctrain/tools/extractlang.cpp b/kvoctrain/kvoctrain/tools/extractlang.cpp index a775274e..efb510f3 100644 --- a/kvoctrain/kvoctrain/tools/extractlang.cpp +++ b/kvoctrain/kvoctrain/tools/extractlang.cpp @@ -19,19 +19,19 @@ TQString threeLangs; void parseLanguage(TQString name, TQString three, TQString two) { - int star = three.find('*'); + int star = three.tqfind('*'); if (star > 0) three.remove(star, 1); TQString three_1 = three; - int slash = three_1.find('/'); + int slash = three_1.tqfind('/'); if (slash > 0) { three_1.remove(slash, 1); three_1.insert(slash, ", "); } - if (!two.contains(" ")) { + if (!two.tqcontains(" ")) { twoLangs.append("\t{{\""); twoLangs.append(two); twoLangs.append("\"}, {\""); @@ -43,7 +43,7 @@ void parseLanguage(TQString name, TQString three, TQString two) else two = ""; - slash = three.find('/'); + slash = three.tqfind('/'); if (slash > 0) { if (two.length() == 0) two = three.mid(slash+1); @@ -96,7 +96,7 @@ bool parseTR(TQString& line, TQTextIStream& in) uint count = 0; - while (line.contains(" 3) return true; @@ -111,7 +111,7 @@ bool parseTR(TQString& line, TQTextIStream& in) parseLanguage(text[0], text[2], text[3]); } - if (line.contains("/tr")) + if (line.tqcontains("/tr")) return true; return false; @@ -130,7 +130,7 @@ int main() if (readNext) line = in.readLine(); - if (line.contains(" DlgLanguageBase - + DlgLanguageBase - + 0 1 @@ -20,7 +20,7 @@ 0 - + 250 120 @@ -33,15 +33,15 @@ 0 - + - layout2 + tqlayout2 unnamed - + picLanguage1 @@ -53,7 +53,7 @@ 0 - + 32 32 @@ -90,7 +90,7 @@ Sunken - + AlignAuto @@ -100,7 +100,7 @@ Enter a title (identifier) for the left column - + lblLanguage1 @@ -127,7 +127,7 @@ Expanding - + 20 16 @@ -136,15 +136,15 @@ - + - layout2_2 + tqlayout2_2 unnamed - + picLanguage2 @@ -156,7 +156,7 @@ 0 - + 32 32 @@ -187,7 +187,7 @@ 0 - + AlignAuto @@ -197,7 +197,7 @@ Enter a title (identifier) for the right column - + lblLanguage2 @@ -224,7 +224,7 @@ Expanding - + 20 16 @@ -240,5 +240,5 @@ 789cdd9c5b532bb992a8dff7afe8d87adb31a1c1601b3b4e9c0783c10603b6b9c3c43ce85a36b631e03b13e7bf9f943253948d59cdea5e3dd3319b702f3eaa4a522a2fca94cafbdffff5db7de7fcb77ffdfb3f265335ed9bdf4c4fbdfdf62f3b1b8d56fff19ffff7bffef1cfc2cece6fe153aa947fdbfde7bffde39f62f99bf94decc4ff45ae26ae045653e6025e5f1017f17e2513e3fd1366ba7f4e5ca1fb8f13e3fd7bcc78bf3d4f8cd7793c069ff72f89e3754dfd1768fcb64e4ce3d327912b69bcb3c4d8fe1133f6efde1363fba7c43c7e9118afdf31d3f31789f1fa0b318ddf5e24c6fee7cc345f156496c71d24c6f60e99b17db12226f904c957a0f1ea2131f56f7460688dfa736d64ee2f1b33e3753320e6f6f97e6a5f7488a97d5547de657bf2c4f47ccf12d3f32e8ebf50e1fbd53d31ddef9b89515e47ccfa50c4d47f16e77b37f5a70bc43c1f2362ba5f64c87b3cde77627ade548859defdc855be3f9b27467d5e11b3bd9d1373ff07c4d4bff3c8456acfc4fbf70a7cbf1a10b3feee13637fd7c8fcbce825c6eb6fc4341e3b4a1caffb2366d2f79298fab7515f7b697cba45ccf36312a37e2e98c99ea7c43c7fddc438be0531ebc3248ed73394af5a2ad17862fc2816f8793721e6f9dc4f8cf25d30e378b4412eb1bd9d258ef79b17661a7f8d98fa77d5c4f1fe9e24aed2f89f12c7eb5621972dcd6f8c7745552ad1785e89e97eb360a6eb15e4728138f65fda2d59f47f7fc2bc5b8de39b22970bd4de09333dbf434cfd672a31de7fc7bc8bf26a6292cff3f396e6b71859b1bd0b4b4cface9e91cb85bd42ec7f9798e64f1d3253fcaf11d37c8832335ef77bc4dcff03333d7f9818e3e58019e551288fdaa7f9300789f1fe1a33de9f758959ffa3c4d87f8f199fb7515fe55df61777835caeeea17e14318dcf1d33d37c779871befc5be2f87cd640e6f1ab62626c6fc68cedd923621a9fdf65c6eb3d474cfa7565665a5f1433dd6f8869fc59d4775925ffed27c6f11499c9fece90d378de99d17e7d8d19e5b737c4341ef7c88cf78b0362d2bf1689f1fe2133cdc77d62ec6f8a5ca1f95337cca4ffa89ffd3d66bb4c1c9f57cc349ffe3e315e7f20a6f1660b66942f8bf6baafd99e8c424ef79f3193ff3c13b33dbf26c6fbb17f5d2579b23b661a9f4b1cefd77d66b2b7d87e656f9ffc4f3d31533cd4c434dfaa815c617faa12933cba8e9cfa7b63c6fec49098e64bbf33e375d727a6f9502d661aaf4f8cf2e378358fcfe278358fcf0f89697c599999aedf25467dec13737c6e3293bf4f99c95e70fcba4afa106fcc38be9e42566c3f17cc64efcdc4689fa7c4ec1f7566b29f7ee278dd9602c3f24ae3f30b66b2df4962ec7f9798fd859fa7f1eb5be6928aedcd98cbb17e702fc86c6fb6cd8cfde93d6496372b31d3784f88491ef39018fb77cc45b4ff15b1a2e787ccc538be8cef77d89fb965c6fb8564c6f60ccd87dea5f86798c95fca89317e3f3393fd92fcba4cf9c93c31fa0fc9a715b57f9f18f573c94cf617e349d5b07ff7047295ecd7b59869bd386426fd30737ef1c48cf78b0131d9835789513f381f86e7d78c8969fecc9c19e74ff591613e707ecf98f17a56481cc76769fc3c5f3d9f18ed6fc14cf9c90d338e57de31637fca30537f9ab984f5ed0931cdbfda498cfa7966c6fee469e2785d72ff8afcf32171ec5fce881db62f6b89f1f91533b57f9018fb7f6746f9cc5562948fe435649f729c18db1f3053fbf3c4389f9298e65b1c27c6f5fd9199e2fb1131cd8f8dd75591d73b3121a678944d99697eae89d99e9ac464cfe21c19127ab4873133c6137d8fac77517fbe414cfab667cca86f9bae937d09667c3e5b12933e759199fc87db637d3e3053fb6f89b1fd7d666cdfec1093be6d8199fc799c18d78f1633f56f13637ce931e37ccaabc4e87f65661c9f4bedd3f8d2f3383ebb8b9cece73d31da4fc64cf6534f8cd74f98c9ffda89713c7d668a87cf89713e69bc6c7fd226c6f60533f5af13e3f523665a4f1689713d34cc940f5412e37a4bf361c8ffe579626c7fc24cfda7fb495f5d66ea8fc74bf1c0f37cb0ff9f25c6e76f98c91fe37aa80ce7431ee73f748ff1e09298fcc10c89693c42103bbc6eabc86c1fee9c19edc39f25c6f511c76b589ffa8331de8c9929be1698c9de4462b4b73e33f903c9c3fad4978951be3233c583d3c4b8de3798c9febb89713ce97e5abfd3fd349e0e33d9ff1d31e9dbb03cacef97c4980f5e3053bef49e18ed798f99f2f171628c8f57cc383eb99318c73763c6f1a97d62b21fbb9718ede59a99e2f35d62b4df0a33e98fe79fe287b9488cf118e3b9b1e4ffd63393bd1f31537e10f5ab8b9c6f9b4b64b657fb424cf3632c33cd4f62ca176b89d11e9969bc593531fac73e32afff2e2366fdbc22b33d6434bee4af57cc643f3566b29fb7c4713cbacc4cebcf3c318ef78198e65f6b66f2a7476692ff3a31f63f62a6f16689b17d816cd91f3bccb4be7613a37ccce43f16e5b59c8f659298c73f60c6f9d73d621a9fbd64a6eb536443eb89bf41b6ec6f31df3625cecffd71e2785d1c22737cc9f69929bf4f4ccf3f3163ff66454cf2a92133f9db8819edcb1788d91f7789c9bffc6d62ccbf2533e98bc66f69bd543e31fa478798f3d54b66f2cf2233ce574f13933d8958ff18cbf2bb2633d9e36b629cdf6762b26fcdf797717ed401f3fe5e9cdf2231fb9f4f8cfd9d32533c7f60a6e75f13eb383fe7c41c8fee9829bf1925c67874cb4cf1fb3e31eabfc74cfe963163ffa281ccf32f0a89b1fd4366da6f9089717c27cc141fca89317e5f33d3fec25162bc3e25e67ca59918fb5f32d3fab1488cf6f1ce4cf9fc1333daa7dc27e67c649418dbe7fb697d12b789b1fd1e33c5e7c7c4387eb22f4bf62e1e1263feb0c34ced937e1ccd6f16d7275b4af1f09c19f5638ac49c5f4c12a3bf5f32a3fde80e72d24f8399f6af1e99291e9e3053fede62a6fe0f13c7f6cd1931e947779929ff2825c6f5ea8099e2f52c31c623c54cf6719518e3c92b338d779719f5ab6e1363bc3d67a6f14e8959ffcf8951ff4366b22f9718aff37c90fef53c31ea9fe79bfc5fb513a37c4b668a37c7ccb83ee807669287e793f35b93388ea7cbf2707dab12e378b97dae6fdb89315fe0f9a778e15e1363bce2f975b4bf41f23bae671a89b13fcf4ce3e927c6eb4566ca27687e1dd7c737cc145fea89d13fd01e1cdb83b7cc149f2789e378dd8019edd9d599d19e5d2171b48f2c5dafe0f52762ae577712a33e2f98297f3a488cf6f0c84cfb352f89713eaf99697de7f152fc7715661c8ff1c4a4efec28319e8765cca45fee9fd783cbc4986f707f144f6c9119f56d4acc688fd92a31daeb0d338d17edd5b13d985d66b287d7c4680f17cc148f2a89d1dfaf9969fca93dd27f6a8ffc69c48ce3975566f2a766628c0f7bccb4fef1755e5fde1263fde498a97e1a3393ff2c1363be6499c93eaf98291f3c25e6fac733533e19e3992b27fdec2446fd08661cbf5d25467bee30933da7f6aa268ebf85ccf3e7e689b17dc74cfabf4d8cf94f8f19fb57a5c4680f6fccd8bfa813f37ed21333d56b85c4987f9d32533d9e98e4ab3063fbbe9a385eb78698d7ef6766b2af3d66aaafae13e3f832665a6f3b89717c9299f235969feb8d1533d517717d71ce703cc5eb8ef5e10f985531de3f4276bb2a5ecf7688393f3862a67a7bc14cf3a113e37cbd1173fd639829bec4facc97395e76a752fc551fa9d67ed7e193d8484b9f5fd257b4adbf4c92dff9b024f6d7b4f70bf46273f3fb33a3b37f3fbd6c93647394e1df5f35e2bf542fbf2bdd97f705ff711ffef33faf976f48f3f57dead749f2d7e8a5fb850ffdc80affbe7af949e9fe667a913efe9bc1a727fbc04f72107c81d694644d72087ff7f019c5fb07c0bdbf975ee4b31cc3e8b2f8fb531ca100895ee42b48865264f0f70c7eefc1dff0f77e9422fb75baff157a916f7202a31bc3ef93a01f906a1cad27483895b3a40f9426e8692e17f059ca157c7e9934bfcc5fde499249f7c337de41aaf06f2de88c22f0813c9475f8f7481e477db1b5fd3df462e3881b2049187553d672d7344950877fc3e84f401fa7b205bc8cf786e7cefe56ebfe398ce83c5ad710467e01236ec9b6ecc8aebc9457f25adec85b7927efe5837c943bb2007fdf957bb208f77a78aef4b7cac71ab22cf741925759915518e9a390420825b430c20a277cfc7122133dd1174f62208662249ec518ee1f8a975f23c937f5f2d53af0b1468cc08b5bb22b5ec59b9888298c7a26e662113f0bb14c3f8bf8b7b9588977511307e2109ea9831ec10a49c77f62bdf9865ea07571049fe3d81bd5201051df055896688a13b914a7a225cec4b9b810ed385efe597ef1b320a93aa20bfabb1457e21ae25a13dabb81d817e21c4407710b3ef524ee7e9d5ec25c897b71241ec4a3d841494401e2d29bac895d99893d5114255116fba212475fa59fed52d0552595883c176da594564659880e4d39863e7ac1974012ad9c14caff6abd8034c71b7fafc985ca544ff5d5931a901c4b58e27f24c987a4511efa5bb4399067a846b2aa9e21c6853c2244795869d5f3aff517d0c9b178483e029605bd2dd458bda857f5066321bb49a3fbd14f554dd4544d493b3325d43c3ebd520bb594776aa5de6155653f8cbaf9657a818f785cf3f67dd0494bd5d4813a54f5a00f18ddd1b7e4d8ae1f904c1d470feaa806b864531e515f13ca80be55b77e6f7d011b6649cad2a81379a14e554b9db187f03c7fe1f15bac2ed922cb328d770469ced5856aab0e4497719466f4dddcfa67d697d08aea424b2d90e4525dc551a3657df6908d79cf4704b02a815a041b93f1e9656a01a29bba5637ea569c82df8c5557dd7d773fe1a7d67d6cc9c92ef4754f92a007e0983ecbb1ce7949513b22d74a2e5eab2bf5a01ec529f41956e15fa897b89e044d3fab1dd04941edc21abe483d2f29ba92ad241d6cae26acc563b5b7666dc71bfac4c8d65145555265d150fb30f231c74e5805c49fd24b584f2cc4ae9aaa8075dda024a489bc7682241335c9594b55556141aa5316d3d1f2432a904992ce3017f8b056fc4ba685565ac38a8c33fa8c151fac6b7f228ec1a0438d31910ea2f0255817dbcd5a9ccd6963a1aa30af57daa862783b437b657426ce744ff7f5931e88773d8c630ff391a233fb4fa2851ee967d5830c47c55a35dbac41377de75b7aa9c15c8ce5428fc5103d3ecdfd7a4c8a72e81798d157fda6277a2a5a6aac67b2ade77a0159ca1ee4cd5dbdd42bfdae6bfa4085f95feac3a0d10d6f8a57c45c1fe8ba3e8af91a57dba1a25bf75ff3337ad1c790393addd04d6d3806873ef5893e4149a09b53d4876ee9337d2eaff4856eeb8e7ad65d7d09f973a8d0c6a1b681d834d057fa5adf80be6e216f9e518b47fa2e274fb23b68ef5e3f40bd730855dc7194e6e58feb25aef3bbfa51bde81d584f72512748425a89feaa0b7a57c3dceba22e41ef43b08a67a82d3f624f19227aa875ac5cc2dabeabcb7a5f5770b54dfeb74c5eb8040d2fc3571e20da54e4819190af85aaee625d920f69be938f858cc508a362af148df2b1c7e8208931c6aa82713233dea44f9468147339aaa031af83d5f7c0f44cdf3c09a95b66c0313145c565eaa76d8672cf8c623d7a0075a9a6b3834f113ae9656bcca63b67e6d98cd535e5e9eb768d51b96a5eccab7933d24ce2fd50ff834e50922154070f297f08f57d2d4a86fff6cccccccd4261ce508dfa11498ee839666956fadabc83242e561b5f783fe96573059a446f1fc949b00add3535f5847d7dac886a167a0a3ad1d21c9843358679d39b3d40ef022439377588454f513763f8d4a22787dda7913932c7a6619a20cd32facc7a061167cb9c9853d33267716f67b231d60d7fd996190449a4870ce2192aad92395f8b5e791bab286d56e6c2b421428ce28e44b2006aeb1cd6ee71c8504d07ee299aaeb93457e65a1e74a7e606fe36d073736bee82377eca50638fe6de3c9847b363a6a600d270dbb88bf8298e6d6606618fcbec823453b952a1d2aa444baef2eaf8517b983d53d4637d15ade7431f79ddf8e073308aa6ac87b7ebccbea998aa7c901df08166ccec07166eb14accc5664683b20cac5605d071668dd94927216add23d6fc85e7318b1174640ae15fd386ea773f579d2c28178c2b80b5d68967b0ae41da59f29f62ff4436ac87bf1fd8ccf620b10c7b011d5db37dfb04d2bc8963b8766207766847719d5d7efa59887dfbac1b20cd4b58ff7fbceeaf9dfc3c7de43c52e9b11d07ade00a927c3efaaa1ed917fb0a92d450276091bc139bcf041b7206f3af55d3bed90948829e3db3533b338f760ecf9c419e756a17ba4f99dea78c4e55edd2ae62eefc65ccddaa97b07b3dc18ccebe8b5763a25672d105d76968bf665fed01659e0d90e4637f381f3143ae7b20eaa08743a88617316fdb130b5bb747f2c1cce44a3cc0b34dfb2e1fe18e799226c902f3b8b0c7b62177ed1c2c3fe688bfab17d4c5906a39a8ef4cc93643f457722d8b3c8a73756d4feca96dc50861d0c369377c4d2f100b05e8e40c74d20e966acfd554dfd90bf8fddeb66d07fc26cc1ef467bbf6529d7f96255a77c75ea99a3c8c96ffc957d6d7fd9c957155ba5215f16cafd76331b40cd970885ff6c6deca4c75ed5dac311a3133ef51be142428f3ec80ee1eec7dc85762865f4d2b53b0b44358ffe7200db4a19c7db08f49331b3e0356b6630b1cc368cc5fe4c9492f7df2e42164758f621abd3d9f2be1ef993e8798efedee9a4e794d6ed8bd58837aa96d112429814e3eea938fea07565fd33465b10795f7be9cd8b2dd17595a29f39a99db8a69e86e5c63dee32a9c93ea533e96f40277865a5be89990b1e5cd1a31645fafb6aa4b90a97c3ea77f97fb4eca1246023d77c229d189f9c1346a784135d931c9e39d7606f22c68432fd4a37e8558365fd74ab48b4c7bc8c74cca29e2783fac6dab5e9e409a303a50b9103193cd6985f2f30e64f517b05ef82d156cc349e7c07f208ad8a229839f743e2a2dca1de72926423eecbccb541667f3c2f520afab6fca12fb9cb9be7b42bde4c7fba55ec2d503b0b2f0bb961da152afec2bd3188ff7dd40b7e5d0649f6b71bb07d612f6fd57622cafdc3066d74bf0f50ffb9ca79dc11043ea6ee49ec1a7c2e8408ff60daaa46d7a9943a5d98816f6bc9ebd6cd74bd45a5891a25e6457e8f5ac38ca125a357aaa3b21275ecbeae913a3f3ca94dcd8bd400db9998d522e4cffadea27fbe05e61d584100715f1917b7393cd5c1c23a79bca4b5b60bd7c1dc7727ad1f235daba06cf375bf402fdbb999bbb45981ff0c6cdf5246425076ee9c610a3861fa3a21c283fd30bb7720a3cff5a2fe4b1087dcee4b1aa294d7a495eeadea306175055c85817fd60dd5fd34ba8afa771f7e84ad88df989b2e8175783eab71be209ccd370a352e863de65db411277c092e42a131a254872e884aa88c7986bf8b827aaa19a7b43bbdcf0d2853a7775d0dff067f4029f19fc5e7747b9dd2392258ea20215ae82ea37647ac34fad9ec88e29839fcca224dbcf2e62d5e38e21c635e4aa8b15b48d35e7d0f45d33643a1f15265927e44cf2c19d44bd64f1acfad3fa928f075137c3384763092b97f01bd10433b18e3b956d58e38335854aeb3c663d0d5ce365d509885d2bc13b636bbb983196cd43eeeb5aee2cf85cdc91005b804a6d126b9b96bc83c8b74c5979925fdd9ba26975b12eaa6fadf7795d0927a4fcbb8d91f97e8b2c31f228036b35546ae2184660696f71164efaec813b57c53816cea6f33b97f05f0711cdb55dc7ee9b47f9eebae2d15dca41771a33d449b05077055139e9efe3c7ad20133aa0b1ba6dfb30b91a10d7151f77d6b2303fb41bb66ee7b0bae90cbc15b246f28fb168baebb85f5385de4a6ef5a90ac9af5093e87137ee56d5dc5d8c83e3a893a6bb8f33d8326592654333e05f0fb2dd455faeaf4bb2a9972e9f1484753f6430f7e02f9f6559424f67e23aec5cc75385b00317768dea02f4e51ee339df3cae279feb449446461b9b99a2b3f210ea977dd0ef4d9046d6c46d58fbb7cb02337be676a22724bd7c11c738bfc57727825e1ec4fb3659445bf7e41ef45c0ef956acdb9b908936210a4fd06b697f683d766db6b252455780356c27ae47e1ac32ccc891dbd5ab64a36bb2e811d4b0a817f53beb3ee7c7b1b604b94fd48be86d89420b2d755f5eca5af0f4601d50b3d76d16d69390ad802413cc56482b1ff6f5b1d66056d67133f562baf1c415779b2012e886dbd3bcd7bc66db6a60dff42cc52ffb398e7dd2cb285acd4a2ecc9b2b26efcdc7d3857e925db8ef1cee1bc0480650e7f45d89b2faf5dde5f52a31c5d890f902b5ddb1bc852aac089e3fc57c415eba72ccd8d253bc0feff65d45174356f9bbf918eb2554541aaad1035970d5cf356b388fd303bd04cb6a80ad8fe0031924f8498724c99fc66ca97863b54d11117e9faba5975e885b9a49a50a7a27d6b19bb2406e0eb37b22b3cd68fcb55e50d3d1bbba1ef746aa187d30878a678b99b935a3b8f73596debe9bfde8271388b7391b671bd377318bcbd72e6ba702f6c86b6f42cd08ba29bbba1ead9db655e933b74b6f21220db79f8d7dd4fb1bfe12f69e56e6d13b5bc7fa85f6c379077be6bd1e530d39f099a9048bc12c3a9e76e54e95e339f152cdd662dac78a13ac69e67b50b7847d9615d43b7d5a29391395342b2bdf975d5dfaeafd8c5cbdcfefded9f8864ef834f5c23f855a8c4f2592ed40ffbae607a615f622bb5373e587d1c226246bb49de417b032c67deefc89eb5a2c09b5b2d27ea0c67ea44efd33dbc2872c61f7024672664a7ebc916d6de865631f70104f6efa216715cfa2966c378dc1bfc0680fb4f3afe05323f0fc6b37d6b5b0c742abcab1205d60ecf56ffe2dd6c81f275f6b9131ec63e82158da4497e1334a15f2878d85385113ad6861298649b7a99794a97fbc13d983cf24be7bb4eba77882951f43d47ad5cffcdcf4c23b2bea59766cc72fe219de9cf69f78c7bee29756f8957f0fb26edb95e04a135aacf9038821959caf7d686eee0ff5b53cc4f31789a7c0f54f7ae1bc46939cc1f333e9a16637f6ddd771d721d999e0f5c11ff9636f82bfc0e7d46676668fe2f972ae6684ace3d837e4a57983357e462be0b695339c1c2d7dd39fc43dd28d739110f9dcca9faa8adaa1fd314b39d9d77ac9cb697d0ba459aa82e8867ed0ced28a1ea2da4c57cc13e8700455d4523d9b47a8235b71f6298aaa7b77e8432efceecfc3d7c4409af6b60a2044f2584fe457a0b56c1fb472211f3d6456f62ef9f78ff4b2fe0d8f916f439ef4e23b601ded0f59282e4f54b0e00e7863db7721ab1ccb377f691e4dc31eaa2a595aac4f689d9ec9437fe5afddf1a777cad8cec239f4514e53496bd1eb2a6ee66ffc2dccda738a63fa4bbd6c56541c2b4ecc61f046f04f8acbd1226847595d9bb90e6f633dc0fd2559d373f09bbbb88fe2f5933b5395304350379a503b7aa1bdbfcfedc17cb6b5ed36b8506f1a72f0b882e77712d7dea2ffc679a5b3affe219e594c5916b0df2a67bb66cf09ff28e790659e8134e12ca5ec779cf73bf2ce2d630419407d3296fb90a1f4e59e2ff8dd8fda19e3dec6cfa6dec0977c3883ae4306cb3bbce1ec33bfbb28be755e5917d7e2cc435e06abdd3445fc2aed2a877876a75756ca23b10b2a6fcacc977cd9efbb67a8db17e17dd798b3ed40a61376dd8bbee2abf6d0d653cdf9f5cf8225d30799cc449c0dbfbe37f1653eb65d2f433f162da762cd9bab0ef3eb76a6326d0771ad811a53edc8a2ca4c3b9e9486dddc90c94f20030dbb7f509f78235ecd01f8dafcd38ede7689c2be585821cbbe15ebaab59344f9e95cec87d23475db3e4334db7c03b19ade355c596587194470d9c45a24beb33f044f7d0b6fd1a9b07b0ed2844c14da3b947bfac61e85d528bc79f1a53e88322827322f67be05d1a8b97ebef3937a31f64e77b3cc2e537db45157847c0b6257176a9a4758cd2e624f633a459ac47797f7d549ace54d3cdd10ba64fa59cfd7a096c6e8bee527bdc3d4cefa100b75f0f650c7e623d3d7f5cb171febba66c738dfc89ed25efdc6592faddcce1e660379073d9f440f1d8993a8a3463a01b771dfed5966ee241b66a3ec3937ff9fb413a4c9c6d94bf62adb21fac6d1f7ff9c5e606d78b685ec2d9bc4b76116b9d17ff82f9ed0cfd57936b50df908955a2beeebe8f8b6bb8ff56788412ba84fca7aae4eb399af65f3ad922cd6fedbce16e05f7d23e1799fde87d9f256dc77fcc578f9220ad9325b65ef6a90ab3ff23d7f44d3b9b0e624abf9335552b5ecc0f4e3feceb15ed8a2dc93bb90070ff47b16d6ac4a3a0d597c9221af9faaae6575d9056942b634e62c78d3d2bef59e523d3b0afbc6309f2a3ba67713319be1774af27e1462a854f7ea5c9baca1dfac537d796f1fe4bdaf674da5cd0948d149d5da3427cb57710cf20b3dc84ed408e2e2383ba59d3eb76969df8a63ad78cef22e87fa316b6567319a2e37eae0cdea2afe80ddad445bd5e1e71eb2ce4ed4447edc5fbfc79cff09963803dd9c9b0be814cf5edcdafbb1df5e5f401f257ce7283bd20df5e8665861c4ba3d9f9b6fd6599b59227b7435f72ee3276fdf9aab85b7af86aeacdad945fefb327f607d71591bdfa0323bbaa31b59c70d7521b6ff92deb85aef7b9d271be3de26f12249b34533f1cc0f32bc2cf8cc4bfe74e4e7e258770a95d685be0ce72c419aec28bbccaef4339d5d2fb6d589e84ff9357543675f672f5ffc3d444955cdaeb39bdcfefecfaf2f229ee4b910014c16562cd1d03abbcdee742bd8ffefbcc10f95bf12f49ee88fa58857b3f117511a2481787f0fb1307eef89e3d8cfea257b100dc8b1c27adeb4bbaa9b3dca10db76b282ae6eafad7e67a6d7bd9f779a16712d79a16f9dacc92166a097cc7b5980f885ebcba7b7bbbea9974fe791615e4c2bdb356533343f8ea8db24d894a58adffb81bcab9fbd668bfc9bbf51b332aec1fd6c2fec5ca4efc37cfd5edf0fb3984f92f4219e1ccb1331565956d43be6dee01abae9bb5bb29d8d484eebab3ed022737ae66cc8a1437d0355e941bcba024916ea02f2f093f056fcb631fd09bd34e33996867cf7d4ed42942e65a5ac0cb1a0c2bb16f86eac3a72ef9b6febe2fe6c7c6f96bf9b54516f7e2f937a9c85330367faaea207f1ad82397a7cf8b642667443dce2fbb49bb3fc33feb22e114683f87dbd2358870f8c5465f3a8c6d9be7b145dc87cd7ab926d5181f759e6c2f90b7b08d5ef6516fa9885730350fb557612a599c71385916dda816e403416a2f9a331fe91eff1c9b7b8af99c5ef4c424e200ae13d7f7f9555ec5b56758fb692befbb6593ba6efbea9ab9eec899e928f3d0d757c1dea9b5069851abe674047e2b5677a36e8047237f093b0731e74124ebabe1ad71ffa7e2546c566fc06ee0a2276219c27c3fa7302faa9b9b96968effa5ab829d8f9b91ea97bb7722b750fbf0ddcbe7eb54bdfb7676eaeaf55c58fc15275a8e042a5456f0365d0ee9e6af75c4f66f7fe35fa89a0b759c59f5bf7373ffa38be27abe3bb62606de6cc14ac811a72d8f3fe5cae40aaba7bd20d79a94e5d5d3e98228cfc419c99a23f035f284bb048736c5aba84ef06c0487bf1dcba194f5e076657865df7233fca6ecc28eeba0e3667f20fc7b1cf5616f69b47f13bdf427ad44bd8b732bba6907a809a076cfcd49d98963dd0ed5ea6db7a6e5aaee1c7f45e398f084f4b86b1ca0adf210fb9f038ec208691cb66fc17bfb91ddeb3ed7f8e487f5c2f5f44eb8fbfe1db37e96debb559c0b7afb7b5f5e9adc32d7b765bfbff53fef22349c2e73d274d7aa76833b26fb779948af623d7fefefbffdf187f462f5b4686dfec58d7454695537dcb7bf8fc3e26ee41e6f6b5a9d212b93d6e9ddf21def6f9febaff03bd6cfe7dcd8ae0f73ad781db6680f720d7f20aaab4481fbf4e2f5b6b85fca836e6ec2b2bfafc779450ffc8fabe691bdfd4cb57954fbea5b5f381ef49a293e56dd1d79a8e7e20d14fc7b1af3cfc47d6f7831eb75c5faf45c2bde5dcfddbfa4dedfa56aff74bf5f2390ead7be997a3c9dfbf16d5736dfe6016e09e5e0f329f3f9027ffde7dbfeaf3ddfe7ecdbafff7fcfcd5ffbf70ff9d9fff557af97fffe71fff1f2192a73f - + diff --git a/kwordquiz/src/dlgrc.cpp b/kwordquiz/src/dlgrc.cpp index 9fa996e3..dc5693ad 100644 --- a/kwordquiz/src/dlgrc.cpp +++ b/kwordquiz/src/dlgrc.cpp @@ -19,7 +19,7 @@ #include "dlgrc.h" -DlgRC::DlgRC(TQWidget *parent, const char *name, bool modal): KDialogBase(Swallow, i18n("Rows & Columns"), Ok|Cancel, Ok, parent, name, modal, true) +DlgRC::DlgRC(TQWidget *tqparent, const char *name, bool modal): KDialogBase(Swallow, i18n("Rows & Columns"), Ok|Cancel, Ok, tqparent, name, modal, true) { dlgBase = new DlgRCBase( this, "Dlg" ); setMainWidget(dlgBase); diff --git a/kwordquiz/src/dlgrc.h b/kwordquiz/src/dlgrc.h index b54fa64c..d1aa4bb3 100644 --- a/kwordquiz/src/dlgrc.h +++ b/kwordquiz/src/dlgrc.h @@ -27,8 +27,9 @@ class DlgRC : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DlgRC(TQWidget *parent = 0, const char *name = 0, bool modal=true); + DlgRC(TQWidget *tqparent = 0, const char *name = 0, bool modal=true); ~DlgRC(); void setNumRows(int r); diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui index 1ee9a6f4..7a62dd15 100644 --- a/kwordquiz/src/dlgrcbase.ui +++ b/kwordquiz/src/dlgrcbase.ui @@ -1,10 +1,10 @@ DlgRCBase - + DlgRCBase - + 0 0 @@ -12,7 +12,7 @@ 156 - + 200 150 @@ -25,9 +25,9 @@ 0 - + - layout4 + tqlayout4 @@ -43,7 +43,7 @@ 5 - + AlignAuto @@ -56,7 +56,7 @@ Enter the number of rows the vocabulary should have - + lblNumRows @@ -75,9 +75,9 @@ - + - layout5 + tqlayout5 @@ -103,7 +103,7 @@ Enter the height (in pixels) for the selected row(s) - + lblRowHeight @@ -122,15 +122,15 @@ - + - layout3 + tqlayout3 unnamed - + lblColWidth @@ -173,7 +173,7 @@ - + krestrictedline.h krestrictedline.h diff --git a/kwordquiz/src/dlgsort.cpp b/kwordquiz/src/dlgsort.cpp index 20221468..bac1f85c 100644 --- a/kwordquiz/src/dlgsort.cpp +++ b/kwordquiz/src/dlgsort.cpp @@ -21,7 +21,7 @@ #include "dlgsort.h" -DlgSort::DlgSort(TQWidget *parent, const char *name, bool modal): KDialogBase(Swallow, i18n("Sort"), Ok|Cancel, Ok, parent, name, modal, true) +DlgSort::DlgSort(TQWidget *tqparent, const char *name, bool modal): KDialogBase(Swallow, i18n("Sort"), Ok|Cancel, Ok, tqparent, name, modal, true) { dlgBase = new DlgSortBase( this, "Dlg" ); setMainWidget(dlgBase); diff --git a/kwordquiz/src/dlgsort.h b/kwordquiz/src/dlgsort.h index 181cf75b..4a36e385 100644 --- a/kwordquiz/src/dlgsort.h +++ b/kwordquiz/src/dlgsort.h @@ -27,9 +27,10 @@ class DlgSort : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DlgSort(TQWidget *parent = 0, const char *name = 0, bool modal=true); + DlgSort(TQWidget *tqparent = 0, const char *name = 0, bool modal=true); ~DlgSort(); bool base(); diff --git a/kwordquiz/src/dlgsortbase.ui b/kwordquiz/src/dlgsortbase.ui index e2e7e3f6..7d56584e 100644 --- a/kwordquiz/src/dlgsortbase.ui +++ b/kwordquiz/src/dlgsortbase.ui @@ -1,10 +1,10 @@ DlgSortBase - + DlgSortBase - + 0 0 @@ -20,7 +20,7 @@ 0 - + 200 170 @@ -33,15 +33,15 @@ 0 - + - layout6 + tqlayout6 unnamed - + grpBase @@ -58,7 +58,7 @@ unnamed - + optLang1 @@ -72,7 +72,7 @@ Select to sort based on the left column - + optLang2 @@ -88,7 +88,7 @@ - + grpDirection @@ -105,7 +105,7 @@ unnamed - + optAscending @@ -119,7 +119,7 @@ Select to sort in ascending order - + optDescending @@ -139,5 +139,5 @@ - + diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp index 79dd2da0..25d8b49a 100644 --- a/kwordquiz/src/dlgspecchar.cpp +++ b/kwordquiz/src/dlgspecchar.cpp @@ -22,8 +22,8 @@ #include #include -DlgSpecChar::DlgSpecChar( TQWidget *parent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal ) - : KDialogBase( Plain, i18n("Select Character"), User1 | Cancel, User1 , parent, name, _modal ) +DlgSpecChar::DlgSpecChar( TQWidget *tqparent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal ) + : KDialogBase( Plain, i18n("Select Character"), User1 | Cancel, User1 , tqparent, name, _modal ) { initDialog(_chr,_font,true); @@ -38,11 +38,11 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_ grid = new TQGridLayout( page, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - int t = (_chr.unicode()/256); + int t = (_chr.tqunicode()/256); charSelect = new KCharSelect( page, "", _font, _chr, t); connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); - charSelect->resize( charSelect->sizeHint() ); + charSelect->resize( charSelect->tqsizeHint() ); charSelect->enableFontCombo( false ); grid->addWidget( charSelect, 0, 0 ); diff --git a/kwordquiz/src/dlgspecchar.h b/kwordquiz/src/dlgspecchar.h index e3ab3ff3..b5ca9aa5 100644 --- a/kwordquiz/src/dlgspecchar.h +++ b/kwordquiz/src/dlgspecchar.h @@ -31,9 +31,10 @@ class KButtonBox; class DlgSpecChar : public KDialogBase { Q_OBJECT + TQ_OBJECT public: //constructor when you want to insert multi char - DlgSpecChar( TQWidget *parent, const char *name, const TQString &_font, + DlgSpecChar( TQWidget *tqparent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal=true ); ~DlgSpecChar(); diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp index eafa5294..6db1916f 100644 --- a/kwordquiz/src/flashview.cpp +++ b/kwordquiz/src/flashview.cpp @@ -25,10 +25,10 @@ #include "prefs.h" -FlashView::FlashView(TQWidget *parent, const char *name, WFlags f) - : FlashViewBase(parent, name, f) +FlashView::FlashView(TQWidget *tqparent, const char *name, WFlags f) + : FlashViewBase(tqparent, name, f) { - m_score = new WQScore(); + m_score = new WTQScore(); m_timer = new TQTimer(this); connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer())); } @@ -39,7 +39,7 @@ FlashView::~FlashView() } -void FlashView::setQuiz(WQQuiz *quiz) +void FlashView::setQuiz(WTQQuiz *quiz) { m_quiz = quiz; } @@ -57,7 +57,7 @@ void FlashView::init() updateScore(); - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); win->actionCollection()->action("quiz_check")->setEnabled(true); win->actionCollection()->action("flash_know")->setEnabled(true); win->actionCollection()->action("flash_dont_know")->setEnabled(true); @@ -84,7 +84,7 @@ void FlashView::keepDiscardCard(bool keep) { if (!keep) { - m_score->countIncrement(WQScore::cdCorrect); + m_score->countIncrement(WTQScore::cdCorrect); updateScore(); KNotifyClient::event(winId(), "QuizCorrect", i18n("Your answer was correct!")); } @@ -92,7 +92,7 @@ void FlashView::keepDiscardCard(bool keep) { m_error++; m_quiz->checkAnswer(m_question, ""); - m_score->countIncrement(WQScore::cdError); + m_score->countIncrement(WTQScore::cdError); updateScore(); KNotifyClient::event(winId(), "QuizError", i18n("Your answer was incorrect.")); } @@ -106,7 +106,7 @@ void FlashView::keepDiscardCard(bool keep) else { m_quiz->finish(); - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); win->actionCollection()->action("quiz_check")->setEnabled(false); win->actionCollection()->action("flash_know")->setEnabled(false); win->actionCollection()->action("flash_dont_know")->setEnabled(false); diff --git a/kwordquiz/src/flashview.h b/kwordquiz/src/flashview.h index c6135df5..02a20177 100644 --- a/kwordquiz/src/flashview.h +++ b/kwordquiz/src/flashview.h @@ -23,7 +23,7 @@ #include "wqscore.h" -class WQQuiz; +class WTQQuiz; /** @author Peter Hedlund @@ -31,12 +31,13 @@ class WQQuiz; class FlashView : public FlashViewBase { Q_OBJECT + TQ_OBJECT public: - FlashView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); + FlashView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); ~FlashView(); - void setQuiz(WQQuiz *quiz); + void setQuiz(WTQQuiz *quiz); void init(); private slots: @@ -51,8 +52,8 @@ public slots: void slotApplySettings(); private: - WQQuiz *m_quiz; - WQScore *m_score; + WTQQuiz *m_quiz; + WTQScore *m_score; KAction* actFlip; KAction* actKnow; diff --git a/kwordquiz/src/flashviewbase.ui b/kwordquiz/src/flashviewbase.ui index d1cf9e1f..42af6476 100644 --- a/kwordquiz/src/flashviewbase.ui +++ b/kwordquiz/src/flashviewbase.ui @@ -1,10 +1,10 @@ FlashViewBase - + FlashViewBase - + 0 0 @@ -26,7 +26,7 @@ Fixed - + 21 30 @@ -43,7 +43,7 @@ Fixed - + 30 20 @@ -60,14 +60,14 @@ Fixed - + 30 20 - + fraCard @@ -99,7 +99,7 @@ unnamed - + lblLanguageQuestion @@ -126,7 +126,7 @@ Language 1 - + AlignTop @@ -175,7 +175,7 @@ The flashcard - + lblQuestion @@ -203,7 +203,7 @@ false - + WordBreak|AlignCenter @@ -225,16 +225,16 @@ Fixed - + 21 30 - + - layout13 + tqlayout13 @@ -257,15 +257,15 @@ Horizontal - + - layout12 + tqlayout12 unnamed - + lblScoreCount @@ -292,7 +292,7 @@ 00 - + AlignVCenter|AlignLeft @@ -302,7 +302,7 @@ The number of cards in the session - + picCorrect @@ -314,7 +314,7 @@ 0 - + 32 32 @@ -333,7 +333,7 @@ The number of cards counted as correct (I know). May be shown as a percentage. - + lblScoreCorrect @@ -360,7 +360,7 @@ 00 - + AlignVCenter|AlignLeft @@ -370,7 +370,7 @@ The number of cards counted as correct (I know). May be shown as a percentage. - + picError @@ -382,7 +382,7 @@ 0 - + 32 32 @@ -401,7 +401,7 @@ The number of cards counted as incorrect (I do not know). May be shown as a percentage. - + picCount @@ -413,7 +413,7 @@ 0 - + 32 32 @@ -432,7 +432,7 @@ The number of cards in the session - + lblScoreAnswered @@ -459,7 +459,7 @@ 00 - + AlignVCenter|AlignLeft @@ -469,7 +469,7 @@ The number of cards already seen. May be shown as a percentage. - + picAnswered @@ -481,7 +481,7 @@ 0 - + 32 32 @@ -500,7 +500,7 @@ The number of cards already seen. May be shown as a percentage. - + lblScoreError @@ -527,7 +527,7 @@ 00 - + AlignVCenter|AlignLeft @@ -548,5 +548,5 @@ 789cdd9c59536349b2a0dffb579475bcb58dc5456841b2b17910082476891daedd87588f401202b4736dfefb7884bb878e1632c9aaec99b2694c957c9c25c2c3f73847fd1ffffae3a17dfec7bffee31fa3b11a3f9b3f4c577dfcf12f3b190c16fff95fffebbffff1cfc2cece1fe153de2bfdb1fbcffff18f7f8af91fe60fb113ff17b996b81a588d990b787c465cc2f3954c8ce78f98e9fc297195ce3f4a8ce71799f17c7b92188ff37c0c5eef7b89e3714de31768feb64e4cf3d3c791ab69be93c478ff43661cdfa5e338be3e21e6f98bc478fc9e99ae3f4e8cc7df8869fef634318e3f65a6f5aa22b33c6e9618ef77c08cf7170b62924fd0fc0b345fdd27a6f18d0e0c77a3f1dc09328f9765cc78dcbc10f3fd2f89e9fea24d4cf7570de45db6274f4cd7674562bade45fb2a54f97cf5404ce7fb7a6294d711b33e14318d9f7503efa6f1748198d763404ce78b0cb9c8f3fd24a6ebcd1e31cb8b5ce3f3b3d7c4a8cf6b62b6b773621e7f9f98c6771ab944f73367818b053e5ff588597ff78971bc1b64be5e7413e3f10f629a8fed258ec7fd9c99f43d23a6f1ad899ce6a74f89797d4c62d4cf0533d9f39898d7af9318e73723667d98c4f17846e395cb349f68ffa5025fef86c4bc9ebb8951be2633ce471be432dbdb59e278be1932d3fcebc434be2b25c6f93d12d768fe2f89e3712b90f72cad2fce4f95cb349f77623adf4c99e97815b952208ef1b0bc5bb6e8ff7e9f79b716e7f7865c29d0fd5acc74fd0e318defcb89f1fc3be65d5c6f1aaf42f2f91b624bf247ff2ec3fc8a8578ff5d625a1f75c04cf17d4e4cf28a0a33cde79e98eeefaf98e9facfc4180f7bcc385fa591f7485e534f8ce727c6f3b31631ebf739318e6f98f17a17e35d05d6a318d7db5689693eaece8cf777a7ccb83ebe9f385e9f2d9079beaa9418eff7ce4cfad827a6f9f83b669287af277db90233e50bc54ce7ef12f37a467fa82479fd8819edcb8f99511e7b454cf777b7cc78bed82726fd699118cfef32937c378971bc57e42aad87ba65a6f9477bda2b32db69e278bde2e3b43ebe93188f3f12d37cb32133e92be6a33dcdf15c58628a674621a7eb0f98c91f5e89d93edf13e3f917c835922f3b67a6f98ac4f17cfdcc4ceb1ff55d2da6f8dc404ee77f30e3f9a24f4cf2eb4f663cee1c31c9a34e99693d5462d44fb4ffaa4ef1fb3931eaf78919f59fe17c748de41789c91f769015ebef8299e43d4c8ce31f10b37dce98f1fc4c25467963fd512bf1fdb31b66f2e72362bade3c24c6eb1d7309f5bb205674fd0b7349c5f9d4881d8e676e99f17c2199f17ee60359ef92ff4a66b287a7c418ef5f9849bf6fc415ca97e3c4e83fc7c48aee7f9d18fdfd9499f415ebc99aa972beeb21b3bce69598e431136694473d23c3fc50de33663c9e7512c7f5b22d629a7f564e8cf63462a6f9f1fd2ab83ef29e19c7538619c7f315e632f63fc7c4b41e6a2731aed72b338e274f12c7e3f29699ec73c9717c49eba11dde5fd613e3f50b66baff7e621cff9319e5335789513e92d790bdc86162bc7f8f99ee3f4d8cf509ad87a1f5164789315f3c31533d7448ccf612f5ab4a55cae7ea8599ced7c414ff5513b9c6f9b94a4cf6a51f90f52eeac77f12933eed3133ead33612a3fd4866bc3e7b23267de91233e5e72633e9eb9199ee9faea7fb1799f1fee68998f46979fea44fff9218ebab13661a5f24467fb6cc684ff23a31fa579919e7e77a89717e1933cecf923cc93e3e13a37d64cc641f8dc478fc9899fceb3231cea7cb4cf1e73531ae678598ec4bdac4787fc14ce3ebc478fc9019c7d7b3c4b85e3566ca4f85c418dff788c9bfe57962bcff8899c6ef26467db599693c9687fcddb788d9bfcf12e3f537cc94df513ec3fe601532fb83cf8839dede32d3f17662bc7f8598fb872633f9f70733d547683f86edc9b598293e1e268ef6941d21b3fef565628c3f43668ab70566f29fbdc4689f5d66f21f4f4cfad75789319e5498717c719218f3719399fca59318e793cea7fc7a9418e773ce4cfe724d4cf6617698c93ede12a37e0e99697d6789d1fe8bcc540f0e13633e4ce3e1fc641a8fe63762c6f9295e4fb237fb9418f323eb87e28fb84f8cf65e6526fd65cc54ef9c2746ff217bb3142fac6326fb6b3093fc51ffbac4f6e7df99e9f89271fc5d62ee07769849bf77cc7b3ade6fc85c2dc6f3fbc88aea677bc64ce3d1f9acffec9898f4e3cf98c95eeacc642fef89a33e748599f2d35b62f4974b625a6fad99c97f9e98c91e6e12e3f803669aaf4c8cf56409d9b2ffb599a9feb8488cf29d1093bff8180fb4ad513f92e17caca2f8e38e98293fcd9969fda7c4bc7ff1c24cfed923e6fcba9718f5394636949f3cced75af6c7a86f53e6fe4d8c88a9becffacc246f8798fbaf4f62924f9c23ab32cedf0e98d17e4409d972bd502026fdba983f8de57eca6b6445fb2bea0a5957f07ea6474cf141086287c77dcc7fb6ccfd94e920f3fdec2bb2a6f5329699ec2531d9ff3471942f1b11937d650f8971fe3bc81c4f9d21e6f815edc93a8ee7be48ac70fd32c38ce3e92e31dddf5e32e3711be7eb2adc2ff945e2a86f7180ccf69cdd3153bfb5c74cd73b66bcbf9913937dab3e33c5d70133adff2d31c7df5d628aa7fe3231c6a33233adff11b2a37a4af9c4180fe97ac7fdca3933c563bc9f63f9dc0133c59bb7c4e80f7d628a5fbac58cf2ab7de65a29aedf3531db8b4f8ce31d3253fd78c34cd73f2736713d8e88793dae98a91ee926c6fc72c74cf9f82131ea5730533ccd98717cd144e6f51585c478ff0366ea1f64629c5f8399ec793731e6e31b66daeff84c8cc7c7c45cafb612e3f87366aa07668951ff0b66ead79e99d1fee41e31d7a383c478ff1766b297bbc478ff8c99f603ae13e3fcc9be1cd9b3784c8cf1688799ee4ffaf1b4be599c8f07ff20fd9c33a37e4c9198ebc54162f4e72b66b41fdd464efad967a6fdb02766ca7775668ac7e97c1a7fc9f1fee69498f4a33bcc949fca8931be2e98291f4f1263bc51cc641f1789315ebc33d37caf9851bfea2e31c6cb0633cd7744ccfa7f4d8cfaef33937db9c4789ce525fdeb6962d43faf37f9bfba4c8cf2cd9929de1c32637cd78fcc240faf27f73726719c4f67cc4cf3558971be47cce40f178931bfa5eb69bd0789315e3d3053fd41ebe9b99f6d26c6f13c33cde739311e2f3153fea3f97adeffb865a6f8729018fd23e633efa17e89f66e3e9153fd7082ccf6e22533c5ef51e278bdcb98a9de5830a3bdbbfbc4d17eb229b3c2e39e98ebadbbc4a8ef0b66aa07c689d15e9e9869bfee2d31d69be7cc54afa5f1703eaec88cf3318e98ec219b25c6f5ab3093fe1f99295f5c25c67ae29999fac9fbc4981f7798d13e4c8919ed377b4f8cc70533aeafbe4d8cebdb64a6f5ed306b1be59f309b723c7e86ccf6670acc647fef89d1fe2e9829fe5513637cb961a6f5d84d8cc74f99297f7f24467bec33e37ac81a33f9732b31d60f5d665c0f554e8cfa7d65c6f5c81cb389eb21f87e9c0f3f12637dcce773ff3e64a6fda24662acdf2c33f5c385c4988fae99a99e6f3253fd7dcc4cfabc67c6f9fbddc4f1b8d5c49c5f07cca48f2233d5ebd789d13e3d33e5c3e3c438df4366daef607d90ffd80933d95b3531d65fe41fde53fdf4c24cfeba488cfebac78cf7eb8ca5f8777da45af95d874f62232d7d7ecb58d116fe6d92fce4c392d8df73bfdfa0179b5bdf5f999dfdfbe9659b24ebb30cfffeae19ff5bf5f253e9be3c2ff88f5bfacfff7bbd7c439aafcf53bf4f927f8f5e3a5ff8d08facf0efab975f94ee6fa617e9e3bf197cbaf219f845f6822f504e49d624fbf0770f9f413cbf07dcfd7be945beca21cc2e8bbfbfc4190a90e84dbe83642845067fcfe0f72efc0d7f7f8e5264bf4ff7bf432ff2438e607643f87d14f403520da3f50409c77292f481d2043d4de50c3e73b980cf6f93e6b7f9cb274932ea2c7de313a40affd683ce2802efcb03d9807f0fe551d4175bdbdf432f36ceb809928459b7643d774c93040df837ccfe18f471224f81e7f1dc70ddd9df2aef9fc38ccea375f561e61730e3537929dbb223afe4b5bc91b7f24edecb07f9289fe48e2cc0df77655196e05c0fd795ff56f5585356e41e48f22eabb206337d125208a184164658e1848f3f4e64a22b9ec58be889be1888573184f3fbe2edf748f24dbd7c9507963962005e7c2a3be25d7c889118c3ac27622a66f13313f3f4338b7f9b8a85f81475b12f0ee09a06e811ac9074fc17f2cd37f402771787f0398aa3510f0211f5538065899638967371224ec599381717e232ce977fe65ffccc48aab6e880feaec4b5b881b8d682fbdd42ec0b710ea283b8039f7a11f7bf4f2f61adc48338148fe249eca024a20071e943d6c5aecc445194445954c49ea8c6d9d7e867bb1474544925224fc5a5524a2ba32c4487961cc218dde04b2089564e0ae57fb75e409aa3b5bfd7e54c65aaab9ed58bea911c7348f13f926429699487fe166d0ee4e9ab81aca9578871a18e08511e32ad7afdbdfe023a39128fc947c0b260b4991aaa37f5ae3e602e643769763ffaa9a9911aab316967a2849ac6ab176aa6e6f25e2dd4276455f6c3a89bdfa617f888a7156fdf039d9caabada5707aa11f401b33bfc961cdbf50392a9a3e8416dd504976cc9431a6b4415d0b7fad6efe517b06196a4228d3a9617ea449daa33f6105ee72f3c7e8bd5255b6459c6f18c20cdb9ba5097aa0dd16518a5197cb7b6fe95fc12eea23a70a75390e44a5dc759a3656d7ac8dabae723025895402d828dc978f53cdd01a29bba51b7ea4e9c80df0c5547dd7f773fe197f23edec9c90e8cf54092a007e09c36e558e5bca4a81d91bb4b2e5eab6bf5a89ec4098c19b2f06fd44bcc2741d3af6a07745250bb90c36769e4394557b295a483f56cc25a3c52c5156b3b5ad32746b6b62aa9b2aa88a6da83990f39764216107f492f219f58885d755505ebba4549481379ed0449466a94b3969aaa41426a5015d3d6722915c8244967580b2cad15ff9269a195d6909171455fb1e383bcf617e2184c3af41823e9200a5f8175b1ddacc4d99c3666aa06eb7aad8d2a69ab9df6cae84c9ce9ae7ed62fba273e753fce3dac478aceec3f89667aa05f55172a1c157bd56cbd075df79d6fe9a50e6b3194333d147df4f8b4f6ab3129caa1df6045dff5871ee9b13855433d91977aaa6750a514a16eeee8b95ee84f5dd7fb2aacff5c1f048dae79533c22a67a5f37f461acd7b8db0e1dddaaff9a5fd18b3e82cad1e9a66e69c331388ca98ff5314a02c39ca03ef4a93ed3e7f25a5fe84bdd56afbaa3afa07e0e1dda30f436109b7afa5adfe85bd0d71dd4cd13bae3a1becfc993ec0eeef7a01fa1df39802eee284af3f6e7f512f3fcae7e526f7a07f2492eea0449482bd15f7541ef6a587b5dd26518bd0f56f10abde532f65420a2875ec7ca39e4f65d5dd17bba8ad936f9df3c79e11c343c0f5f8980685395fb4642bd16baba8b554996d27ca71e0b158b1146c551291ae5638fd1411263c29b4dd0bf64c619cf9f28d120d672d441635d07d977df64a66b9e85d4a7e68563628a8af334cea5e9c9a2e9c77e741ffa524dcf0e362274d2cbd6984d674eccc0bcaa1baad357ed1aa372cd0ccd9b7937d27cc4f347a08fd7e8ade1f349b55c9020f4f7f52819fedb35633331538535432dea472439a2e7989999eb1bb300495cec36bef07ed2cb7a061a456f1fc851b00add319fea05c75a6644350923059d6869ea665f0d61ddf4fa0830ba0049cecd01c4a297a89b217cead193c3eed3c034cca139324d90661e7d66b58288ab655ae6d89c98d3b8b7335a9beb9abf6cab0c8224d24305f10a9d56d99cad44afbc8d55953673736e2e20420ce28e44b200bad739e4ee61a850cd259c53326dd33157e65aee77c6e606fed6d353736bee82376e54a87144736f1ecca3793223b303d2f0bd711771238ead5706618fcb14409ab15ca8d06955a325d7383b2e7b0fb36b8a7aa8afa3f52cf591d78d0f3e07b368c9862999b2a9983d53958fb20d3ed08a957dcfd42c9c24a662bda241595eac025f7432b3da3ca527216ad52356fc85d7318b11746076c2bfe602badfbd5c7732a35a3066006bac15af605dbdb4b3e43762ff4836ad83bfef5b6f33282cc35e405bd76d177ac913f9218ee0d8b17db62fb617f3ec7ce36726f66c5f37419ab790ff7f9cf7579efcbc2c6b1ea9f4d00e82563083249f8fbeaa07f6d5063fa9a34ec0227927365f0936e504d65fab967db3ef20097af6c47ed89179b463b8e60ceaac133bd1cf54e96d5474aa66a7fa36d6ce5fc6dcad7a09bbd723ace8ec4cbc1b13b5928b2e98a7e1fe733bb40baa3c9b20c9727f381f3143adbb2f1ab66b3fa11b9ec5baad2866b66ef7e5a3012b168f706dcbcee4139c314dd22459601d67f6c036e4ae1d83e5c71af1a77a415df4a99783fece94ec6188fe4aae54918771ad6eec916dda568c10063d9c76c357f402b150804e8e412797c152ed891aeb7b7b0abf3fd8337b0e7e13560fc6b317f6529d6fca12adbb6ddbaa2e0fa2e56ff8ca6adecf591977a50b5515afb6b31a8be1ce500d87f865af2c547caa63af638fd18c957997eaa5204185570774f7686f42bd122bfc5aca4cc1d23e21ff4f411ab88772f6d6de25cdacf98c9dda7bfbc0318ce6fc459d9cf4f24c9edc87aaee498ca3b7e76b25fc3dd3e710f39d7d5cd129e7e4a67d8a3da897daee802405d0c9b23f59763f907d4dd39445113aef3d39b2bbb628b29429f39a99da9239d29d98633e6316ce49b5518f25bdc099a1d7167a2264bcf37a8f18aaaf775bd665a854461b9deba7dcb31559c648a0a776cf56453bd607e3a8e119f56447248fb73527a1ce827be8997ad2ef10cba6ab5a897691690ff5984935459cefd2dab6eae505a409b3534ec0ff261485b953c1fabc0d55fd05e40bb7a5836dda8a53e03f1045ec8e29839fb4979d16d58ed31413a11e76da1995c5d5bc7010e6a1f25b93258e3971ce79d44b7ebe5fea251cdd072b0bbf6bd9866c3015b9ec45bd13c47b97e94bd987ea71a317b74f602d61df7f2186f2da7563753d075f5fdae734ed0c8618d270cfee057c2acc2ee8f10dbaa46d7a9942a7d98c16f6ba5abd6cd74bd45ac848512fb223f46a551c650977357aacdba1265ea9eae913a3f3c2945ccff5a1875caf46a916a6ffd6f48bbd7503c89a10e2a0233e74af6eb85e8b63e4746ff20abc9ff4f2751ccbe945cbf768eb1a3cdf6cd10b8cefdedd871b85f5016f5ccf27a12a817ce27a3674c369565403e5577ae6c6b60a9e7fa367f248843127f248d59526bd242f7531c3aa992a401f936dcffd5bf512faeb71dc3dba16766d7da22cfacd4da1fbed847802ebd45feb149eb1eeb26741129724c97526344b377673bba7aae229d61a3eee896ae8e63ed02ed7bc74a6cedd02f4d7ff15bdc06702bf37dc676ef7886489b3a84287aba0fb3550e9f537ee7a2cdba6ec62ffebbe7a7611bb1e57b77b6e5f2e3ad841dbd873f64dd71d844a67d961927542cd241f5d23ea258bcfaa37f24b3e1e44ddf4e31a0d25642ee1d7a20956626d77282f21c7076b0a9dd679ac7a9a98e3650da2f03b542bbc33b6b28b1963d934d4beeec83583cfc51d09b005e8d446b1b73995f710f9e6a92a4ff2ab075334271dec8b1a5bfb7dce2be10929ff6e63647ed8224b8c3cca40ae864e4d1cc10c2ced2d4ec2933ebb702d558a73e16a3abf7309ff75c7605d27eed416cda3fc7467e2c99dcb5e671c2bd451b05077015139e96ff903de751ce25d9ceb321b6cd14bec404dccd5226a11d68776c356ed1cb29bcec05ba16a24ff188a96bb8cfb353518ade0c61b5d483e438da2c7b55d47d5dd558c83c3a89396bb8e2b786aca24cb9a66c0bf6ee465077db9b12ac9ba5e3afca420e4fd50c13c80bf6cca328791cec44dd8b98e4f15c20e5cd8356a08d097bb8dcff9a6319f6cf689288d8c36f66e8a4ec803e85ff640bfb7411a59177721f76f970556f6ccdd454f487af9228e717d8bef4e04bd3c8acf6db2884bdd954518b912eaadd8b7b7a0126d41147e47afa5fda1d5d8b57e97852ab97bc8613b311f85679561450edd835e241b5d91450fa08745bda89fe47dae8f636f09721fab37d1dd1285665aea677925ebc1d3837540cfdeb03ee49350ad802423ac56482b4bfb5ae61aaccadaee5dbd99767ce28abb4d100974d33d6ade6b5eb16dd5b36f7a92e297dd8c631b7a1944ab59c89979774fc97bf3f174a65f6407ce3b87f37a30931ef4395db74355fdeaeef26a9798626ca87c812e5d5dde41175602cf1f63bd20af5c21566ce92ade8777bbaea84ba1aafc693dc67a091d95866e745f165c69b3670dcfe3744fcfc1b29a60eb03f84066043f699324f9a7315b3aded86d534484dfa76aeecaae22ee6825952ae89dd8c7aecb02b539ac6e03abfd7549b6eb05351dbdabe3f6623551c3e88335547cb698995bd38f7b5f43e9edcc54a29f8c20dee66c9c6d4cdfc72a2edfbbac3c15b0fbaeea6aa16704dd54dc420f569eb6d5e833b5532f2122f5b73f1b5bf6fb6bfe12f69e16e6d10b5bc7fe85f6c379077be2951e520fd9f3da0499675845c7a75db9a7caf139f15c4d5662da32e3046b9a78037d4bd86759e8a9739429b91295b42a0b6f654797bf7a3f23d7eff3bb7736bea1133e2d3df3e12d96f48c27d90e8cafebde9b93b017d9199b2b9f450b1b91acd176925f40668cfbdcf927ae2bb124f4ca4a7baf86beab4efc33dbc25296b07b0133393325ffb2566dade9656d1fb0179fdc3c879a55bc8a7ab2dd3407df83d9ee6b27c26e75d8a9bb763d5d0f7b2c94558e04e90263afeffb7eec91974fbe562263d8c7d07dbbef07ba029f41ea90973616e2441dc63ba6fa8fbb932df518f52bfc4e64173ea3f8eed1ae7fc52758f93944add7fcd0bf992cbcb3a25e65db9efbf7f80c6f4afb4fbc635ff51f90a63b7e1464ddb62bc19d26dc71ec271043aa395f5b6a6eeaa7fa461ee0f317894f811b1b7ae1ba46939cc1f333f0e80af488333fc35d87646782f3839ffb85ab057f81cf89f57664f7e3f3e55ccf085547dd7fca2b1372fc3b65c06d99333c399afbbadf8f7ba46bcf4542e473637fa0aa6a87f6c72cd5645feb252fa7f50d9066ae0aa213c6413b4b193d44b589ae9a67d0e100baa8b97a358fd0471ec5d5a728aa1edcdc1f422dfce98f9c70f72eee906d4a132279ec27f21968a5da07ad34e5937f817ee93af9f78ff4b2fa0d8f816f419df4e68fc13a2e97b2505c1ea960c16df0c60b7f0255e5507ef853f3688eeca7aa91a5c5fe84f2f4441ef8337feeea1bef94b19d85e7d087394d25ad45afabba777fe12f61d55e531cd35fea65bda3e258716cf68337827f525c8e16413bcaeac64c74781beb11ce2fcbba9e82dfb4e33e8ad72faea9aa6185a06f34a177741508569ddc1ecca6ad6db7c199fad05083c70c9edf495c798bfe1bcf2b9d1dfaabf8cc62ccb280fdd6b8da35bb76cf5fcb29549967204d789652f6374efb1be8a81a3182f4a03f19ca3da8509e65d1dffabb65ef8c716fed675d6fe04bfe1eeabf0654b0bcc31b9e7de67717c5b79e5736c48d38f3e0d390edc629e2d7685739c4b3b65e989a3c14bbb6225a32f38ffec9efb817e8db67e17dd758b3ed40a51376dd4bbee077ed67ccc03f7af36fe931a1fadbf7455f8aabe157f726beacc7b6eba5ef5fc4a9adc69e37d71de6f3b62ffb8a7d8eb9067a4cb5234b2a3317f14969d8cd0d95fc082ad0b0fb07fd89ab897753075f9b6eece86d9728ec8b85bdea8a6fc4be6ae549a2dc782ef643695afad2f64567a573a708434f4a1756d817bf07f56e0b7b91f8ce7e1f3cf523bc45077fdb0bd2844a14ee77208bfad6ee876c14debcf8521f44beea6b662027be01d1a8b5fa7ce717f562ecb5ee64d24e537fb4d657847a0b6257077a9a27c8661771a4213d451ac57797f7d471ece54d7cba2174d97433e1c76e4cd17dcb4f7a87e93253100b75f0f6d0c7e623d3d7fdcb171febcecc93acf9cf4ca7bdfab567bd94b99dfdcc8cbc87918fa3870ec471d451333d01b771dfed5566ae91d9cc653eb7fe1bda09d26459d6cd9ee56588be71f6cf7f4d2f901b5eed43f692f5e2db30b3dcec97fe3bc3aca2ceb3be6dc827e8d44ee3be8e8e6fbbfbd87f8618b480fea4a2a7ea241bf871f6fad5de59eebf97d910fcab6b245cefd3fb305bde8afb8ebf1827df44217bcbdeb30fd5cbf51ff99197d1742aac6965237fa8caaa9e8d4d37eeef1ce999dd9145b90b75b0d79fd9440fe21b8ee97d870d3f59eaa7a6ebd95476409a502d0db90a5eb7b46fbda7d4c86661df18d65365737a3711ab197ea724ef4721864af5a0ceb5c916fac35af52c1fecad7cf0b3ec5369d30229daa95b1be764f92a8e417da17b595d0d202e0eada69d3eb76e69df8a63a7f139cba7eceba76c3f3b88d174bed607af7757f107ec6e212e55037e1ea0ea6c474de4e7fdf57bccf99f50274c40370d730e83e2b317b7f27eecb7f30be8a38cef1c6533dd544fee1d3b8cd8b7e76bf3f53e6bbd4a648faee5de65dcf0f6adb55a78fbaaef0aea323bcc7f5fe64fe417971de11b54e649b775336bbaae2ec4fbbfa537ae56c75ee5d1dabcb7493c4bd26cd14c7ce607155ed6029f79cb3f1df9b538d61943a775a1afc27396204d36cb8eb313fd4acfae67dbfa44f4a77c4e5dd3d9d7d5cb177f0f5152d5b2d3ec2cb7bfffebf945c427792e4400e343c6124dad552b3bd7a7c1fe7ff2063f74fe4ad07ba23f96221ecdb22fa2344802f1fe026261fcde13c7b15fd54b76299a5063857cdeb28faa93b521e335fc71d6d1b5edbdd54f567ad5fb79a76916734997be75b2228798805e32af6401e217e6978db7bbbea9978de791615dcc497665caa6677e56ed6e4ab02e4b0dbff7e3ab99ca9eb361fecddfa8591973b08aefc4f6d3f761be7eafef8755cc8624cf59fc269b18aa2cbbd63be6debce0b86bbebba5da598be4945ff5be16bea6274e841a3af437d095a2340b9064a62ea00e3f0e6fc56f9bd35fd04b2b3ec7d250ef9eb80788d2e5ec26bb855850e55d0b7c37561dbac9fadbbab83f1bdf9be5ef2655d587bff7453d34e169af335d57d4bdf856c1143d3e7c5bc1efe9a6b8c3f769d757f957fc6555228c06f1fb7a879087f78d5415f3a886d99dbb151da87c57bb926d5181f759a6c2f9a6fd84eef7ca97e0be93f0dc00d47e9dd5a334d3f84461600fedb36e423416a2f5a339fe99eff1c98fb8af99c5ef4c424d200ae13d7f7f96dddbb7ecc1ddda52faeedb7aef98befba6aeb3c7ec29db914f597877b601fd4de8b4420f0f55a4866a32dbcd8a4127fa33f849d8390f3a094fbabe9ad79ffa7e2546c556fc06ee0222f64e789e0cf9e718f453771fe64887ff1f1be1dec0cecff5403d38e854d403fcd673bbfadd4ebdb5c7ee43dfa8aa7f014bd5a1830b9d16bd0d94c17d8b90e34b20ef45dcab9cc7151cc64eee2fe5fdf58f3e8aefc9eaf8ae18589b39353b56430fd9cfcafe482e40aa86f3ba29afd4895bc847538499df883353f487e00b15f9a486e6d09ce832be1b0033edc6e7d6adf8e4b5670a32ecba1ffa6e7666fa71d7b5b7be927f3a8e6d5a59d86f1ec4ef7c0be9512f61dfca14c2ef3402f43c60e327ae614eec425f66157da9a7e6c4edfb177aaf9c67844f4bfab1cb0adf210fb5f030ec208699cb56fc17bfb91ddeb37dde8c487f5e2f5f44ebe5dff0ed9bf4b6f5ca2ae0dbd7dbeeb5f1d6e1963dbbade3ff257ff99124e1f3999326bd53b41ed9b7db3c4a45fb912b7ffff9ff37c65fd1cb9699e1373b56759151e7d4d8f21e3ebf8f897b90b97d6deab4446e8f5be77788b77dbe9ff77fa097f5bfaf5811fcdee03e70db0af01ee44a5d419d16e9e3f7e9656baf909fd5da9a7d65459b7f4709f58facef9bb6f14dbd7cd5f9e4efb4f27ce07b92e864795bf4b5a2a31f48f4cb71ec2b0fff91f5fd60c42dc7577b91706e2577feb671d37d7d23dbfbad7ad98c43ab5efae56cf2e7af44f5dc3d7fb00a704eb60795cf9fa8937f76deeffa7c77bcdf93f7ff9e9f7ff7ff2fdcffcdcfff577af9dffff31fff075dc58bf2 - + diff --git a/kwordquiz/src/keduvocdata.cpp b/kwordquiz/src/keduvocdata.cpp index 48b20f8e..3afe5ac2 100644 --- a/kwordquiz/src/keduvocdata.cpp +++ b/kwordquiz/src/keduvocdata.cpp @@ -69,13 +69,13 @@ TQString KEduVocDataItem::getText(const TQString &tagName) const return element.text(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } //////////////////////////////////////////////////////////////////////////////// @@ -156,7 +156,7 @@ TQString KEduVocData::language(int col) else return document -> documentElement().namedItem("e").namedItem("t").toElement().attribute("l"); else - return TQString::null; + return TQString(); } diff --git a/kwordquiz/src/kvtmlwriter.cpp b/kwordquiz/src/kvtmlwriter.cpp index 787cabab..4cf9ebe3 100644 --- a/kwordquiz/src/kvtmlwriter.cpp +++ b/kwordquiz/src/kvtmlwriter.cpp @@ -21,7 +21,7 @@ KVTMLWriter::KVTMLWriter(TQFile *file) outputFile = file; if(outputFile->open(IO_WriteOnly)) { - outputStream.setDevice(outputFile); + outputStream.setDevice(TQT_TQIODEVICE(outputFile)); outputStream.setEncoding(TQTextStream::UnicodeUTF8); outputStream << "" << endl; @@ -35,10 +35,10 @@ KVTMLWriter::KVTMLWriter(TQFile *file) void KVTMLWriter::addHeader(const TQString &generator, int cols, int rows, const TQString &title) { TQString s = TQString("") - .arg(generator) - .arg(cols) - .arg(rows) - .arg(title); + .tqarg(generator) + .tqarg(cols) + .tqarg(rows) + .tqarg(title); outputStream << s << endl << endl; } @@ -50,12 +50,12 @@ void KVTMLWriter::addFirstItem(const TQString &ll, int lwidth, const TQString &l { outputStream << " " << endl; TQString s = TQString(" ") - .arg(lwidth) - .arg(ll); + .tqarg(lwidth) + .tqarg(ll); outputStream << s << escape(left) << "" << endl; s = TQString(" ") - .arg(rwidth) - .arg(rl); + .tqarg(rwidth) + .tqarg(rl); outputStream << s << escape(right) << "" << endl; outputStream << " " << endl; } @@ -81,9 +81,9 @@ KVTMLWriter::~KVTMLWriter() TQString KVTMLWriter::escape( const TQString & s) { TQString result = s; - result.replace(TQChar('&'), "&"); //must be done first - result.replace(TQChar('<'), "<"); - result.replace(TQChar('>'), ">"); + result.tqreplace(TQChar('&'), "&"); //must be done first + result.tqreplace(TQChar('<'), "<"); + result.tqreplace(TQChar('>'), ">"); return result; } diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 9dde6a0c..a13b0aa0 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -52,7 +52,7 @@ #define ID_MODE_1 1 -#define ID_MENU_QUIZ 1001 +#define ID_MENU_TQUIZ 1001 KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):KMainWindow(0, name) { @@ -68,7 +68,7 @@ KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):KMainWindow(0, name) initView(); m_dirWatch = KDirWatch::self(); - m_quizType = WQQuiz::qtEditor; + m_quizType = WTQQuiz::qtEditor; m_quiz = 0; m_flashView = 0; m_multipleView = 0; @@ -105,117 +105,117 @@ void KWordQuizApp::initActions() KAction* configNotifications; KAction* configApp; - fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setToolTip(fileNew->whatsThis()); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", this, TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); + fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", TQT_TQOBJECT(this), TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); + fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); fileSave->setWhatsThis(i18n("Saves the active vocabulary document")); fileSave->setToolTip(fileSave->whatsThis()); - fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs->setWhatsThis(i18n("Saves the active vocabulary document with a different name")); fileSaveAs->setToolTip(fileSaveAs->whatsThis()); - fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); + fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); fileClose->setWhatsThis(i18n("Closes the active vocabulary document")); fileClose->setToolTip(fileClose->whatsThis()); - filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); + filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); filePrint->setWhatsThis(i18n("Prints the active vocabulary document")); filePrint->setToolTip(filePrint->whatsThis()); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); fileQuit->setWhatsThis(i18n("Quits KWordQuiz")); fileQuit->setToolTip(fileQuit->whatsThis()); - editUndo = KStdAction::undo(this, TQT_SLOT(slotEditUndo()), actionCollection()); + editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection()); editUndo->setWhatsThis(i18n("Undoes the last command")); editUndo->setToolTip(editUndo->whatsThis()); - editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); + editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); editCut->setWhatsThis(i18n("Cuts the text from the selected cells and places it on the clipboard")); editCut->setToolTip(editCut->whatsThis()); - editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); + editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); editCopy->setWhatsThis(i18n("Copies the text from the selected cells and places it on the clipboard")); editCopy->setToolTip(editCopy->whatsThis()); - editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); + editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); editPaste->setWhatsThis(i18n("Pastes previously cut or copied text from the clipboard into the selected cells")); editPaste->setToolTip(editPaste->whatsThis()); - editClear = KStdAction::clear(this, TQT_SLOT(slotEditClear()), actionCollection()); + editClear = KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotEditClear()), actionCollection()); editClear->setWhatsThis(i18n("Clears the content of the selected cells")); editClear->setToolTip(editClear->whatsThis()); - editInsert = new KAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", this, TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); + editInsert = new KAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); editInsert->setWhatsThis(i18n("Inserts a new row above the current row")); editInsert->setToolTip(editInsert->whatsThis()); - editDelete = new KAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", this, TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); + editDelete = new KAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); editDelete->setWhatsThis(i18n("Deletes the selected row(s)")); editDelete->setToolTip(editDelete->whatsThis()); - editMarkBlank = new KAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", this, TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); + editMarkBlank = new KAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); editMarkBlank->setWhatsThis(i18n("Marks the current or selected word as a blank for Fill-in-the-blank")); editMarkBlank->setToolTip(editMarkBlank->whatsThis()); - editUnmarkBlank = new KAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, this, TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); + editUnmarkBlank = new KAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); editUnmarkBlank->setWhatsThis(i18n("Removes blanks from the current or selected word")); editUnmarkBlank->setToolTip(editUnmarkBlank->whatsThis()); - //@todo implement editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), actionCollection()); + //@todo implement editFind = KStdAction::tqfind(this, TQT_SLOT(slotEditFind()), actionCollection()); - vocabLanguages = new KAction(i18n("&Column Titles..."), "languages", "CTRL+L", this, TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); + vocabLanguages = new KAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary")); vocabLanguages->setToolTip(vocabLanguages->whatsThis()); - vocabFont = new KAction(i18n("&Font..."), "fonts", 0, this, TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); + vocabFont = new KAction(i18n("&Font..."), "fonts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); vocabFont->setWhatsThis(i18n("Defines the font used by the editor")); vocabFont->setToolTip(vocabFont->whatsThis()); - //@todo implement vocabKeyboard = new KAction(i18n("&Keyboard..."), "kxkb", 0, this, TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); + //@todo implement vocabKeyboard = new KAction(i18n("&Keyboard..."), "kxkb", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); - vocabRC = new KAction(i18n("&Rows/Columns..."), "rowcol", 0, this, TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); + vocabRC = new KAction(i18n("&Rows/Columns..."), "rowcol", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); vocabRC->setWhatsThis(i18n("Defines the number of rows, row heights, and column widths for the active vocabulary")); vocabRC->setToolTip(vocabRC->whatsThis()); - vocabSort = new KAction(i18n("&Sort..."), "sort_incr", 0, this, TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); + vocabSort = new KAction(i18n("&Sort..."), "sort_incr", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); vocabSort->setWhatsThis(i18n("Sorts the vocabulary in ascending or descending order based on the left or right column")); vocabSort->setToolTip(vocabSort->whatsThis()); - vocabShuffle = new KAction(i18n("Sh&uffle"), "shuffle", 0, this, TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); + vocabShuffle = new KAction(i18n("Sh&uffle"), "shuffle", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); vocabShuffle->setWhatsThis(i18n("Shuffles the entries of the active vocabulary")); vocabShuffle->setToolTip(vocabShuffle->whatsThis()); - mode = new KToolBarPopupAction(i18n("Change Mode"), "mode1", 0, this, TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); + mode = new KToolBarPopupAction(i18n("Change Mode"), "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); mode->setWhatsThis(i18n("Changes the mode used in quiz sessions")); mode->setToolTip(mode->whatsThis()); KPopupMenu *popup = mode->popupMenu(); popup->clear(); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", this, TQT_SLOT(slotMode1()), 0, 0); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", this, TQT_SLOT(slotMode2()), 0, 1); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode3", KIcon::Toolbar), "", this, TQT_SLOT(slotMode3()), 0, 2); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", this, TQT_SLOT(slotMode4()), 0, 3); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", this, TQT_SLOT(slotMode5()), 0, 4); - - mode1 = new KToggleAction("", "mode1", 0, this, TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); - mode2 = new KToggleAction("", "mode2", 0, this, TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); - mode3 = new KToggleAction("", "mode3", 0, this, TQT_SLOT(slotMode3()), actionCollection(),"mode_3"); - mode4 = new KToggleAction("", "mode4", 0, this, TQT_SLOT(slotMode4()), actionCollection(),"mode_4"); - mode5 = new KToggleAction("", "mode5", 0, this, TQT_SLOT(slotMode5()), actionCollection(),"mode_5"); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode3", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); + + mode1 = new KToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); + mode2 = new KToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); + mode3 = new KToggleAction("", "mode3", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), actionCollection(),"mode_3"); + mode4 = new KToggleAction("", "mode4", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), actionCollection(),"mode_4"); + mode5 = new KToggleAction("", "mode5", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), actionCollection(),"mode_5"); mode1->setWhatsThis(i18n("Selects this mode")); mode2->setWhatsThis(i18n("Selects this mode")); mode3->setWhatsThis(i18n("Selects this mode")); @@ -227,56 +227,56 @@ void KWordQuizApp::initActions() mode4->setToolTip(mode4->whatsThis()); mode5->setToolTip(mode5->whatsThis()); - quizEditor = new KAction(i18n("&Editor"), "editor", "F6", this, TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); + quizEditor = new KAction(i18n("&Editor"), "editor", "F6", TQT_TQOBJECT(this), TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); quizEditor->setWhatsThis(i18n("Activates the vocabulary editor")); quizEditor->setToolTip(quizEditor->whatsThis()); - quizFlash = new KAction(i18n("&Flashcard"), "flash", "F7", this, TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); + quizFlash = new KAction(i18n("&Flashcard"), "flash", "F7", TQT_TQOBJECT(this), TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); quizFlash->setWhatsThis(i18n("Starts a flashcard session using the active vocabulary")); quizFlash->setToolTip(quizFlash->whatsThis()); - quizMultiple = new KAction(i18n("&Multiple Choice"), "multiple", "F8", this, TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); + quizMultiple = new KAction(i18n("&Multiple Choice"), "multiple", "F8", TQT_TQOBJECT(this), TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); quizMultiple->setWhatsThis(i18n("Starts a multiple choice session using the active vocabulary")); quizMultiple->setToolTip(quizMultiple->whatsThis()); - quizQA = new KAction(i18n("&Question && Answer"), "qa", "F9", this, TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); + quizQA = new KAction(i18n("&Question && Answer"), "qa", "F9", TQT_TQOBJECT(this), TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); quizQA->setWhatsThis(i18n("Starts a question and answer session using the active vocabulary")); quizQA->setToolTip(quizQA->whatsThis()); - quizCheck = new KAction(i18n("&Check"), "check", "Return", this, 0, actionCollection(),"quiz_check"); + quizCheck = new KAction(i18n("&Check"), "check", "Return", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_check"); quizCheck->setWhatsThis(i18n("Checks your answer to this question")); quizCheck->setToolTip(quizCheck->whatsThis()); - flashKnow = new KAction(i18n("I &Know"), "know", "K", this, 0, actionCollection(),"flash_know"); + flashKnow = new KAction(i18n("I &Know"), "know", "K", TQT_TQOBJECT(this), 0, actionCollection(),"flash_know"); flashKnow->setWhatsThis(i18n("Counts this card as correct and shows the next card")); flashKnow->setToolTip(flashKnow->whatsThis()); - flashDontKnow = new KAction(i18n("I &Do Not Know"), "dontknow", "D", this, 0, actionCollection(),"flash_dont_know"); + flashDontKnow = new KAction(i18n("I &Do Not Know"), "dontknow", "D", TQT_TQOBJECT(this), 0, actionCollection(),"flash_dont_know"); flashDontKnow->setWhatsThis(i18n("Counts this card as incorrect and shows the next card")); flashDontKnow->setToolTip(flashDontKnow->whatsThis()); - qaHint = new KAction(i18n("&Hint"), "hint", "CTRL+H", this, 0, actionCollection(),"qa_hint"); + qaHint = new KAction(i18n("&Hint"), "hint", "CTRL+H", TQT_TQOBJECT(this), 0, actionCollection(),"qa_hint"); qaHint->setWhatsThis(i18n("Gets the next correct letter of the answer")); qaHint->setToolTip(qaHint->whatsThis()); - quizRestart = new KAction(i18n("&Restart"), "restart.png", "CTRL+R", this, 0, actionCollection(), "quiz_restart"); + quizRestart = new KAction(i18n("&Restart"), "restart.png", "CTRL+R", TQT_TQOBJECT(this), 0, actionCollection(), "quiz_restart"); quizRestart->setWhatsThis(i18n("Restarts the quiz session from the beginning")); quizRestart->setToolTip(quizRestart->whatsThis()); - quizRepeatErrors = new KAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", this, 0, actionCollection(),"quiz_repeat_errors"); + quizRepeatErrors = new KAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_repeat_errors"); quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions")); quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis()); - configNotifications = KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection()); + configNotifications = KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection()); configNotifications->setWhatsThis(i18n("Configures sound and other notifications for certain events")); configNotifications->setToolTip(configNotifications->whatsThis()); - configApp = KStdAction::preferences(this, TQT_SLOT( slotConfigure()), actionCollection()); + configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotConfigure()), actionCollection()); configApp->setWhatsThis(i18n("Specifies preferences for the vocabulary editor and quiz sessions")); configApp->setToolTip(configApp->whatsThis()); - charMapper = new TQSignalMapper(this); - connect(charMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotInsertChar(int))); + charMapper = new TQSignalMapper(TQT_TQOBJECT(this)); + connect(charMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotInsertChar(int))); specialChar1 = new KAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ; specialChar2 = new KAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ; @@ -299,12 +299,12 @@ void KWordQuizApp::initActions() charMapper->setMapping(specialChar9, 9); actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusMsg(const TQString &))); - connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool))); + connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); + connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotActionHighlighted(KAction *, bool))); updateSpecialCharIcons(); if (!initialGeometrySet()) - resize( TQSize(650, 500).expandedTo(minimumSizeHint())); + resize( TQSize(650, 500).expandedTo(tqminimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); @@ -333,8 +333,8 @@ void KWordQuizApp::initView() setCentralWidget(m_editView); setCaption(doc->URL().fileName(),false); m_editView->setFont(Prefs::editorFont()); - connect(m_editView, TQT_SIGNAL(undoChange(const TQString&, bool )), this, TQT_SLOT(slotUndoChange(const TQString&, bool))); - connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), this, TQT_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); + connect(m_editView, TQT_SIGNAL(undoChange(const TQString&, bool )), TQT_TQOBJECT(this), TQT_SLOT(slotUndoChange(const TQString&, bool))); + connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); } void KWordQuizApp::openURL(const KURL& url) @@ -497,7 +497,7 @@ void KWordQuizApp::slotFileOpen() cb -> setChecked(false); TQString filter = i18n("*.kvtml *.wql *.xml.gz *.csv|All Supported Documents\n*.kvtml|KDE Vocabulary Document\n*.wql|KWordQuiz Document\n*.xml.gz|Pauker Lesson\n*.csv|Comma-Separated Values"); - KFileDialog *fd = new KFileDialog(TQString::null, filter, this, 0, true, cb); + KFileDialog *fd = new KFileDialog(TQString(), filter, this, 0, true, cb); fd -> setOperationMode(KFileDialog::Opening); fd -> setMode(KFile::Files | KFile::ExistingOnly); fd -> setCaption(i18n("Open Vocabulary Document")); @@ -568,7 +568,7 @@ void KWordQuizApp::slotFileSave() void KWordQuizApp::slotFileGHNS() { if (!m_newStuff) - m_newStuff = new KWQNewStuff(this); + m_newStuff = new KWTQNewStuff(this); m_newStuff->download(); } @@ -585,7 +585,7 @@ bool KWordQuizApp::saveAsFileName( ) bool success = false; TQString filter = i18n("*.kvtml|KDE Vocabulary Document\n*.wql|KWordQuiz Document\n*.csv|Comma-Separated Values\n*.html|Hypertext Markup Language"); - KFileDialog *fd = new KFileDialog(TQString::null, filter, this, 0, true); + KFileDialog *fd = new KFileDialog(TQString(), filter, this, 0, true); fd -> setOperationMode(KFileDialog::Saving); fd -> setCaption(i18n("Save Vocabulary Document As")); @@ -595,7 +595,7 @@ bool KWordQuizApp::saveAsFileName( ) if(!url.isEmpty()){ //@todo check that a valid extension was really given - if (!url.fileName().contains('.')) + if (!url.fileName().tqcontains('.')) { if (fd->currentFilter() == "*.wql") url = KURL(url.path() + ".wql"); @@ -610,7 +610,7 @@ bool KWordQuizApp::saveAsFileName( ) TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("The file
    %1
    already exists. Do you want to overwrite it?    ") - .arg(url.path()),TQString::null,i18n("Overwrite")) == KMessageBox::Cancel) + .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel) { // do nothing } @@ -660,7 +660,7 @@ void KWordQuizApp::slotFileClose() void KWordQuizApp::slotFilePrint() { slotStatusMsg(i18n("Printing...")); - WQPrintDialogPage * p = new WQPrintDialogPage(this); + WTQPrintDialogPage * p = new WTQPrintDialogPage(this); KPrinter printer; printer.addDialogPage(p); printer.setFullPage(true); @@ -801,7 +801,7 @@ void KWordQuizApp::slotVocabFont() void KWordQuizApp::slotVocabKeyboard() { - slotStatusMsg(i18n("Changing the keyboard layout...")); + slotStatusMsg(i18n("Changing the keyboard tqlayout...")); KMessageBox::sorry(0, i18n("Not implemented yet")); slotStatusMsg(i18n("Ready")); } @@ -885,32 +885,32 @@ void KWordQuizApp::slotMode5() void KWordQuizApp::slotQuizEditor() { slotStatusMsg(i18n("Starting editor session...")); - updateSession(WQQuiz::qtEditor); + updateSession(WTQQuiz::qtEditor); slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizFlash() { slotStatusMsg(i18n("Starting flashcard session...")); - updateSession(WQQuiz::qtFlash); + updateSession(WTQQuiz::qtFlash); slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizMultiple() { slotStatusMsg(i18n("Starting multiple choice session...")); - updateSession(WQQuiz::qtMultiple); + updateSession(WTQQuiz::qtMultiple); slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizQA() { slotStatusMsg(i18n("Starting question & answer session...")); - updateSession(WQQuiz::qtQA); + updateSession(WTQQuiz::qtQA); slotStatusMsg(i18n("Ready")); } -void KWordQuizApp::updateSession(WQQuiz::QuizType qt) +void KWordQuizApp::updateSession(WTQQuiz::QuizType qt) { if (m_quiz != 0) { @@ -919,24 +919,24 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) } switch( m_quizType ){ - case WQQuiz::qtEditor: + case WTQQuiz::qtEditor: // break; - case WQQuiz::qtFlash: + case WTQQuiz::qtFlash: if (m_flashView != 0) { delete(m_flashView); m_flashView = 0; } break; - case WQQuiz::qtMultiple: + case WTQQuiz::qtMultiple: if (m_multipleView != 0) { delete(m_multipleView); m_multipleView = 0; } break; - case WQQuiz::qtQA: + case WTQQuiz::qtQA: if (m_qaView != 0) { delete(m_qaView); @@ -949,15 +949,15 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) updateActions(qt); switch( m_quizType ){ - case WQQuiz::qtEditor: + case WTQQuiz::qtEditor: m_editView->show(); setCentralWidget(m_editView); m_editView -> setFocus(); break; - case WQQuiz::qtFlash: - m_quiz = new WQQuiz(m_editView); + case WTQQuiz::qtFlash: + m_quiz = new WTQQuiz(m_editView); connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); - m_quiz ->setQuizType(WQQuiz::qtFlash); + m_quiz ->setQuizType(WTQQuiz::qtFlash); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) { @@ -982,10 +982,10 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_quiz = 0; } break; - case WQQuiz::qtMultiple: - m_quiz = new WQQuiz(m_editView); + case WTQQuiz::qtMultiple: + m_quiz = new WTQQuiz(m_editView); connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); - m_quiz ->setQuizType(WQQuiz::qtMultiple); + m_quiz ->setQuizType(WTQQuiz::qtMultiple); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) { @@ -1009,16 +1009,16 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_quiz = 0; } break; - case WQQuiz::qtQA: - m_quiz = new WQQuiz(m_editView); + case WTQQuiz::qtQA: + m_quiz = new WTQQuiz(m_editView); connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); - m_quiz ->setQuizType(WQQuiz::qtQA); + m_quiz ->setQuizType(WTQQuiz::qtQA); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) { m_editView->saveCurrentSelection(true); m_editView->hide(); - m_qaView = new QAView(this); + m_qaView = new TQAView(this); connect(quizCheck, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotCheck())); connect(qaHint, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotHint())); connect(quizRestart, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotRestart())); @@ -1055,7 +1055,7 @@ void KWordQuizApp::slotConfigure() //KConfigDialog didn't find an instance of this dialog, so lets create it : KWordQuizPrefs* dialog = new KWordQuizPrefs( this, "settings", Prefs::self() ); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyPreferences())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyPreferences())); dialog->show(); } @@ -1064,7 +1064,7 @@ void KWordQuizApp::slotApplyPreferences() kdDebug() << "Prefs Update" << endl; editMarkBlank->setEnabled(Prefs::enableBlanks()); editUnmarkBlank->setEnabled(Prefs::enableBlanks()); - m_editView->viewport()->repaint(true); + m_editView->viewport()->tqrepaint(true); updateSpecialCharIcons(); emit settingsChanged(); } @@ -1074,14 +1074,14 @@ void KWordQuizApp::updateSpecialCharIcons( ) for (int i = 0; i < 9; i++){ KAction * act = actionCollection()->action(TQString("char_" + TQString::number(i + 1)).latin1()); act->setIcon(charIcon(Prefs::specialCharacters()[i])); - act->setToolTip(i18n("Inserts the character %1").arg(Prefs::specialCharacters()[i])); + act->setToolTip(i18n("Inserts the character %1").tqarg(Prefs::specialCharacters()[i])); } } TQString KWordQuizApp::charIcon(const TQChar & c) { ///Create a name and path for the icon - TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png"); ///No need to redraw if it already exists if (KStandardDirs::exists(s)) @@ -1096,19 +1096,19 @@ TQString KWordQuizApp::charIcon(const TQChar & c) ///Create the pixmap TQPixmap pm(128, 128); - pm.fill(Qt::white); + pm.fill(TQt::white); TQPainter p(&pm); p.setFont(font); - p.setPen(Qt::blue); - p.drawText(r, Qt::AlignCenter, (TQString) c); + p.setPen(TQt::blue); + p.drawText(r, TQt::AlignCenter, (TQString) c); - ///Create transparency mask + ///Create transparency tqmask TQBitmap bm(128, 128); - bm.fill(Qt::color0); + bm.fill(TQt::color0); TQPainter b(&bm); b.setFont(font); - b.setPen(Qt::color1); - b.drawText(r, Qt::AlignCenter, (TQString) c); + b.setPen(TQt::color1); + b.drawText(r, TQt::AlignCenter, (TQString) c); ///Mask the pixmap pm.setMask(bm); @@ -1131,7 +1131,7 @@ void KWordQuizApp::slotStatusMsg(const TQString &text) void KWordQuizApp::updateMode(int m) { if (m_quiz != 0) - if (KMessageBox::warningContinueCancel(this, i18n("This will restart your quiz. Do you wish to continue?"), TQString::null, KStdGuiItem::cont(), "askModeQuiz") != KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("This will restart your quiz. Do you wish to continue?"), TQString(), KStdGuiItem::cont(), "askModeQuiz") != KMessageBox::Continue) { mode1->setChecked(Prefs::mode() == 1); mode2->setChecked(Prefs::mode() == 2); @@ -1145,11 +1145,11 @@ void KWordQuizApp::updateMode(int m) TQString s1 = m_editView -> horizontalHeader()->label(0); TQString s2 = m_editView -> horizontalHeader()->label(1); - mode1->setText(i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2)); - mode2->setText(i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1)); - mode3->setText(i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2)); - mode4->setText(i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1)); - mode5->setText(i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2)); + mode1->setText(i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2)); + mode2->setText(i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1)); + mode3->setText(i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2)); + mode4->setText(i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1)); + mode5->setText(i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2)); mode1->setChecked(Prefs::mode() == 1); mode2->setChecked(Prefs::mode() == 2); @@ -1164,30 +1164,30 @@ void KWordQuizApp::updateMode(int m) popup->setItemChecked(3, Prefs::mode() == 4); popup->setItemChecked(4, Prefs::mode() == 5); - popup->changeItem(0, i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2)); - popup->changeItem(1, i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1)); - popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2)); - popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1)); - popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2)); + popup->changeItem(0, i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2)); + popup->changeItem(1, i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1)); + popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2)); + popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1)); + popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2)); TQString s; mode->setIcon("mode" + s.setNum(Prefs::mode())); switch( Prefs::mode() ){ case 1: - statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s1).arg(s2), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE); break; case 2: - statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s2).arg(s1), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE); break; case 3: - statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE); break; case 4: - statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s2).arg(s1), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE); break; case 5: - statusBar()->changeItem(i18n("%1 <-> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 <-> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE); break; } @@ -1217,9 +1217,9 @@ void KWordQuizApp::slotContextMenuRequested(int row, int col, const TQPoint & po popup->exec(pos); } -void KWordQuizApp::updateActions( WQQuiz::QuizType qt ) +void KWordQuizApp::updateActions( WTQQuiz::QuizType qt ) { - bool fEdit = (qt == WQQuiz::qtEditor); + bool fEdit = (qt == WTQQuiz::qtEditor); fileSave->setEnabled(fEdit); fileSaveAs->setEnabled(fEdit); @@ -1237,21 +1237,21 @@ void KWordQuizApp::updateActions( WQQuiz::QuizType qt ) vocabSort->setEnabled(fEdit); vocabShuffle->setEnabled(fEdit); - quizEditor->setEnabled(qt != WQQuiz::qtEditor); - quizFlash->setEnabled(qt != WQQuiz::qtFlash); - quizMultiple->setEnabled(qt != WQQuiz::qtMultiple); - quizQA->setEnabled(qt != WQQuiz::qtQA); + quizEditor->setEnabled(qt != WTQQuiz::qtEditor); + quizFlash->setEnabled(qt != WTQQuiz::qtFlash); + quizMultiple->setEnabled(qt != WTQQuiz::qtMultiple); + quizQA->setEnabled(qt != WTQQuiz::qtQA); - quizCheck->setEnabled(qt != WQQuiz::qtEditor); - quizRestart->setEnabled(qt != WQQuiz::qtEditor); + quizCheck->setEnabled(qt != WTQQuiz::qtEditor); + quizRestart->setEnabled(qt != WTQQuiz::qtEditor); quizRepeatErrors->setEnabled(false); - flashKnow->setEnabled(qt == WQQuiz::qtFlash); - flashDontKnow->setEnabled(qt == WQQuiz::qtFlash); + flashKnow->setEnabled(qt == WTQQuiz::qtFlash); + flashDontKnow->setEnabled(qt == WTQQuiz::qtFlash); - qaHint->setEnabled(qt == WQQuiz::qtQA); + qaHint->setEnabled(qt == WTQQuiz::qtQA); - toolBar("quizToolBar")->setHidden(qt == WQQuiz::qtEditor); + toolBar("quizToolBar")->setHidden(qt == WTQQuiz::qtEditor); } diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index 66e7b440..7b038b11 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#ifndef KWORDQUIZ_H -#define KWORDQUIZ_H +#ifndef KWORDTQUIZ_H +#define KWORDTQUIZ_H #ifdef HAVE_CONFIG_H #include #endif -// include files for Qt +// include files for TQt #include // include files for KDE @@ -38,10 +38,10 @@ class KWordQuizDoc; class KWordQuizView; class KWordQuizPrefs; -class QAView; +class TQAView; class MultipleView; class FlashView; -class KWQNewStuff; +class KWTQNewStuff; /** * The base class for KWordQuiz application windows. It sets up the main @@ -60,13 +60,14 @@ class KWQNewStuff; class KWordQuizApp : public KMainWindow { Q_OBJECT + TQ_OBJECT friend class KWordQuizView; public: /** construtor of KWordQuizApp, calls all init functions to create the application. */ - KWordQuizApp(TQWidget* parent=0, const char* name=0); + KWordQuizApp(TQWidget* tqparent=0, const char* name=0); ~KWordQuizApp(); /** opens a file specified by commandline option */ @@ -78,7 +79,7 @@ class KWordQuizApp : public KMainWindow bool saveAsFileName(); protected: - /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration + /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration * file */ void saveOptions(); @@ -172,7 +173,7 @@ class KWordQuizApp : public KMainWindow void slotVocabLanguages(); /** define vocabulary fonts */ void slotVocabFont(); - /** define keyboard layouts */ + /** define keyboard tqlayouts */ void slotVocabKeyboard(); /** define special characters */ void slotVocabChar(); @@ -226,9 +227,9 @@ class KWordQuizApp : public KMainWindow void slotContextMenuRequested(int, int, const TQPoint &); private: - WQQuiz::QuizType m_quizType; + WTQQuiz::QuizType m_quizType; - WQQuiz *m_quiz; + WTQQuiz *m_quiz; /** view is the main widget which represents your working area. The View * class should handle all events of the view widget. It is kept empty so @@ -238,7 +239,7 @@ class KWordQuizApp : public KMainWindow KWordQuizView *m_editView; FlashView *m_flashView; MultipleView *m_multipleView; - QAView *m_qaView; + TQAView *m_qaView; KWordQuizPrefs *m_prefDialog; @@ -309,14 +310,14 @@ class KWordQuizApp : public KMainWindow KAction* specialChar9; KDirWatch * m_dirWatch; - KWQNewStuff * m_newStuff; + KWTQNewStuff * m_newStuff; void updateMode(int m); - void updateSession(WQQuiz::QuizType qt); - void updateActions(WQQuiz::QuizType qt); + void updateSession(WTQQuiz::QuizType qt); + void updateActions(WTQQuiz::QuizType qt); void updateSpecialCharIcons(); TQString charIcon(const TQChar &); void openURL(const KURL& url); }; -#endif // KWORDQUIZ_H +#endif // KWORDTQUIZ_H diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp index f5309636..9325c5bb 100644 --- a/kwordquiz/src/kwordquizdoc.cpp +++ b/kwordquiz/src/kwordquizdoc.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// include files for Qt +// include files for TQt // include files for KDE #include @@ -33,15 +33,15 @@ #include "wqlwriter.h" #include "prefs.h" -//QList *KWordQuizDoc::pViewList = 0L; +//TQList *KWordQuizDoc::pViewList = 0L; //KWordQuizView *KWordQuizDoc::m_view; -KWordQuizDoc::KWordQuizDoc(TQWidget *parent, const char *name) : TQObject(parent, name) +KWordQuizDoc::KWordQuizDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name) { connect(KDirWatch::self(), TQT_SIGNAL(dirty(const TQString& )), this, TQT_SLOT(slotModifiedOnDisk(const TQString& ))); /* if(!pViewList) { - pViewList = new QList(); + pViewList = new TQList(); } pViewList->setAutoDelete(true);*/ @@ -73,14 +73,14 @@ const KURL& KWordQuizDoc::URL() const void KWordQuizDoc::slotUpdateAllViews(KWordQuizView *sender) { - //m_view->repaint(); + //m_view->tqrepaint(); /*KWordQuizView *w; if(pViewList) { for(w=pViewList->first(); w!=0; w=pViewList->next()) { if(w!=sender) - w->repaint(); + w->tqrepaint(); } }*/ @@ -105,7 +105,7 @@ bool KWordQuizDoc::saveModified() if(modified) { - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); int want_save = KMessageBox::warningYesNoCancel(win, i18n("The current file has been modified.\n" "Do you want to save it?"), @@ -162,7 +162,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index) TQFile file(tmpfile); if (!file.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("Cannot open file
    %1    ").arg(url.path())); + KMessageBox::error(0, i18n("Cannot open file
    %1    ").tqarg(url.path())); return false; } @@ -317,7 +317,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index) } g->setUpdatesEnabled(true); - g->repaintContents(); + g->tqrepaintContents(); } modified=false; if (append) @@ -333,7 +333,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/) if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("Cannot write to file
    %1    ") - .arg(url.path())); + .tqarg(url.path())); //if (filename == fname) // filename = ""; return false; @@ -347,7 +347,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/) { file.close(); KVTMLWriter writer(&file); - writer.addHeader(TQString("kwordquiz %1").arg(KWQ_VERSION), 2, g->numRows(), url.fileName()); + writer.addHeader(TQString("kwordquiz %1").tqarg(KWTQ_VERSION), 2, g->numRows(), url.fileName()); writer.addFirstItem(g->horizontalHeader()->label(0), g->columnWidth(0), g->text(w, 0), g->horizontalHeader()->label(1), g->columnWidth(1), g->text(w, 1)); w++; int r = g->numRows(); @@ -479,8 +479,8 @@ void KWordQuizDoc::slotModifiedOnDisk( const TQString & path) /*@todo this code doesn't work very well. Have to look in more detail on how Kate does it. if (doc_url.path() == path) { - TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").arg(doc_url.fileName()); - int i = KMessageBox::warningYesNoCancel(0, str + i18n("Do you want to reload the modified file? Data loss may occur."),TQString::null,i18n("Reload"),i18n("Do Not Reload")); + TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").tqarg(doc_url.fileName()); + int i = KMessageBox::warningYesNoCancel(0, str + i18n("Do you want to reload the modified file? Data loss may occur."),TQString(),i18n("Reload"),i18n("Do Not Reload")); if ( i == KMessageBox::Yes) openDocument(doc_url); } diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index b79879fc..724b8f61 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWORDQUIZDOC_H -#define KWORDQUIZDOC_H +#ifndef KWORDTQUIZDOC_H +#define KWORDTQUIZDOC_H #ifdef HAVE_CONFIG_H #include @@ -40,12 +40,13 @@ class KWordQuizView; * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 1.2 code generation */ -class KWordQuizDoc : public QObject +class KWordQuizDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Constructor for the fileclass of the application */ - KWordQuizDoc(TQWidget *parent, const char *name=0); + KWordQuizDoc(TQWidget *tqparent, const char *name=0); /** Destructor for the fileclass of the application */ ~KWordQuizDoc(); @@ -75,15 +76,15 @@ class KWordQuizDoc : public QObject void setURL(const KURL& url); public slots: - /** calls repaint() on all views connected to the document object and is called by the view by which the document has been changed. - * As this view normally repaints itself, it is excluded from the paintEvent. + /** calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed. + * As this view normally tqrepaints itself, it is excluded from the paintEvent. */ void slotUpdateAllViews(KWordQuizView *sender); void slotModifiedOnDisk(const TQString &); public: /** the list of the views currently connected to the document */ - //static QList *pViewList; + //static TQList *pViewList; //static KWordQuizView *m_view; private: /** the modified flag of the current document */ @@ -92,4 +93,4 @@ class KWordQuizDoc : public QObject KWordQuizView *m_view; }; -#endif // KWORDQUIZDOC_H +#endif // KWORDTQUIZDOC_H diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp index 61380e68..351c0fef 100644 --- a/kwordquiz/src/kwordquizprefs.cpp +++ b/kwordquiz/src/kwordquizprefs.cpp @@ -41,8 +41,8 @@ #include "kwordquiz.h" #include "dlgspecchar.h" -KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/, bool /*modal*/) - : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help, Ok, false) +KWordQuizPrefs::KWordQuizPrefs(TQWidget *tqparent, const char *name, KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/, bool /*modal*/) + : KConfigDialog(tqparent, name, config, dialogType, Default|Ok|Apply|Cancel|Help, Ok, false) { m_config = config; @@ -63,7 +63,7 @@ KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, KConfigSkele connect(m_prefCharacter->lstCharacters, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCharListSelectionChanged())); connect(m_prefCharacter->btnCharacter, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectSpecChar())); - KWordQuizApp *win=(KWordQuizApp *) parent; + KWordQuizApp *win=(KWordQuizApp *) tqparent; int i=0; KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters"); diff --git a/kwordquiz/src/kwordquizprefs.h b/kwordquiz/src/kwordquizprefs.h index 3afd5f9f..30287c99 100644 --- a/kwordquiz/src/kwordquizprefs.h +++ b/kwordquiz/src/kwordquizprefs.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWORDQUIZPREFS_H -#define KWORDQUIZPREFS_H +#ifndef KWORDTQUIZPREFS_H +#define KWORDTQUIZPREFS_H #include @@ -33,8 +33,9 @@ class DlgSpecChar; class KWordQuizPrefs : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: - KWordQuizPrefs(TQWidget *parent=0, const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList, + KWordQuizPrefs(TQWidget *tqparent=0, const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); protected slots: diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index 0096f591..6db0f3a9 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// include files for Qt +// include files for TQt #include #include #include @@ -37,12 +37,12 @@ #include "dlgrc.h" #include "dlgspecchar.h" -TQValueList *KWordQuizView::m_undoList = 0L; +TQValueList *KWordQuizView::m_undoList = 0L; -KWQTableItem::KWQTableItem(TQTable* table, EditType et, const TQString & text) : TQTableItem(table, et, text) +KWTQTableItem::KWTQTableItem(TQTable* table, EditType et, const TQString & text) : TQTableItem(table, et, text) {} -int KWQTableItem::alignment() const +int KWTQTableItem::tqalignment() const { bool num; bool ok1 = false; @@ -52,13 +52,13 @@ int KWQTableItem::alignment() const (void)text().toDouble(&ok2); num = ok1 || ok2; - return (num ? Qt::AlignRight : Qt::AlignAuto) | Qt::AlignVCenter; + return (num ? TQt::AlignRight : TQt::AlignAuto) | TQt::AlignVCenter; } -KWordQuizView::KWordQuizView(TQWidget *parent, const char *name) : TQTable(parent, name) +KWordQuizView::KWordQuizView(TQWidget *tqparent, const char *name) : TQTable(tqparent, name) { if(!m_undoList) - m_undoList = new TQValueList(); + m_undoList = new TQValueList(); setNumCols(2); setNumRows(50); @@ -77,7 +77,7 @@ KWordQuizView::~KWordQuizView() KWordQuizDoc *KWordQuizView::getDocument() const { - KWordQuizApp *theApp=(KWordQuizApp *) parentWidget(); + KWordQuizApp *theApp=(KWordQuizApp *) tqparentWidget(); return theApp->getDocument(); } @@ -211,12 +211,12 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type ) if (type == 2) { - painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName())); + painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName())); return; } painter.drawLine(marg, marg, marg + cw0 + cw1 + cw2 + cw3, marg); - painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName())); + painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName())); if (type == 1) { @@ -284,16 +284,16 @@ bool KWordQuizView::gridIsEmpty() return true; } -TQWidget * KWordQuizView::beginEdit( int row, int col, bool replace ) +TQWidget * KWordQuizView::beginEdit( int row, int col, bool tqreplace ) { m_currentText = text(row, col); - cellEditor = TQTable::beginEdit(row, col, replace); + cellEditor = TQTable::beginEdit(row, col, tqreplace); if (cellEditor) cellEditor->installEventFilter(this); return cellEditor; } -void KWordQuizView::endEdit( int row, int col, bool accept, bool replace ) +void KWordQuizView::endEdit( int row, int col, bool accept, bool tqreplace ) { // this code gets called after enter and arrow keys, now we // only process if editing really has been done @@ -302,7 +302,7 @@ void KWordQuizView::endEdit( int row, int col, bool accept, bool replace ) { if (((TQLineEdit *) cellWidget(row, col))->text() != m_currentText) addUndo(i18n("&Undo Entry")); - TQTable::endEdit(row, col, accept, replace); //this will destroy the cellWidget + TQTable::endEdit(row, col, accept, tqreplace); //this will destroy the cellWidget if (!text(row, col).isEmpty()) { TQTableItem* itm; @@ -356,7 +356,7 @@ void KWordQuizView::doEditUndo( ) } else { - WQUndo undo; + WTQUndo undo; if (m_undoList->count() > 0) { setUpdatesEnabled(false); @@ -472,7 +472,7 @@ void KWordQuizView::doEditPaste( ) br= br + sl.count() - 1; if (lc == 0) //left col? - if (sl[0].find("\t") < ((int) sl[0].length() - 1)) + if (sl[0].tqfind("\t") < ((int) sl[0].length() - 1)) rc = 1; //expand to second column; uint i = 0; @@ -555,7 +555,7 @@ void KWordQuizView::doEditInsert( ) addSelection(TQTableSelection(m_currentSel.topRow(), m_currentSel.leftCol(), m_currentSel.bottomRow(), m_currentSel.rightCol())); setCurrentCell(m_currentRow, m_currentCol); setUpdatesEnabled(true); - repaintContents(); + tqrepaintContents(); getDocument()->setModified(true); } @@ -666,7 +666,7 @@ void KWordQuizView::doEditMarkBlank( ) st = st.prepend(delim_start); st = st.append(delim_end); int ss = l->selectionStart(); - s = s.replace(ss, len, st); + s = s.tqreplace(ss, len, st); l->setText(s); l->setSelection(ss, st.length()); } @@ -691,7 +691,7 @@ void KWordQuizView::doEditUnmarkBlank( ) s.remove(delim_start); s.remove(delim_end); int ss = l->selectionStart(); - ls = ls.replace(ss, len, s); + ls = ls.tqreplace(ss, len, s); l->setText(ls); l->setSelection(ss, s.length()); } @@ -702,15 +702,15 @@ void KWordQuizView::doEditUnmarkBlank( ) s = l->text(); int cs = l->cursorPosition(); - int fr = s.findRev(delim_start, cs); + int fr = s.tqfindRev(delim_start, cs); if (fr > 0) { - s = s.replace(fr, 1, ""); + s = s.tqreplace(fr, 1, ""); cs--; } - int ff = s.find(delim_end, cs); + int ff = s.tqfind(delim_end, cs); if (ff > 0) - s = s.replace(ff, 1, ""); + s = s.tqreplace(ff, 1, ""); l->setText(s); l->setCursorPosition(cs); @@ -805,7 +805,7 @@ void KWordQuizView::doVocabShuffle( ) addSelection(TQTableSelection(m_currentSel.topRow(), m_currentSel.leftCol(), m_currentSel.bottomRow(), m_currentSel.rightCol())); setCurrentCell(m_currentRow, m_currentCol); setUpdatesEnabled(true); - repaintContents(); + tqrepaintContents(); getDocument()->setModified(true); } @@ -870,7 +870,7 @@ void KWordQuizView::slotSpecChar(const TQChar & c) TQString s = l->selectedText(); int len = s.length(); int ss = l->selectionStart(); - ls = ls.replace(ss, len, c); + ls = ls.tqreplace(ss, len, c); l->setText(ls); l->setSelection(ss, 1); } @@ -966,7 +966,7 @@ void KWordQuizView::addUndo( const TQString & caption ) m_undoList->remove(m_undoList->begin()); } - WQUndo* undo = new WQUndo(); + WTQUndo* undo = new WTQUndo(); undo->setText(caption); undo->setFont(font()); undo->setColWidth0(verticalHeader()->width()); @@ -1008,7 +1008,7 @@ void KWordQuizView::paintCell( TQPainter * p, int row, int col, const TQRect & c if (Prefs::enableBlanks()) if (!checkForBlank(text(row, col), true)) - g.setColor(TQColorGroup::Text, Qt::red); + g.setColor(TQColorGroup::Text, TQt::red); TQTable::paintCell (p, row, col, cr, selected, g ); } @@ -1051,7 +1051,7 @@ void KWordQuizView::slotCheckedAnswer( int i ) bool KWordQuizView::eventFilter( TQObject * o, TQEvent * e ) { - if (o == cellEditor) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(cellEditor)) { if ( e->type() == TQEvent::KeyPress ) { @@ -1075,7 +1075,7 @@ void KWordQuizView::setText(int row, int col, const TQString & text) itm->updateEditor(row, col); updateCell(row, col); } else { - KWQTableItem *i = new KWQTableItem(this, TQTableItem::OnTyping, text); + KWTQTableItem *i = new KWTQTableItem(this, TQTableItem::OnTyping, text); setItem(row, col, i); } } diff --git a/kwordquiz/src/kwordquizview.h b/kwordquiz/src/kwordquizview.h index 00289925..a15b496e 100644 --- a/kwordquiz/src/kwordquizview.h +++ b/kwordquiz/src/kwordquizview.h @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#ifndef KWORDQUIZVIEW_H -#define KWORDQUIZVIEW_H +#ifndef KWORDTQUIZVIEW_H +#define KWORDTQUIZVIEW_H #ifdef HAVE_CONFIG_H #include #endif -// include files for Qt +// include files for TQt #include #include @@ -41,30 +41,31 @@ class DlgSpecChar; @author Peter Hedlund */ -class KWQTableItem :public QTableItem +class KWTQTableItem :public TQTableItem { public: - KWQTableItem( TQTable* table, EditType et, const TQString & text ); - virtual int alignment() const; + KWTQTableItem( TQTable* table, EditType et, const TQString & text ); + virtual int tqalignment() const; }; -class KWordQuizView : public QTable +class KWordQuizView : public TQTable { Q_OBJECT + TQ_OBJECT public: /** Constructor for the main view */ - KWordQuizView(TQWidget *parent = 0, const char *name=0); + KWordQuizView(TQWidget *tqparent = 0, const char *name=0); /** Destructor for the main view */ ~KWordQuizView(); - /** returns a pointer to the document connected to the view instance. Mind that this method requires a KWordQuizApp instance as a parent + /** returns a pointer to the document connected to the view instance. Mind that this method requires a KWordQuizApp instance as a tqparent * widget to get to the window document pointer by calling the KWordQuizApp::getDocument() method. * * @see KWordQuizApp#getDocument */ KWordQuizDoc *getDocument() const; - //Reimplemented from QTable + //Reimplemented from TQTable void paintCell ( TQPainter * p, int row, int col, const TQRect & cr, bool selected, const TQColorGroup & cg ); void setFont( const TQFont &); void setText( int row, int col, const TQString &text ); @@ -89,8 +90,8 @@ class KWordQuizView : public QTable bool checkSyntax(bool all, bool blanks); void saveCurrentSelection(bool clear); protected: - TQWidget * beginEdit(int row, int col, bool replace); - void endEdit ( int row, int col, bool accept, bool replace ); + TQWidget * beginEdit(int row, int col, bool tqreplace); + void endEdit ( int row, int col, bool accept, bool tqreplace ); void activateNextCell(); void keyPressEvent( TQKeyEvent* ); bool eventFilter( TQObject*, TQEvent* ); @@ -113,11 +114,11 @@ class KWordQuizView : public QTable DlgSpecChar* dlgSpecChar; TQWidget * cellEditor; /** the list of the undo objects */ - static TQValueList *m_undoList; + static TQValueList *m_undoList; void doNewPage(TQPainter & painter, int res, int type); void doEndOfPage(TQPainter & painter, int vPos, int pageNum, int res, int type); bool checkForBlank(const TQString & s, bool blank); }; -#endif // KWORDQUIZVIEW_H +#endif // KWORDTQUIZVIEW_H diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index 05da32af..0d7fb1de 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -27,26 +27,26 @@ #include "kwqnewstuff.h" #include "prefs.h" -KWQNewStuff::KWQNewStuff(TQWidget *parent, const char *name) : TQObject(), KNewStuff("kdeedu/vocabulary", parent) +KWTQNewStuff::KWTQNewStuff(TQWidget *tqparent, const char *name) : TQObject(), KNewStuff("kdeedu/vocabulary", tqparent) { - m_app = (KWordQuizApp *) parent; + m_app = (KWordQuizApp *) tqparent; } -bool KWQNewStuff::install(const TQString & fileName) +bool KWTQNewStuff::install(const TQString & fileName) { m_app->slotFileOpenRecent(KURL(fileName)); return true; } -bool KWQNewStuff::createUploadFile(const TQString & fileName) +bool KWTQNewStuff::createUploadFile(const TQString & fileName) { return true; } -TQString KWQNewStuff::destinationPath(KNS::Entry * entry) +TQString KWTQNewStuff::destinationPath(KNS::Entry * entry) { if (entry) { @@ -67,28 +67,28 @@ TQString KWQNewStuff::destinationPath(KNS::Entry * entry) return file; } else - return TQString::null; + return TQString(); } -TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) +TQString KWTQNewStuff::downloadDestination(KNS::Entry * entry) { TQString file = destinationPath(entry); if (KStandardDirs::exists(file)) { - int result = KMessageBox::questionYesNo(parentWidget(), + int result = KMessageBox::questionYesNo(tqparentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") - .arg(file), - TQString::null, + .tqarg(file), + TQString(), i18n("Overwrite"),i18n("Do Not Overwrite")); if (result == KMessageBox::No) - return TQString::null; + return TQString(); } - KMessageBox::information(parentWidget(), + KMessageBox::information(tqparentWidget(), i18n("The selected file will now be downloaded and saved as\n'%1'.") - .arg(file), - TQString::null, + .tqarg(file), + TQString(), "NewStuffDownloadLocation"); return file; } diff --git a/kwordquiz/src/kwqnewstuff.h b/kwordquiz/src/kwqnewstuff.h index f3ae82c1..81d3c9e1 100644 --- a/kwordquiz/src/kwqnewstuff.h +++ b/kwordquiz/src/kwqnewstuff.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWQNEWSTUFF_H -#define KWQNEWSTUFF_H +#ifndef KWTQNEWSTUFF_H +#define KWTQNEWSTUFF_H #include @@ -25,11 +25,12 @@ class KWordQuizApp; /** @author Peter Hedlund */ -class KWQNewStuff : public TQObject, public KNewStuff +class KWTQNewStuff : public TQObject, public KNewStuff { Q_OBJECT + TQ_OBJECT public: - KWQNewStuff(TQWidget *parent = 0, const char *name = 0); + KWTQNewStuff(TQWidget *tqparent = 0, const char *name = 0); /** Installs a downloaded file according to the application's configuration. diff --git a/kwordquiz/src/main.cpp b/kwordquiz/src/main.cpp index 3de695a8..8f6ad60e 100644 --- a/kwordquiz/src/main.cpp +++ b/kwordquiz/src/main.cpp @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("kwordquiz", I18N_NOOP("KWordQuiz"), - KWQ_VERSION, + KWTQ_VERSION, description, KAboutData::License_GPL, "(c) 2003-2005, Peter Hedlund", diff --git a/kwordquiz/src/multipleview.cpp b/kwordquiz/src/multipleview.cpp index 3920c12a..e61097ef 100644 --- a/kwordquiz/src/multipleview.cpp +++ b/kwordquiz/src/multipleview.cpp @@ -27,17 +27,17 @@ #include "multipleview.h" #include "prefs.h" -MultipleView::MultipleView(TQWidget *parent, const char *name, WFlags f) - : MultipleViewBase(parent, name, f) +MultipleView::MultipleView(TQWidget *tqparent, const char *name, WFlags f) + : MultipleViewBase(tqparent, name, f) { - m_score = new WQScore(); + m_score = new WTQScore(); } MultipleView::~MultipleView() {} -void MultipleView::setQuiz(WQQuiz *quiz) +void MultipleView::setQuiz(WTQQuiz *quiz) { m_quiz = quiz; } @@ -77,7 +77,7 @@ void MultipleView::init() picYourAnswer->clear(); picCorrectAnswer->clear(); - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); win->actionCollection()->action("quiz_check")->setEnabled(true); win->actionCollection()->action("quiz_repeat_errors")->setEnabled(false); @@ -87,7 +87,7 @@ void MultipleView::init() void MultipleView::slotCheck() { - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); if (win->actionCollection()->action("quiz_check")->isEnabled()) { @@ -124,7 +124,7 @@ void MultipleView::slotCheck() lblCorrectHeader->clear(); picCorrectAnswer->clear(); lblCorrect->clear(); - m_score->countIncrement(WQScore::cdCorrect); + m_score->countIncrement(WTQScore::cdCorrect); updateScore(); KNotifyClient::event(winId(), "QuizCorrect", i18n("Your answer was correct!")); } @@ -138,7 +138,7 @@ void MultipleView::slotCheck() //lblCorrect->setFont(m_quiz->fontAnswer(m_question)); picCorrectAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblCorrectHeader->setText(i18n("Correct Answer")); - m_score->countIncrement(WQScore::cdError); + m_score->countIncrement(WTQScore::cdError); updateScore(); KNotifyClient::event(winId(), "QuizError", i18n("Your answer was incorrect.")); } @@ -253,7 +253,7 @@ void MultipleView::showQuestion(int i) lblQuestion -> setText(m_quiz ->question(i)); //lblQuestion -> setFont(m_quiz->fontQuestion(i)); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiLeftCol), KIcon::Panel)); lblAnswerLanguage -> setText(m_quiz ->langAnswer(i)); @@ -278,7 +278,7 @@ void MultipleView::showQuestion(int i) opt2->setChecked(false); opt3->setChecked(false); - picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiRightCol), KIcon::Panel)); } void MultipleView::slotApplySettings( ) diff --git a/kwordquiz/src/multipleview.h b/kwordquiz/src/multipleview.h index 7d4f06de..d2bfe843 100644 --- a/kwordquiz/src/multipleview.h +++ b/kwordquiz/src/multipleview.h @@ -29,12 +29,13 @@ class MultipleView : public MultipleViewBase { Q_OBJECT + TQ_OBJECT public: - MultipleView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); + MultipleView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); ~MultipleView(); - void setQuiz(WQQuiz *quiz); + void setQuiz(WTQQuiz *quiz); void init(); public slots: @@ -47,8 +48,8 @@ public slots: void slotApplySettings(); private: - WQQuiz *m_quiz; - WQScore *m_score; + WTQQuiz *m_quiz; + WTQScore *m_score; int m_question; int m_error; diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui index 5d85e7af..4ed3eb6e 100644 --- a/kwordquiz/src/multipleviewbase.ui +++ b/kwordquiz/src/multipleviewbase.ui @@ -1,10 +1,10 @@ MultipleViewBase - + MultipleViewBase - + 0 0 @@ -20,7 +20,7 @@ 0 - + 0 0 @@ -30,15 +30,15 @@ unnamed - + - layout58 + tqlayout58 unnamed - + lblQuestionLanguage @@ -50,7 +50,7 @@ 0 - + 0 32 @@ -64,7 +64,7 @@ Language 1 - + AlignTop @@ -74,7 +74,7 @@ Language or other identifier for the question - + lblQuestion @@ -95,7 +95,7 @@ false - + WordBreak|AlignTop @@ -105,7 +105,7 @@ The question - + picQuestion @@ -117,7 +117,7 @@ 0 - + 32 32 @@ -135,15 +135,15 @@ - + - layout60 + tqlayout60 unnamed - + picYourAnswer @@ -155,7 +155,7 @@ 0 - + 32 32 @@ -171,7 +171,7 @@ Your previous answer - + lblYourAnswerHeader @@ -183,7 +183,7 @@ 0 - + 0 32 @@ -197,7 +197,7 @@ Your Answer - + AlignTop @@ -207,7 +207,7 @@ Your answer to the previous question - + lblYourAnswer @@ -228,7 +228,7 @@ false - + WordBreak|AlignTop @@ -240,9 +240,9 @@ - + - layout13 + tqlayout13 @@ -265,15 +265,15 @@ Horizontal - + - layout12 + tqlayout12 unnamed - + lblScoreCount @@ -300,7 +300,7 @@ 00 - + AlignVCenter|AlignLeft @@ -310,7 +310,7 @@ The number of questions in the session - + picCorrect @@ -322,7 +322,7 @@ 0 - + 32 32 @@ -341,7 +341,7 @@ The number of questions answered correctly. May be shown as a percentage. - + lblScoreCorrect @@ -368,7 +368,7 @@ 00 - + AlignVCenter|AlignLeft @@ -378,7 +378,7 @@ The number of questions answered correctly. May be shown as a percentage. - + picError @@ -390,7 +390,7 @@ 0 - + 32 32 @@ -409,7 +409,7 @@ The number of questions answered incorrectly. May be shown as a percentage. - + picCount @@ -421,7 +421,7 @@ 0 - + 32 32 @@ -440,7 +440,7 @@ The number of questions in the session - + lblScoreAnswered @@ -467,7 +467,7 @@ 00 - + AlignVCenter|AlignLeft @@ -477,7 +477,7 @@ The number of questions already answered. May be shown as a percentage. - + picAnswered @@ -489,7 +489,7 @@ 0 - + 32 32 @@ -508,7 +508,7 @@ The number of questions already answered. May be shown as a percentage. - + lblScoreError @@ -535,7 +535,7 @@ 00 - + AlignVCenter|AlignLeft @@ -549,15 +549,15 @@ - + - layout61 + tqlayout61 unnamed - + lblCorrectHeader @@ -569,7 +569,7 @@ 0 - + 0 32 @@ -583,7 +583,7 @@ Correct Answer - + AlignTop @@ -593,7 +593,7 @@ The correct answer to the previous question - + lblCorrect @@ -614,7 +614,7 @@ false - + WordBreak|AlignTop @@ -624,7 +624,7 @@ The correct answer to the previous question - + picCorrectAnswer @@ -636,7 +636,7 @@ 0 - + 32 32 @@ -654,15 +654,15 @@ - + - layout63 + tqlayout63 unnamed - + picAnswer @@ -674,7 +674,7 @@ 0 - + 32 32 @@ -690,7 +690,7 @@ Your choices - + opt2 @@ -702,7 +702,7 @@ 0 - + 0 20 @@ -718,7 +718,7 @@ Three choices for the answer. One is correct. - + opt1 @@ -730,7 +730,7 @@ 0 - + 0 20 @@ -746,7 +746,7 @@ Three choices for the answer. One is correct. - + lblAnswerLanguage @@ -758,7 +758,7 @@ 0 - + 0 32 @@ -772,7 +772,7 @@ Language 2 - + AlignTop @@ -782,7 +782,7 @@ Language or other identifier for the answer - + opt3 @@ -794,7 +794,7 @@ 0 - + 0 20 @@ -812,15 +812,15 @@ - + - layout59 + tqlayout59 unnamed - + lblPreviousQuestionHeader @@ -832,7 +832,7 @@ 0 - + 0 32 @@ -846,7 +846,7 @@ Previous Question - + AlignTop @@ -856,7 +856,7 @@ The previous question - + lblPreviousQuestion @@ -877,7 +877,7 @@ false - + WordBreak|AlignTop @@ -890,7 +890,7 @@ The previous question - + picPrevious @@ -902,7 +902,7 @@ 0 - + 32 32 @@ -967,10 +967,10 @@ slotOpt3Clicked() - + slotOpt1Clicked() slotOpt2Clicked() slotOpt3Clicked() - - + + diff --git a/kwordquiz/src/paukerreader.cpp b/kwordquiz/src/paukerreader.cpp index df34a8d7..6d5027be 100644 --- a/kwordquiz/src/paukerreader.cpp +++ b/kwordquiz/src/paukerreader.cpp @@ -61,13 +61,13 @@ TQString PaukerDataItem::getText(const TQString &tagName) const return element.text(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } /*! diff --git a/kwordquiz/src/prefcardappearance.cpp b/kwordquiz/src/prefcardappearance.cpp index e2e08f2a..d5853fae 100644 --- a/kwordquiz/src/prefcardappearance.cpp +++ b/kwordquiz/src/prefcardappearance.cpp @@ -18,8 +18,8 @@ #include "prefcardappearance.h" -PrefCardAppearance::PrefCardAppearance(TQWidget *parent, const char *name) - : PrefCardAppearanceBase(parent, name) +PrefCardAppearance::PrefCardAppearance(TQWidget *tqparent, const char *name) + : PrefCardAppearanceBase(tqparent, name) { widgetStack->raiseWidget(frontStackPage); } diff --git a/kwordquiz/src/prefcardappearance.h b/kwordquiz/src/prefcardappearance.h index b152155c..9ee53337 100644 --- a/kwordquiz/src/prefcardappearance.h +++ b/kwordquiz/src/prefcardappearance.h @@ -20,8 +20,9 @@ class PrefCardAppearance : public PrefCardAppearanceBase { Q_OBJECT + TQ_OBJECT public: - PrefCardAppearance(TQWidget *parent = 0, const char *name = 0); + PrefCardAppearance(TQWidget *tqparent = 0, const char *name = 0); ~PrefCardAppearance(); public slots: diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 46762ed3..cd2bf98f 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -1,10 +1,10 @@ PrefCardAppearanceBase - + PrefCardAppearanceBase - + 0 0 @@ -22,7 +22,7 @@ 0 - + cardFrame @@ -34,13 +34,13 @@ 0 - + 175 100 - + 175 100 @@ -62,11 +62,11 @@ The flashcard - + textLabel - + 11 42 @@ -98,7 +98,7 @@ false - + WordBreak|AlignCenter @@ -112,7 +112,7 @@ line - + 11 33 @@ -155,11 +155,11 @@ The flashcard - + titleLabel - + 11 11 @@ -190,7 +190,7 @@ Front - + AlignTop @@ -215,7 +215,7 @@ Use to show the other side of the card - + textColorLabel @@ -234,7 +234,7 @@ textColorButton - + frameColorLabel @@ -253,7 +253,7 @@ - + fontLabel @@ -272,7 +272,7 @@ - + cardColorLabel @@ -291,7 +291,7 @@ - + widgetStack @@ -303,7 +303,7 @@ 0 - + backStackPage @@ -386,7 +386,7 @@ - + frontStackPage @@ -480,7 +480,7 @@ Expanding - + 400 20 @@ -534,15 +534,15 @@ kcfg_FrontCardColor kcfg_FrontFrameColor - + slotFlipButtonClicked() slotFontChanged(const QFont &) slotTextColorChanged(const QColor &) slotAboutToShowWidget(QWidget *) slotFrameColorChanged(const QColor &) slotCardColorChanged(const QColor &) - - + + kpushbutton.h kfontrequester.h diff --git a/kwordquiz/src/prefcharacter.cpp b/kwordquiz/src/prefcharacter.cpp index 7ef819d4..2e6d3f54 100644 --- a/kwordquiz/src/prefcharacter.cpp +++ b/kwordquiz/src/prefcharacter.cpp @@ -18,8 +18,8 @@ #include "prefcharacter.h" -PrefCharacter::PrefCharacter(TQWidget *parent, const char *name) - : PrefCharacterBase(parent, name) +PrefCharacter::PrefCharacter(TQWidget *tqparent, const char *name) + : PrefCharacterBase(tqparent, name) { } diff --git a/kwordquiz/src/prefcharacter.h b/kwordquiz/src/prefcharacter.h index eb46f2e3..8f3d0ec3 100644 --- a/kwordquiz/src/prefcharacter.h +++ b/kwordquiz/src/prefcharacter.h @@ -27,8 +27,9 @@ class PrefCharacter : public PrefCharacterBase { Q_OBJECT + TQ_OBJECT public: - PrefCharacter(TQWidget *parent = 0, const char *name = 0); + PrefCharacter(TQWidget *tqparent = 0, const char *name = 0); ~PrefCharacter(); }; diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui index 7202c6d9..73bf227c 100644 --- a/kwordquiz/src/prefcharacterbase.ui +++ b/kwordquiz/src/prefcharacterbase.ui @@ -1,10 +1,10 @@ PrefCharacterBase - + PrefCharacterBase - + 0 0 @@ -12,7 +12,7 @@ 356 - + 300 350 @@ -39,7 +39,7 @@ Horizontal - + lblShortCutInfo @@ -52,11 +52,11 @@ Note: Select Settings -> Configure Shortcuts... to change the shortcut associated with each action. - + WordBreak|AlignVCenter - + Action @@ -299,16 +299,16 @@ Expanding - + 220 30 - + - layout9 + tqlayout9 @@ -324,7 +324,7 @@ Fixed - + 30 50 @@ -355,14 +355,14 @@ Fixed - + 31 31 - + lblPreview @@ -382,7 +382,7 @@ A - + AlignBottom @@ -402,7 +402,7 @@ lstCharacters btnCharacter - + kpushbutton.h diff --git a/kwordquiz/src/prefeditor.cpp b/kwordquiz/src/prefeditor.cpp index 3fc69802..6610d5b8 100644 --- a/kwordquiz/src/prefeditor.cpp +++ b/kwordquiz/src/prefeditor.cpp @@ -19,8 +19,8 @@ #include "prefeditor.h" -PrefEditor::PrefEditor(TQWidget *parent, const char *name, WFlags f) - : PrefEditorBase(parent, name, f) +PrefEditor::PrefEditor(TQWidget *tqparent, const char *name, WFlags f) + : PrefEditorBase(tqparent, name, f) { } diff --git a/kwordquiz/src/prefeditor.h b/kwordquiz/src/prefeditor.h index c84b3364..a88c1892 100644 --- a/kwordquiz/src/prefeditor.h +++ b/kwordquiz/src/prefeditor.h @@ -27,9 +27,10 @@ class PrefEditor : public PrefEditorBase { Q_OBJECT + TQ_OBJECT public: - PrefEditor(TQWidget *parent, const char *name=0, WFlags f=0); + PrefEditor(TQWidget *tqparent, const char *name=0, WFlags f=0); ~PrefEditor(); }; diff --git a/kwordquiz/src/prefeditorbase.ui b/kwordquiz/src/prefeditorbase.ui index 71ef99ed..beef0b99 100644 --- a/kwordquiz/src/prefeditorbase.ui +++ b/kwordquiz/src/prefeditorbase.ui @@ -1,10 +1,10 @@ PrefEditorBase - + PrefEditorBase - + 0 0 @@ -12,7 +12,7 @@ 256 - + 250 250 @@ -28,7 +28,7 @@ 0 - + kcfg_EnterMove @@ -45,7 +45,7 @@ unnamed - + optDown @@ -59,7 +59,7 @@ Select if the next cell below should become active when pressing Enter. - + optRight @@ -73,7 +73,7 @@ Select if the next cell to the right should become active when pressing Enter - + optNoMove @@ -89,7 +89,7 @@ - + kcfg_EnableBlanks @@ -113,7 +113,7 @@ Expanding - + 41 81 @@ -122,5 +122,5 @@ - + diff --git a/kwordquiz/src/prefquiz.cpp b/kwordquiz/src/prefquiz.cpp index cfb07aae..a57b0816 100644 --- a/kwordquiz/src/prefquiz.cpp +++ b/kwordquiz/src/prefquiz.cpp @@ -24,8 +24,8 @@ #include "prefquiz.h" -PrefQuiz::PrefQuiz(TQWidget *parent, const char *name, WFlags f) - : PrefQuizBase(parent, name, f) +PrefQuiz::PrefQuiz(TQWidget *tqparent, const char *name, WFlags f) + : PrefQuizBase(tqparent, name, f) { kcfg_FlipDelay -> setEnabled(kcfg_AutoFlip->isChecked()); kcfg_KeepDiscard->setEnabled(kcfg_AutoFlip->isChecked()); diff --git a/kwordquiz/src/prefquiz.h b/kwordquiz/src/prefquiz.h index 9d7174c4..59a4c307 100644 --- a/kwordquiz/src/prefquiz.h +++ b/kwordquiz/src/prefquiz.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef PREFQUIZ_H -#define PREFQUIZ_H +#ifndef PREFTQUIZ_H +#define PREFTQUIZ_H #include "prefquizbase.h" @@ -27,9 +27,10 @@ class PrefQuiz : public PrefQuizBase { Q_OBJECT + TQ_OBJECT public: - PrefQuiz(TQWidget *parent, const char *name=0, WFlags f=0); + PrefQuiz(TQWidget *tqparent, const char *name=0, WFlags f=0); ~PrefQuiz(); }; diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui index 82cdf626..ebe2fbb8 100644 --- a/kwordquiz/src/prefquizbase.ui +++ b/kwordquiz/src/prefquizbase.ui @@ -1,10 +1,10 @@ PrefQuizBase - + PrefQuizBase - + 0 0 @@ -12,7 +12,7 @@ 356 - + 300 350 @@ -28,7 +28,7 @@ 0 - + grpMultiple @@ -42,7 +42,7 @@ unnamed - + kcfg_AutoCheck @@ -58,7 +58,7 @@ - + grpQA @@ -72,7 +72,7 @@ unnamed - + kcfg_HintError @@ -88,7 +88,7 @@ - + grpScore @@ -102,7 +102,7 @@ unnamed - + kcfg_Percent @@ -128,14 +128,14 @@ Expanding - + 21 31 - + KeepDiscard @@ -162,14 +162,14 @@ Fixed - + 20 70 - + lblSeconds @@ -199,7 +199,7 @@ Delay in seconds to flip card - + kcfg_KeepDiscard @@ -219,7 +219,7 @@ 0 - + optCorrect @@ -233,7 +233,7 @@ Select if the previous card should be counted as correct when moving to the next card - + optError @@ -249,7 +249,7 @@ - + kcfg_AutoFlip @@ -284,10 +284,10 @@ setEnabled(bool) - + slotAutoFlipClicked() - - + + knuminput.h knuminput.h diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp index 4660df9f..b67e176b 100644 --- a/kwordquiz/src/qaview.cpp +++ b/kwordquiz/src/qaview.cpp @@ -63,23 +63,23 @@ TQString highlightError(const TQString & c, const TQString & e) } -QAView::QAView(TQWidget *parent, const char *name, WFlags f):QAViewBase(parent, name, f) +TQAView::TQAView(TQWidget *tqparent, const char *name, WFlags f):QAViewBase(tqparent, name, f) { - m_score = new WQScore(); + m_score = new WTQScore(); } -QAView::~QAView() +TQAView::~TQAView() { delete txtAnswer; //Fixes #122110 on PCLOS and Ubuntu } -void QAView::setQuiz(WQQuiz *quiz) +void TQAView::setQuiz(WTQQuiz *quiz) { m_quiz = quiz; } -void QAView::init() +void TQAView::init() { m_score -> setQuestionCount(m_quiz->questionCount()); m_score -> setAsPercent(Prefs::percent()); @@ -116,7 +116,7 @@ void QAView::init() picYourAnswer->clear(); picCorrectAnswer->clear(); - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); win->actionCollection()->action("quiz_check")->setEnabled(true); win->actionCollection()->action("qa_hint")->setEnabled(true); win->actionCollection()->action("quiz_repeat_errors")->setEnabled(false); @@ -127,9 +127,9 @@ void QAView::init() txtAnswer->setFocus(); } -void QAView::slotCheck() +void TQAView::slotCheck() { - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); if (win->actionCollection()->action("quiz_check")->isEnabled()) { bool fIsCorrect; @@ -155,7 +155,7 @@ void QAView::slotCheck() lblCorrectHeader->clear(); picCorrectAnswer->clear(); lblCorrect->clear(); - m_score->countIncrement(WQScore::cdCorrect); + m_score->countIncrement(WTQScore::cdCorrect); updateScore(); KNotifyClient::event(winId(), "QuizCorrect", i18n("Your answer was correct!")); } @@ -168,7 +168,7 @@ void QAView::slotCheck() lblCorrect->setText(m_quiz->answer(m_question)); picCorrectAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblCorrectHeader->setText(i18n("Correct Answer")); - m_score->countIncrement(WQScore::cdError); + m_score->countIncrement(WTQScore::cdError); updateScore(); KNotifyClient::event(winId(), "QuizError", i18n("Your answer was incorrect.")); } @@ -200,7 +200,7 @@ void QAView::slotCheck() } } -void QAView::slotHint() +void TQAView::slotHint() { TQString answer = txtAnswer->text(); TQString correctAnswer = m_quiz->hint(m_question); @@ -228,19 +228,19 @@ void QAView::slotHint() m_hintUsed = true; } -void QAView::slotRestart() +void TQAView::slotRestart() { m_quiz->activateBaseList(); init(); } -void QAView::slotRepeat() +void TQAView::slotRepeat() { m_quiz->activateErrorList(); init(); } -void QAView::updateScore() +void TQAView::updateScore() { TQString s; s = s.setNum(m_quiz->questionCount(), 10); @@ -265,16 +265,16 @@ void QAView::updateScore() /*! - \fn QAView::showQuestion(int i) + \fn TQAView::showQuestion(int i) */ -void QAView::showQuestion(int i) +void TQAView::showQuestion(int i) { //m_quiz->setColumn(i); lblQuestionLanguage -> setText(m_quiz ->langQuestion(i)); lblQuestion -> setText(m_quiz ->question(i)); //lblQuestion -> setFont(m_quiz->fontQuestion(i)); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiLeftCol), KIcon::Panel)); lblAnswerLanguage -> setText(m_quiz ->langAnswer(i)); @@ -290,18 +290,18 @@ void QAView::showQuestion(int i) //txtAnswer->setFont(m_quiz->fontAnswer(i)); txtAnswer -> setText(""); - picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiRightCol), KIcon::Panel)); - //@todo handle keyboard layouts + //@todo handle keyboard tqlayouts } -void QAView::slotApplySettings( ) +void TQAView::slotApplySettings( ) { m_score ->setAsPercent(Prefs::percent()); updateScore(); } -void QAView::slotSpecChar( const TQChar & c) +void TQAView::slotSpecChar( const TQChar & c) { if (txtAnswer->hasFocus()) { @@ -311,7 +311,7 @@ void QAView::slotSpecChar( const TQChar & c) TQString s = txtAnswer->selectedText(); int len = s.length(); int ss = txtAnswer->selectionStart(); - ls = ls.replace(ss, len, c); + ls = ls.tqreplace(ss, len, c); txtAnswer->setText(ls); txtAnswer->setSelection(ss, 1); } diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h index f18567ec..ecd7cfff 100644 --- a/kwordquiz/src/qaview.h +++ b/kwordquiz/src/qaview.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QAVIEW_H -#define QAVIEW_H +#ifndef TQAVIEW_H +#define TQAVIEW_H #include @@ -29,15 +29,16 @@ /** @author Peter Hedlund */ -class QAView : public QAViewBase +class TQAView : public QAViewBase { Q_OBJECT + TQ_OBJECT public: - QAView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); + TQAView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); - ~QAView(); + ~TQAView(); - void setQuiz(WQQuiz *quiz); + void setQuiz(WTQQuiz *quiz); void init(); public slots: @@ -49,8 +50,8 @@ public slots: void slotSpecChar(const TQChar &); private: - WQQuiz *m_quiz; - WQScore *m_score; + WTQQuiz *m_quiz; + WTQScore *m_score; KAction* actCheck; KAction* actHint; diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index 96baa0cc..9675b560 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -1,10 +1,10 @@ QAViewBase - + QAViewBase - + 0 0 @@ -30,15 +30,15 @@ Horizontal - + - layout23 + tqlayout23 unnamed - + picError @@ -50,7 +50,7 @@ 0 - + 32 32 @@ -69,7 +69,7 @@ The number of questions answered incorrectly. May be shown as a percentage. - + lblScoreError @@ -88,7 +88,7 @@ 00 - + AlignVCenter|AlignLeft @@ -98,7 +98,7 @@ The number of questions answered incorrectly. May be shown as a percentage. - + picAnswered @@ -110,7 +110,7 @@ 0 - + 32 32 @@ -129,7 +129,7 @@ The number of questions already answered. May be shown as a percentage. - + picCount @@ -141,7 +141,7 @@ 0 - + 32 32 @@ -160,7 +160,7 @@ The number of questions in the session - + lblScoreCount @@ -179,7 +179,7 @@ 00 - + AlignVCenter|AlignLeft @@ -189,7 +189,7 @@ The number of questions in the session - + lblScoreCorrect @@ -208,7 +208,7 @@ 00 - + AlignVCenter|AlignLeft @@ -218,7 +218,7 @@ The number of questions answered correctly. May be shown as a percentage. - + lblScoreAnswered @@ -237,7 +237,7 @@ 00 - + AlignVCenter|AlignLeft @@ -247,7 +247,7 @@ The number of questions already answered. May be shown as a percentage. - + picCorrect @@ -259,7 +259,7 @@ 0 - + 32 32 @@ -280,15 +280,15 @@ - + - layout51 + tqlayout51 unnamed - + lblPreviousQuestionHeader @@ -300,7 +300,7 @@ 0 - + 0 32 @@ -314,7 +314,7 @@ Previous Question - + AlignTop @@ -324,7 +324,7 @@ The previous question - + lblPreviousQuestion @@ -345,7 +345,7 @@ false - + WordBreak|AlignTop @@ -355,7 +355,7 @@ The previous question - + picPrevious @@ -367,7 +367,7 @@ 0 - + 32 32 @@ -385,15 +385,15 @@ - + - layout52 + tqlayout52 unnamed - + lblYourAnswerHeader @@ -405,7 +405,7 @@ 0 - + 0 32 @@ -419,7 +419,7 @@ Your Answer - + AlignTop @@ -429,7 +429,7 @@ Your answer to the previous question - + lblYourAnswer @@ -450,7 +450,7 @@ false - + WordBreak|AlignTop @@ -460,7 +460,7 @@ Your answer to the previous question - + picYourAnswer @@ -472,7 +472,7 @@ 0 - + 32 32 @@ -490,15 +490,15 @@ - + - layout53 + tqlayout53 unnamed - + picCorrectAnswer @@ -510,7 +510,7 @@ 0 - + 32 32 @@ -526,7 +526,7 @@ Previous correct answer - + lblCorrectHeader @@ -538,7 +538,7 @@ 0 - + 0 32 @@ -552,7 +552,7 @@ Correct Answer - + AlignTop @@ -562,7 +562,7 @@ The correct answer to the previous question - + lblCorrect @@ -583,7 +583,7 @@ false - + WordBreak|AlignTop @@ -595,15 +595,15 @@ - + - layout54 + tqlayout54 unnamed - + lblAnswerBlank @@ -624,7 +624,7 @@ false - + WordBreak|AlignTop @@ -646,7 +646,7 @@ 0 - + AlignAuto @@ -656,7 +656,7 @@ Type the answer to the question - + lblAnswerLanguage @@ -668,7 +668,7 @@ 0 - + 0 32 @@ -682,7 +682,7 @@ Language 2 - + AlignTop @@ -692,7 +692,7 @@ Language or other identifier for the answer - + picAnswer @@ -704,7 +704,7 @@ 0 - + 32 32 @@ -736,15 +736,15 @@ Horizontal - + - layout57 + tqlayout57 unnamed - + lblQuestionLanguage @@ -756,7 +756,7 @@ 0 - + 0 20 @@ -770,7 +770,7 @@ Language 1 - + AlignTop @@ -780,7 +780,7 @@ Language or other identifier for the question - + picQuestion @@ -792,7 +792,7 @@ 0 - + 32 32 @@ -808,7 +808,7 @@ The question - + lblQuestion @@ -829,7 +829,7 @@ false - + WordBreak|AlignTop @@ -862,8 +862,8 @@ slotCheck() - + slotCheck() - - + + diff --git a/kwordquiz/src/version.h b/kwordquiz/src/version.h index d202ba2e..7a33f3d2 100644 --- a/kwordquiz/src/version.h +++ b/kwordquiz/src/version.h @@ -1 +1 @@ -#define KWQ_VERSION "0.8.1" +#define KWTQ_VERSION "0.8.1" diff --git a/kwordquiz/src/wqlistitem.cpp b/kwordquiz/src/wqlistitem.cpp index 597337f8..0e4cf94c 100644 --- a/kwordquiz/src/wqlistitem.cpp +++ b/kwordquiz/src/wqlistitem.cpp @@ -18,37 +18,37 @@ #include "wqlistitem.h" -WQListItem::WQListItem() +WTQListItem::WTQListItem() { } -WQListItem::~WQListItem() +WTQListItem::~WTQListItem() { } -void WQListItem::setQuestion(int i) +void WTQListItem::setQuestion(int i) { m_question = i; } -void WQListItem::setCorrect(int c) +void WTQListItem::setCorrect(int c) { m_correct = c; } -void WQListItem::setOneOp(int i) +void WTQListItem::setOneOp(int i) { m_oneOp = i; } -void WQListItem::setTwoOp(int i) +void WTQListItem::setTwoOp(int i) { m_twoOp = i; } -void WQListItem::setThreeOp(int i) +void WTQListItem::setThreeOp(int i) { m_threeOp = i; } diff --git a/kwordquiz/src/wqlistitem.h b/kwordquiz/src/wqlistitem.h index 8924aa0c..6689c37b 100644 --- a/kwordquiz/src/wqlistitem.h +++ b/kwordquiz/src/wqlistitem.h @@ -16,19 +16,19 @@ Boston, MA 02110-1301, USA. */ -#ifndef WQLISTITEM_H -#define WQLISTITEM_H +#ifndef WTQLISTITEM_H +#define WTQLISTITEM_H /** @author Peter Hedlund */ -class WQListItem{ +class WTQListItem{ public: - WQListItem(); + WTQListItem(); - ~WQListItem(); + ~WTQListItem(); void setQuestion(int i); void setCorrect(int c); void setOneOp(int i); diff --git a/kwordquiz/src/wqlreader.cpp b/kwordquiz/src/wqlreader.cpp index 7eef97c7..915fceb9 100644 --- a/kwordquiz/src/wqlreader.cpp +++ b/kwordquiz/src/wqlreader.cpp @@ -75,18 +75,18 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName) while (ts.readLine() != "[Font Info]"); s = ts.readLine(); - int p = s.find("=", 0); + int p = s.tqfind("=", 0); TQString fam = s.right(s.length() - (p + 1)); fam = fam.mid(1, fam.length() - 2); //g->font().setFamily(s); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); int ps = s.toInt(0); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); int b = 0; if (s == "1") @@ -95,7 +95,7 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName) } s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); bool it = (s == "1"); @@ -103,52 +103,52 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName) while (ts.readLine() != "[Character Info]"); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); m_specialCharacters = s.right(s.length() - (p + 1)); while (ts.readLine() != "[Grid Info]"); ts.readLine(); //skip value for width of row headers s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_colWidth1 = s.toInt(0, 10); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_colWidth2 = s.toInt(0, 10); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_numRows = (s.toInt(0, 10) - 1); //We need to reduce by one since the header is not included // Selection s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_topLeft =s.toInt(0, 10) - 1; s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_topRight =s.toInt(0, 10) - 1; s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_bottomLeft =s.toInt(0, 10) - 1; s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_bottomRight =s.toInt(0, 10) - 1 ; while (ts.readLine() != "[Vocabulary]"); s = ts.readLine(); - p = s.find(" [", 0); + p = s.tqfind(" [", 0); s = s.left(p); s = s.stripWhiteSpace(); m_language1 = s; @@ -157,7 +157,7 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName) while (!s.isNull()) { s = ts.readLine(); - p = s.find("[", 0); + p = s.tqfind("[", 0); TQString r = s.mid(p + 1, 10); int h = r.toInt(0, 10); s = s.left(p); diff --git a/kwordquiz/src/wqlreader.h b/kwordquiz/src/wqlreader.h index 79096956..fe8f63a2 100644 --- a/kwordquiz/src/wqlreader.h +++ b/kwordquiz/src/wqlreader.h @@ -13,8 +13,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef WQLREADER_H -#define WQLREADER_H +#ifndef WTQLREADER_H +#define WTQLREADER_H /** @author Peter Hedlund diff --git a/kwordquiz/src/wqlwriter.cpp b/kwordquiz/src/wqlwriter.cpp index e5314201..579561ff 100644 --- a/kwordquiz/src/wqlwriter.cpp +++ b/kwordquiz/src/wqlwriter.cpp @@ -22,7 +22,7 @@ WqlWriter::WqlWriter(TQFile *file) outputFile = file; if(outputFile->open(IO_WriteOnly)) { - outputStream.setDevice(outputFile); + outputStream.setDevice(TQT_TQIODEVICE(outputFile)); outputStream.setEncoding(TQTextStream::Latin1); outputStream << "WordQuiz" << winendl; @@ -35,16 +35,16 @@ void WqlWriter::writeFont( const TQFont & font ) outputStream << "[Font Info]" << winendl; outputStream << "FontName1=\"" << font.family() << "\"" << winendl; outputStream << "FontSize1=" << TQString::number(font.pointSize()) << winendl; - outputStream << TQString("FontBold1=%1").arg(font.bold() ? "1" : "0") < #include diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp index e9baebcc..bcc721b5 100644 --- a/kwordquiz/src/wqprintdialogpage.cpp +++ b/kwordquiz/src/wqprintdialogpage.cpp @@ -25,8 +25,8 @@ #include "wqprintdialogpage.h" -WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) - : KPrintDialogPage( parent, name ) +WTQPrintDialogPage::WTQPrintDialogPage(TQWidget *tqparent, const char *name ) + : KPrintDialogPage( tqparent, name ) { setTitle(i18n("Vocabulary Options")); @@ -34,10 +34,10 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) g = new TQButtonGroup(i18n("Select Type of Printout"), this ); g->setColumnLayout(0, Qt::Vertical ); - g->layout()->setSpacing( 6 ); - g->layout()->setMargin( 11 ); - TQGridLayout * v = new TQGridLayout( g->layout() ); - v->setAlignment( Qt::AlignTop ); + g->tqlayout()->setSpacing( 6 ); + g->tqlayout()->setMargin( 11 ); + TQGridLayout * v = new TQGridLayout( g->tqlayout() ); + v->tqsetAlignment( TQt::AlignTop ); rb0 = new TQRadioButton(i18n("Vocabulary &list"), g ); v->addWidget( rb0, 0, 0 ); @@ -54,16 +54,16 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) } -WQPrintDialogPage::~WQPrintDialogPage() +WTQPrintDialogPage::~WTQPrintDialogPage() { } -void WQPrintDialogPage::getOptions(TQMap< TQString, TQString > & opts, bool incldef) +void WTQPrintDialogPage::getOptions(TQMap< TQString, TQString > & opts, bool incldef) { opts[ "kde-kwordquiz-type" ] = TQString::number(g->selectedId()); } -void WQPrintDialogPage::setOptions(const TQMap< TQString, TQString > & opts ) +void WTQPrintDialogPage::setOptions(const TQMap< TQString, TQString > & opts ) { TQString type = opts[ "kde-kwordquiz-type" ]; switch (type.toInt()) @@ -74,7 +74,7 @@ void WQPrintDialogPage::setOptions(const TQMap< TQString, TQString > & opts ) } } -bool WQPrintDialogPage::isValid(const TQString & msg ) +bool WTQPrintDialogPage::isValid(const TQString & msg ) { return true; } diff --git a/kwordquiz/src/wqprintdialogpage.h b/kwordquiz/src/wqprintdialogpage.h index 3a52aa6e..ffb10c27 100644 --- a/kwordquiz/src/wqprintdialogpage.h +++ b/kwordquiz/src/wqprintdialogpage.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef WQPRINTDIALOGPAGE_H -#define WQPRINTDIALOGPAGE_H +#ifndef WTQPRINTDIALOGPAGE_H +#define WTQPRINTDIALOGPAGE_H #include @@ -27,13 +27,14 @@ Print dialog page to provide specific print options for KWordQuiz @author Peter Hedlund */ -class WQPrintDialogPage : public KPrintDialogPage +class WTQPrintDialogPage : public KPrintDialogPage { Q_OBJECT + TQ_OBJECT public: - WQPrintDialogPage( TQWidget *parent = 0, const char *name = 0 ); + WTQPrintDialogPage( TQWidget *tqparent = 0, const char *name = 0 ); - ~WQPrintDialogPage(); + ~WTQPrintDialogPage(); //reimplement virtual functions void getOptions(TQMap& opts, bool incldef = false); void setOptions(const TQMap& opts); diff --git a/kwordquiz/src/wqquiz.cpp b/kwordquiz/src/wqquiz.cpp index 23600567..1ba46076 100644 --- a/kwordquiz/src/wqquiz.cpp +++ b/kwordquiz/src/wqquiz.cpp @@ -23,20 +23,20 @@ #include "wqquiz.h" #include "prefs.h" -WQQuiz::WQQuiz(KWordQuizView * parent, const char *name) : TQObject(parent, name) +WTQQuiz::WTQQuiz(KWordQuizView * tqparent, const char *name) : TQObject(tqparent, name) { - m_table = parent; + m_table = tqparent; m_list.clear(); m_errorList.clear(); m_quizList.clear(); } -void WQQuiz::activateErrorList() +void WTQQuiz::activateErrorList() { m_list.clear(); - WQListItem l; + WTQListItem l; QuizList::iterator it; for ( it = m_errorList.begin(); it != m_errorList.end(); ++it ) @@ -47,7 +47,7 @@ void WQQuiz::activateErrorList() } -void WQQuiz::activateBaseList() +void WTQQuiz::activateBaseList() { m_list.clear(); @@ -64,7 +64,7 @@ void WQQuiz::activateBaseList() } -void WQQuiz::addToList(int aCol, int bCol) +void WTQQuiz::addToList(int aCol, int bCol) { //build a list of row numbers containing text in both columns @@ -85,8 +85,8 @@ void WQQuiz::addToList(int aCol, int bCol) IntList::ConstIterator it; for ( it = tempList.begin(); it != tempList.end(); ++it ) { - WQListItem *li; - li = new WQListItem(); + WTQListItem *li; + li = new WTQListItem(); li->setQuestion(aCol); li->setCorrect(1); li->setOneOp(*it); @@ -114,7 +114,7 @@ void WQQuiz::addToList(int aCol, int bCol) } -bool WQQuiz::init() +bool WTQQuiz::init() { bool result = false; @@ -196,7 +196,7 @@ bool WQQuiz::init() return true; } -void WQQuiz::listRandom() +void WTQQuiz::listRandom() { TQPtrList list; @@ -216,10 +216,10 @@ void WQQuiz::listRandom() m_quizList.append(items[i]); } -bool WQQuiz::checkAnswer(int i, const TQString & a) +bool WTQQuiz::checkAnswer(int i, const TQString & a) { bool result = false; - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; int j; if (li.question() == 0) { @@ -239,12 +239,12 @@ bool WQQuiz::checkAnswer(int i, const TQString & a) if (TQString(m_correctBlank).length() > 0) { TQStringList la, ls; - if (ans.find(";") > 0) + if (ans.tqfind(";") > 0) ls = TQStringList::split(";", ans); else ls.append(ans); - if (m_correctBlank.find(";") > 0) + if (m_correctBlank.tqfind(";") > 0) la = TQStringList::split(";", m_correctBlank); else la.append(m_correctBlank); @@ -292,11 +292,11 @@ bool WQQuiz::checkAnswer(int i, const TQString & a) return result; } -TQStringList WQQuiz::multiOptions(int i) +TQStringList WTQQuiz::multiOptions(int i) { TQString *s; TQStringList Result; - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; typedef TQPtrList LS; LS *ls; @@ -347,10 +347,10 @@ TQStringList WQQuiz::multiOptions(int i) return Result; } -TQString WQQuiz::quizIcon(int i, QuizIcon ico) +TQString WTQQuiz::quizIcon(int i, QuizIcon ico) { TQString s; - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; if (ico == qiLeftCol) { if (li.question() == 0) @@ -369,7 +369,7 @@ TQString WQQuiz::quizIcon(int i, QuizIcon ico) return s; } -TQString WQQuiz::yourAnswer(int i, const TQString & s) +TQString WTQQuiz::yourAnswer(int i, const TQString & s) { TQString result =""; @@ -377,17 +377,17 @@ TQString WQQuiz::yourAnswer(int i, const TQString & s) { TQStringList ls; - if (s.find(";") > 0) + if (s.tqfind(";") > 0) ls = TQStringList::split(";", s, true); else ls.append(s); - result = m_answerBlank.replace("..........", ""); + result = m_answerBlank.tqreplace("..........", ""); int offset = 0, counter = 0; while (offset >= 0) { - offset = result.find("", offset); + offset = result.tqfind("", offset); if (offset >= 0) { result.insert(offset + 3, ls[counter]); @@ -405,7 +405,7 @@ TQString WQQuiz::yourAnswer(int i, const TQString & s) return result; } -TQString WQQuiz::hint(int i) +TQString WTQQuiz::hint(int i) { if (TQString(m_correctBlank).length() > 0) { @@ -417,20 +417,20 @@ TQString WQQuiz::hint(int i) } } -void WQQuiz::setQuizType(QuizType qt) +void WTQQuiz::setQuizType(QuizType qt) { m_quizType = qt; } -void WQQuiz::setQuizMode(int qm) +void WTQQuiz::setQuizMode(int qm) { m_quizMode = qm; } -TQString WQQuiz::question(int i) +TQString WTQQuiz::question(int i) { - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; TQString s = m_table->text(li.oneOp(), li.question()); if (Prefs::enableBlanks()) { @@ -439,7 +439,7 @@ TQString WQQuiz::question(int i) } if (m_quizType != qtFlash && i > 0) { - WQListItem li2 = m_list[i - 1]; + WTQListItem li2 = m_list[i - 1]; emit checkingAnswer(li2.oneOp()); } else @@ -448,7 +448,7 @@ TQString WQQuiz::question(int i) return s; } -TQString WQQuiz::blankAnswer(int i) +TQString WTQQuiz::blankAnswer(int i) { TQString r = ""; @@ -458,7 +458,7 @@ TQString WQQuiz::blankAnswer(int i) if (m_quizType == qtQA && Prefs::enableBlanks()) { - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; int j; if (li.question() == 0) { @@ -474,7 +474,7 @@ TQString WQQuiz::blankAnswer(int i) rx.setMinimal(true); rx.setPattern("\\[.*\\]"); - r.replace(rx, ".........."); + r.tqreplace(rx, ".........."); if (r != tTemp) { @@ -486,9 +486,9 @@ TQString WQQuiz::blankAnswer(int i) if (offset >= 0) { if (m_correctBlank.length() > 0) - m_correctBlank = m_correctBlank + ";" + " " + tTemp.mid(offset + 1, tTemp.find(']', offset) - offset - 1); + m_correctBlank = m_correctBlank + ";" + " " + tTemp.mid(offset + 1, tTemp.tqfind(']', offset) - offset - 1); else - m_correctBlank = tTemp.mid(offset + 1, tTemp.find(']', offset) - offset - 1); + m_correctBlank = tTemp.mid(offset + 1, tTemp.tqfind(']', offset) - offset - 1); offset++; } } @@ -497,10 +497,10 @@ TQString WQQuiz::blankAnswer(int i) return m_answerBlank; } -TQString WQQuiz::answer(int i) +TQString WTQQuiz::answer(int i) { TQString s; - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; int j; if (li.question() == 0) { @@ -517,8 +517,8 @@ TQString WQQuiz::answer(int i) s = m_table->text(li.oneOp(), j); if (Prefs::enableBlanks()) { - s.replace("[", ""); - s.replace("]", ""); + s.tqreplace("[", ""); + s.tqreplace("]", ""); s.prepend(""); s.append(""); } @@ -535,16 +535,16 @@ TQString WQQuiz::answer(int i) return s; } -TQString WQQuiz::langQuestion(int i) +TQString WTQQuiz::langQuestion(int i) { - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; return m_table->horizontalHeader()->label(li.question()); } -TQString WQQuiz::langAnswer(int i) +TQString WTQQuiz::langAnswer(int i) { - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; int j; if (li.question() == 0) @@ -559,26 +559,26 @@ TQString WQQuiz::langAnswer(int i) return m_table->horizontalHeader()->label(j); } -int WQQuiz::kbAnswer(int i) +int WTQQuiz::kbAnswer(int i) { -/* WQListItem *li = m_list->at(i); +/* WTQListItem *li = m_list->at(i); if (li->question() == 0) { - //@todo return m_table ->layoutLeft(); + //@todo return m_table ->tqlayoutLeft(); } else { - //@todo return m_table -> layoutRight(); + //@todo return m_table -> tqlayoutRight(); }*/ return 0; } -int WQQuiz::questionCount() +int WTQQuiz::questionCount() { return m_questionCount; } -void WQQuiz::finish() +void WTQQuiz::finish() { emit checkingAnswer(-1); } diff --git a/kwordquiz/src/wqquiz.h b/kwordquiz/src/wqquiz.h index d86c9fa0..a9d0c93d 100644 --- a/kwordquiz/src/wqquiz.h +++ b/kwordquiz/src/wqquiz.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef WQQUIZ_H -#define WQQUIZ_H +#ifndef WTQQUIZ_H +#define WTQQUIZ_H #include @@ -28,16 +28,17 @@ @author Peter Hedlund */ -typedef TQValueList QuizList; +typedef TQValueList QuizList; -class WQQuiz : public QObject +class WTQQuiz : public TQObject { Q_OBJECT + TQ_OBJECT public: enum QuizType {qtEditor, qtFlash, qtMultiple, qtQA}; enum QuizIcon {qiLeftCol, qiRightCol, qiQuestion, qiCorrect, qiError}; - WQQuiz(KWordQuizView * parent, const char * name=0); + WTQQuiz(KWordQuizView * tqparent, const char * name=0); void activateErrorList(); void activateBaseList(); diff --git a/kwordquiz/src/wqscore.cpp b/kwordquiz/src/wqscore.cpp index 80cb3960..485363b0 100644 --- a/kwordquiz/src/wqscore.cpp +++ b/kwordquiz/src/wqscore.cpp @@ -16,7 +16,7 @@ #include "wqscore.h" -WQScore::WQScore() +WTQScore::WTQScore() { m_questionCount = 0; m_percent = false; @@ -26,16 +26,16 @@ WQScore::WQScore() } -WQScore::~WQScore() +WTQScore::~WTQScore() {} -void WQScore::setAsPercent(bool p) +void WTQScore::setAsPercent(bool p) { m_percent = p; } -void WQScore::setQuestionCount(int c) +void WTQScore::setQuestionCount(int c) { m_questionCount = c; //m_percent = false; @@ -44,7 +44,7 @@ void WQScore::setQuestionCount(int c) m_answerCount = 0; } -void WQScore::countIncrement(CountDirection d) +void WTQScore::countIncrement(CountDirection d) { if (d != cdNone) @@ -56,9 +56,9 @@ void WQScore::countIncrement(CountDirection d) } /*! - \fn WQScore::answerText() + \fn WTQScore::answerText() */ -TQString WQScore::answerText() +TQString WTQScore::answerText() { TQString s; if (m_percent) @@ -80,9 +80,9 @@ TQString WQScore::answerText() } /*! - \fn WQScore::correctText() + \fn WTQScore::correctText() */ -TQString WQScore::correctText() +TQString WTQScore::correctText() { TQString s; if (m_percent) @@ -102,9 +102,9 @@ TQString WQScore::correctText() } /*! - \fn WQScore::errorText() + \fn WTQScore::errorText() */ -TQString WQScore::errorText() +TQString WTQScore::errorText() { TQString s; if (m_percent) @@ -124,9 +124,9 @@ TQString WQScore::errorText() } /*! - \fn WQScore::valueToString(int i) + \fn WTQScore::valueToString(int i) */ -TQString WQScore::valueToString(int i) +TQString WTQScore::valueToString(int i) { TQString s = ""; //return empty string for 0 diff --git a/kwordquiz/src/wqscore.h b/kwordquiz/src/wqscore.h index 46c4651d..10e575fa 100644 --- a/kwordquiz/src/wqscore.h +++ b/kwordquiz/src/wqscore.h @@ -14,20 +14,20 @@ * * ***************************************************************************/ -#ifndef WQSCORE_H -#define WQSCORE_H +#ifndef WTQSCORE_H +#define WTQSCORE_H #include /** @author Peter Hedlund */ -class WQScore{ +class WTQScore{ public: enum CountDirection {cdCorrect, cdError, cdNone}; - WQScore(); + WTQScore(); - ~WQScore(); + ~WTQScore(); void setAsPercent(bool p); void setQuestionCount(int c); diff --git a/kwordquiz/src/wqundo.h b/kwordquiz/src/wqundo.h index d9b5e9c7..b0d584dd 100644 --- a/kwordquiz/src/wqundo.h +++ b/kwordquiz/src/wqundo.h @@ -13,8 +13,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef WQUNDO_H -#define WQUNDO_H +#ifndef WTQUNDO_H +#define WTQUNDO_H #include @@ -23,7 +23,7 @@ /** @author Peter Hedlund */ -class WQUndo{ +class WTQUndo{ public: TQFont font() const {return m_font;} void setFont(const TQFont & font) {m_font = font;} diff --git a/libkdeedu/extdate/extcalendarsystem.cpp b/libkdeedu/extdate/extcalendarsystem.cpp index f453bb6f..58960986 100644 --- a/libkdeedu/extdate/extcalendarsystem.cpp +++ b/libkdeedu/extdate/extcalendarsystem.cpp @@ -146,6 +146,6 @@ TQString ExtCalendarSystem::weekDayName (int weekDay, bool shortName) const case 7: return locale()->translate("Sunday"); } - return TQString::null; + return TQString(); } diff --git a/libkdeedu/extdate/extcalendarsystem.h b/libkdeedu/extdate/extcalendarsystem.h index be7ba336..4607fc1d 100644 --- a/libkdeedu/extdate/extcalendarsystem.h +++ b/libkdeedu/extdate/extcalendarsystem.h @@ -79,7 +79,7 @@ public: * Converts a year literal of a part of a string into a integer starting at the beginning of the string * * @param sNum The string to parse - * @param iLength The number of QChars used, and 0 if no valid symbols was found in the string + * @param iLength The number of TQChars used, and 0 if no valid symbols was found in the string * @return An integer corresponding to the year */ virtual int yearStringToInteger(const TQString & sNum, int & iLength) const; @@ -105,7 +105,7 @@ public: * Converts a month literal of a part of a string into a integer starting at the beginning of the string * * @param sNum The string to parse - * @param iLength The number of QChars used, and 0 if no valid symbols was found in the string + * @param iLength The number of TQChars used, and 0 if no valid symbols was found in the string * @return An integer corresponding to the month */ virtual int monthStringToInteger(const TQString & sNum, int & iLength) const; @@ -131,7 +131,7 @@ public: * Converts a day literal of a part of a string into a integer starting at the beginning of the string * * @param sNum The string to parse - * @param iLength The number of QChars used, and 0 if no valid symbols was found in the string + * @param iLength The number of TQChars used, and 0 if no valid symbols was found in the string * @return An integer corresponding to the day */ virtual int dayStringToInteger(const TQString & sNum, int & iLength) const; @@ -235,7 +235,7 @@ public: /** * Gets specific calendar type month name for a given month number - * If an invalid month is specified, TQString::null is returned. + * If an invalid month is specified, TQString() is returned. * * @param month The month number * @param year The year the month belongs to @@ -257,7 +257,7 @@ public: * Returns a string containing the possessive form of the month name. * ("of January", "of February", etc.) * It's needed in long format dates in some languages. - * If an invalid month is specified, TQString::null is returned. + * If an invalid month is specified, TQString() is returned. * * @param month The month number * @param year The year the month belongs to @@ -281,7 +281,7 @@ public: /** * Gets specific calendar type week day name - * If an invalid week day is specified, TQString::null is returned. + * If an invalid week day is specified, TQString() is returned. * * @param weekDay number of day in week (1 -> Monday) * @param shortName short or complete day name diff --git a/libkdeedu/extdate/extcalendarsystemgregorian.cpp b/libkdeedu/extdate/extcalendarsystemgregorian.cpp index 47338f4b..0b167ce9 100644 --- a/libkdeedu/extdate/extcalendarsystemgregorian.cpp +++ b/libkdeedu/extdate/extcalendarsystemgregorian.cpp @@ -144,7 +144,7 @@ TQString ExtCalendarSystemGregorian::monthName(int month, int year, bool shortNa return locale()->translate("December"); } - return TQString::null; + return TQString(); } TQString ExtCalendarSystemGregorian::monthNamePossessive(int month, int year, @@ -209,7 +209,7 @@ TQString ExtCalendarSystemGregorian::monthNamePossessive(int month, int year, return locale()->translate("of December"); } - return TQString::null; + return TQString(); } bool ExtCalendarSystemGregorian::setYMD(ExtDate & date, int y, int m, int d) const @@ -294,7 +294,7 @@ int ExtCalendarSystemGregorian::weekDayOfPray() const TQString ExtCalendarSystemGregorian::calendarName() const { - return TQString::fromLatin1("gregorian"); + return TQString::tqfromLatin1("gregorian"); } bool ExtCalendarSystemGregorian::isLunar() const @@ -317,7 +317,7 @@ int ExtCalendarSystemGregorian::yearStringToInteger(const TQString & sNum, int & int iYear; iYear = ExtCalendarSystem::yearStringToInteger(sNum, iLength); - // Qt treats a year in the range 0-100 as 1900-1999. + // TQt treats a year in the range 0-100 as 1900-1999. // It is nicer for the user if we treat 0-68 as 2000-2068 if (iYear < 69) iYear += 2000; diff --git a/libkdeedu/extdate/extdatepicker.cpp b/libkdeedu/extdate/extdatepicker.cpp index ad524863..5a5864d2 100644 --- a/libkdeedu/extdate/extdatepicker.cpp +++ b/libkdeedu/extdate/extdatepicker.cpp @@ -77,28 +77,28 @@ void ExtDatePicker::fillWeeksCombo(const ExtDate &date) for (; day <= lastDay; day = d->calendar->addDays(day, 7 /*calendar->daysOfWeek()*/) ) { int year = 0; - TQString week = i18n("Week %1").arg(d->calendar->weekNumber(day, &year)); + TQString week = i18n("Week %1").tqarg(d->calendar->weekNumber(day, &year)); if ( year != date.year() ) week += "*"; // show that this is a week from a different year d->selectWeek->insertItem(week); } } -ExtDatePicker::ExtDatePicker(TQWidget *parent, ExtDate dt, const char *name) - : TQFrame(parent,name) +ExtDatePicker::ExtDatePicker(TQWidget *tqparent, ExtDate dt, const char *name) + : TQFrame(tqparent,name) { init( dt ); } -ExtDatePicker::ExtDatePicker(TQWidget *parent, ExtDate dt, const char *name, WFlags f) - : TQFrame(parent,name, f) +ExtDatePicker::ExtDatePicker(TQWidget *tqparent, ExtDate dt, const char *name, WFlags f) + : TQFrame(tqparent,name, f) { init( dt ); } -ExtDatePicker::ExtDatePicker( TQWidget *parent, const char *name ) - : TQFrame(parent,name) +ExtDatePicker::ExtDatePicker( TQWidget *tqparent, const char *name ) + : TQFrame(tqparent,name) { - init( ExtDate::currentDate() ); + init( ExtDate::tqcurrentDate() ); } void ExtDatePicker::init( const ExtDate &dt ) @@ -166,17 +166,17 @@ void ExtDatePicker::init( const ExtDate &dt ) if ( TQApplication::reverseLayout() ) { - yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); - monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); + yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); + monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); } else { - yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); - monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); + yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); + monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); } connect(table, TQT_SIGNAL(dateChanged(const ExtDate&)), TQT_SLOT(dateChangedSlot(const ExtDate&))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -214,10 +214,10 @@ ExtDatePicker::eventFilter(TQObject *o, TQEvent *e ) if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *k = (TQKeyEvent *)e; - if ( (k->key() == Qt::Key_Prior) || - (k->key() == Qt::Key_Next) || - (k->key() == Qt::Key_Up) || - (k->key() == Qt::Key_Down) ) + if ( (k->key() == TQt::Key_Prior) || + (k->key() == TQt::Key_Next) || + (k->key() == TQt::Key_Up) || + (k->key() == TQt::Key_Down) ) { TQApplication::sendEvent( table, e ); table->setFocus(); @@ -365,9 +365,9 @@ ExtDatePicker::selectMonthClicked() int day = d->calendar->day(date); // ----- construct a valid date in this month: //date.setYMD(date.year(), month, 1); - //date.setYMD(date.year(), month, QMIN(day, date.daysInMonth())); + //date.setYMD(date.year(), month, TQMIN(day, date.daysInMonth())); d->calendar->setYMD(date, d->calendar->year(date), month, - QMIN(day, d->calendar->daysInMonth(date))); + TQMIN(day, d->calendar->daysInMonth(date))); // ----- set this month setDate(date); } @@ -386,7 +386,7 @@ ExtDatePicker::selectYearClicked() KPopupFrame* popup = new KPopupFrame(this); ExtDateInternalYearSelector* picker = new ExtDateInternalYearSelector(popup); // ----- - picker->resize(picker->sizeHint()); + picker->resize(picker->tqsizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -400,9 +400,9 @@ ExtDatePicker::selectYearClicked() day=d->calendar->day(date); // ----- construct a valid date in this month: //date.setYMD(year, date.month(), 1); - //date.setYMD(year, date.month(), QMIN(day, date.daysInMonth())); + //date.setYMD(year, date.month(), TQMIN(day, date.daysInMonth())); d->calendar->setYMD(date, year, d->calendar->month(date), - QMIN(day, d->calendar->daysInMonth(date))); + TQMIN(day, d->calendar->daysInMonth(date))); // ----- set this month setDate(date); } else { @@ -446,13 +446,13 @@ ExtDatePicker::lineEnterPressed() void ExtDatePicker::todayButtonClicked() { - setDate(ExtDate::currentDate()); + setDate(ExtDate::tqcurrentDate()); } -QSize -ExtDatePicker::sizeHint() const +TQSize +ExtDatePicker::tqsizeHint() const { - return TQWidget::sizeHint(); + return TQWidget::tqsizeHint(); } void @@ -486,11 +486,11 @@ ExtDatePicker::setFontSize(int s) d->calendar->year(table->getDate()), false); if (str.isNull()) break; r=metrics.boundingRect(str); - maxMonthRect.setWidth(QMAX(r.width(), maxMonthRect.width())); - maxMonthRect.setHeight(QMAX(r.height(), maxMonthRect.height())); + maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width())); + maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); } - TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton, + TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); selectMonth->setMinimumSize(metricBound); @@ -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() ), - topLevelWidget(), TQT_SLOT( close() ) ); + tqtopLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/libkdeedu/extdate/extdatepicker.h b/libkdeedu/extdate/extdatepicker.h index 8c745b52..fa4a1fef 100644 --- a/libkdeedu/extdate/extdatepicker.h +++ b/libkdeedu/extdate/extdatepicker.h @@ -49,26 +49,27 @@ class ExtDateTable; * * @short A date selection widget. **/ -class KDE_EXPORT ExtDatePicker: public QFrame +class KDE_EXPORT ExtDatePicker: public TQFrame { Q_OBJECT -// Q_PROPERTY( ExtDate date READ date WRITE setDate) - Q_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton ) - Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize ) + TQ_OBJECT +// TQ_PROPERTY( ExtDate date READ date WRITE setDate) + TQ_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton ) + TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize ) public: /** The usual constructor. The given date will be displayed * initially. **/ - ExtDatePicker(TQWidget *parent=0, - ExtDate=ExtDate::currentDate(), + ExtDatePicker(TQWidget *tqparent=0, + ExtDate=ExtDate::tqcurrentDate(), const char *name=0); /** The usual constructor. The given date will be displayed * initially. * @since 3.1 **/ - ExtDatePicker(TQWidget *parent, + ExtDatePicker(TQWidget *tqparent, ExtDate, const char *name, WFlags f); // ### KDE 4.0: Merge @@ -78,7 +79,7 @@ public: * current date. * @since 3.1 */ - ExtDatePicker( TQWidget *parent, const char *name ); + ExtDatePicker( TQWidget *tqparent, const char *name ); /** * The destructor. @@ -91,7 +92,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * Sets the date. @@ -137,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 topLevelWidget()'s close() + * close-button will cause the ExtDatePicker's tqtopLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see hasCloseButton diff --git a/libkdeedu/extdate/extdatetbl.cpp b/libkdeedu/extdate/extdatetbl.cpp index ca403a68..91f14395 100644 --- a/libkdeedu/extdate/extdatetbl.cpp +++ b/libkdeedu/extdate/extdatetbl.cpp @@ -28,7 +28,7 @@ // // Copyright (C) 1997 Tim D. Gilman // (C) 1998-2001 Mirko Boehm -// Written using Qt (http://www.troll.no) for the +// Written using TQt (http://www.troll.no) for the // KDE project (http://www.kde.org) // // Modified to use ExtDate by Jason Harris, 2004 @@ -82,8 +82,8 @@ public: }; -ExtDateValidator::ExtDateValidator(TQWidget* parent, const char* name) - : TQValidator(parent, name) +ExtDateValidator::ExtDateValidator(TQWidget* tqparent, const char* name) + : TQValidator(TQT_TQOBJECT(tqparent), name) { } @@ -116,17 +116,17 @@ ExtDateValidator::fixup( TQString& ) const } -ExtDateTable::ExtDateTable(TQWidget *parent, ExtDate date_, const char* name, WFlags f) - : TQGridView(parent, name, f) +ExtDateTable::ExtDateTable(TQWidget *tqparent, ExtDate date_, const char* name, WFlags f) + : TQGridView(tqparent, name, f) { d = new ExtDateTablePrivate; setFontSize(10); if(!date_.isValid()) { kdDebug() << "ExtDateTable ctor: WARNING: Given date is invalid, using current date." << endl; - date_=ExtDate::currentDate(); + date_=ExtDate::tqcurrentDate(); } - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); @@ -204,7 +204,7 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col) normalday=false; TQBrush brushTitle(); - TQBrush brushInvertTitle(colorGroup().base()); + TQBrush brushInvertTitle(tqcolorGroup().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(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); painter->moveTo(0, h-1); painter->lineTo(w-1, h-1); // ----- draw the weekday: @@ -235,10 +235,10 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col) text = d->calendar->dayString(pCellDate, true); if( d->calendar->month(pCellDate) != d->calendar->month(date) ) { // we are either - // ° painting a day of the previous month or - // ° painting a day of the following month + // � 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( colorGroup().mid() ); + painter->setPen( tqcolorGroup().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(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); } else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all! - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().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(colorGroup().highlight()); - painter->setBrush(colorGroup().highlight()); - pen=colorGroup().highlightedText(); + painter->setPen(tqcolorGroup().highlight()); + painter->setBrush(tqcolorGroup().highlight()); + pen=TQPen(tqcolorGroup().highlightedText()); } else { painter->setBrush(paletteBackgroundColor()); painter->setPen(paletteBackgroundColor()); -// painter->setBrush(colorGroup().base()); -// painter->setPen(colorGroup().base()); +// painter->setBrush(tqcolorGroup().base()); +// painter->setPen(tqcolorGroup().base()); } - if ( pCellDate == ExtDate::currentDate() ) + if ( pCellDate == ExtDate::tqcurrentDate() ) { - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().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::currentDate()); + setDate(ExtDate::tqcurrentDate()); return; case Key_Return: case Key_Enter: @@ -386,13 +386,13 @@ ExtDateTable::setFontSize(int size) for(count=0; count<7; ++count) { rect=metrics.boundingRect(d->calendar->weekDayName(count+1, true)); - maxCell.setWidth(QMAX(maxCell.width(), rect.width())); - maxCell.setHeight(QMAX(maxCell.height(), rect.height())); + maxCell.setWidth(TQMAX(maxCell.width(), rect.width())); + maxCell.setHeight(TQMAX(maxCell.height(), rect.height())); } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::fromLatin1("88")); - maxCell.setWidth(QMAX(maxCell.width()+2, rect.width())); - maxCell.setHeight(QMAX(maxCell.height()+4, rect.height())); + rect=metrics.boundingRect(TQString::tqfromLatin1("88")); + maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width())); + maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height())); } void @@ -494,7 +494,7 @@ ExtDateTable::setDate(const ExtDate& date_) numDaysPrevMonth=d->calendar->daysInMonth(temp); if(changed) { - repaintContents(false); + tqrepaintContents(false); } return true; } @@ -505,28 +505,28 @@ ExtDateTable::getDate() const return date; } -// what are those repaintContents() good for? (pfeiffer) +// what are those tqrepaintContents() good for? (pfeiffer) void ExtDateTable::focusInEvent( TQFocusEvent *e ) { -// repaintContents(false); +// tqrepaintContents(false); TQGridView::focusInEvent( e ); } void ExtDateTable::focusOutEvent( TQFocusEvent *e ) { -// repaintContents(false); +// tqrepaintContents(false); TQGridView::focusOutEvent( e ); } -QSize -ExtDateTable::sizeHint() const +TQSize +ExtDateTable::tqsizeHint() const { if(maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - kdDebug() << "ExtDateTable::sizeHint: obscure failure - " << endl; + kdDebug() << "ExtDateTable::tqsizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } @@ -554,7 +554,7 @@ void ExtDateTable::setCustomDatePainting(const ExtDate &date, const TQColor &fgC mode->fgColor=fgColor; mode->bgColor=bgColor; - d->customPaintingModes.replace( date.toString(), mode ); + d->customPaintingModes.tqreplace( date.toString(), mode ); d->useCustomColors=true; update(); } @@ -565,9 +565,9 @@ void ExtDateTable::unsetCustomDatePainting( const ExtDate &date ) } ExtDateInternalWeekSelector::ExtDateInternalWeekSelector -(TQWidget* parent, const char* name) - : KLineEdit(parent, name), - val(new TQIntValidator(this)), +(TQWidget* tqparent, const char* name) + : KLineEdit(tqparent, name), + val(new TQIntValidator(TQT_TQOBJECT(this))), result(0) { TQFont font; @@ -638,8 +638,8 @@ ExtDateInternalMonthPicker::~ExtDateInternalMonthPicker() { } ExtDateInternalMonthPicker::ExtDateInternalMonthPicker -(const ExtDate & date, TQWidget* parent, const char* name) - : TQGridView(parent, name), +(const ExtDate & date, TQWidget* tqparent, const char* name) + : TQGridView(tqparent, name), result(0) // invalid { //FIXME: Can't uncomment the following unless ExtDate is moved to kdelibs @@ -676,8 +676,8 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker } } -QSize -ExtDateInternalMonthPicker::sizeHint() const +TQSize +ExtDateInternalMonthPicker::tqsizeHint() const { return TQSize((max.width()+6)*numCols()+2*frameWidth(), (max.height()+6)*numRows()+2*frameWidth()); @@ -720,7 +720,7 @@ ExtDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) void ExtDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) { - if(!isEnabled() || e->button() != LeftButton) + if(!isEnabled() || e->button() != Qt::LeftButton) { KNotifyClient::beep(); return; @@ -747,7 +747,7 @@ ExtDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) void ExtDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) { - if (e->state() & LeftButton) + if (e->state() & Qt::LeftButton) { int row, col; TQPoint mouseCoord; @@ -779,7 +779,7 @@ ExtDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) updateCell( row, col /*, false */ ); // mark the new active cell } } - if ( tmpRow > -1 ) // repaint the former active cell + if ( tmpRow > -1 ) // tqrepaint the former active cell updateCell( tmpRow, tmpCol /*, true */ ); } } @@ -811,9 +811,9 @@ ExtDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) ExtDateInternalYearSelector::ExtDateInternalYearSelector -(TQWidget* parent, const char* name) - : TQLineEdit(parent, name), - val(new TQIntValidator(this)), +(TQWidget* tqparent, const char* name) + : TQLineEdit(tqparent, name), + val(new TQIntValidator(TQT_TQOBJECT(this))), result(0), d(new ExtDateInternalYearPrivate()) { @@ -873,8 +873,8 @@ ExtDateInternalYearSelector::setYear(int year) setText(temp); } -KPopupFrame::KPopupFrame(TQWidget* parent, const char* name) - : TQFrame(parent, name, WType_Popup), +KPopupFrame::KPopupFrame(TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name, WType_Popup), result(0), // rejected main(0) { @@ -888,7 +888,7 @@ KPopupFrame::keyPressEvent(TQKeyEvent* e) if(e->key()==Key_Escape) { result=0; // rejected - qApp->exit_loop(); + tqApp->exit_loop(); } } @@ -896,7 +896,7 @@ void KPopupFrame::close(int r) { result=r; - qApp->exit_loop(); + tqApp->exit_loop(); } void @@ -947,8 +947,8 @@ int KPopupFrame::exec(TQPoint pos) { popup(pos); - repaint(); - qApp->enter_loop(); + tqrepaint(); + tqApp->enter_loop(); hide(); return result; } diff --git a/libkdeedu/extdate/extdatetbl.h b/libkdeedu/extdate/extdatetbl.h index 8aa3281a..ef3bd9d8 100644 --- a/libkdeedu/extdate/extdatetbl.h +++ b/libkdeedu/extdate/extdatetbl.h @@ -41,6 +41,7 @@ class KPopupMenu; class ExtDateInternalWeekSelector : public KLineEdit { Q_OBJECT + TQ_OBJECT protected: TQIntValidator *val; int result; @@ -50,7 +51,7 @@ public slots: signals: void closeMe(int); public: - ExtDateInternalWeekSelector( TQWidget* parent=0, const char* name=0); + ExtDateInternalWeekSelector( TQWidget* tqparent=0, const char* name=0); int getWeek(); void setWeek(int week); @@ -65,9 +66,10 @@ private: * @version $Id$ * @author Tim Gilman, Mirko Boehm */ -class ExtDateInternalMonthPicker : public QGridView +class ExtDateInternalMonthPicker : public TQGridView { Q_OBJECT + TQ_OBJECT protected: /** * Store the month that has been clicked [1..12]. @@ -91,7 +93,7 @@ public: /** * The constructor. */ - ExtDateInternalMonthPicker(const ExtDate& date, TQWidget* parent, const char* name=0); + ExtDateInternalMonthPicker(const ExtDate& date, TQWidget* tqparent, const char* name=0); /** * The destructor. */ @@ -99,7 +101,7 @@ public: /** * The size hint. */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -138,9 +140,10 @@ private: * @version $Id$ * @author Tim Gilman, Mirko Boehm */ -class ExtDateInternalYearSelector : public QLineEdit +class ExtDateInternalYearSelector : public TQLineEdit { Q_OBJECT + TQ_OBJECT protected: TQIntValidator *val; int result; @@ -149,7 +152,7 @@ public slots: signals: void closeMe(int); public: - ExtDateInternalYearSelector( TQWidget* parent=0, const char* name=0); + ExtDateInternalYearSelector( TQWidget* tqparent=0, const char* name=0); ~ExtDateInternalYearSelector(); int getYear(); void setYear(int year); @@ -174,9 +177,10 @@ private: * @author Tim Gilman, Mirko Boehm * @version $Id$ */ -class KPopupFrame : public QFrame +class KPopupFrame : public TQFrame { Q_OBJECT + TQ_OBJECT protected: /** * The result. It is returned from exec() when the popup window closes. @@ -200,7 +204,7 @@ public: /** * The contructor. Creates a dialog without buttons. */ - KPopupFrame(TQWidget* parent=0, const char* name=0); + KPopupFrame(TQWidget* tqparent=0, const char* name=0); /** * Set the main widget. You cannot set the main widget from the constructor, * since it must be a child of the frame itselfes. @@ -240,10 +244,10 @@ private: /** * Validates user-entered dates. */ -class ExtDateValidator : public QValidator +class ExtDateValidator : public TQValidator { public: - ExtDateValidator(TQWidget* parent=0, const char* name=0); + ExtDateValidator(TQWidget* tqparent=0, const char* name=0); virtual State validate(TQString&, int&) const; virtual void fixup ( TQString & input ) const; State date(const TQString&, ExtDate&) const; @@ -262,18 +266,19 @@ public: * @version $Id$ * @author Tim Gilman, Mirko Boehm */ -class ExtDateTable : public QGridView +class ExtDateTable : public TQGridView { Q_OBJECT - //Q_PROPERTY( ExtDate date READ getDate WRITE setDate ) - Q_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnabled ) + TQ_OBJECT + //TQ_PROPERTY( ExtDate date READ getDate WRITE setDate ) + TQ_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnabled ) public: /** * The constructor. */ - ExtDateTable(TQWidget *parent=0, - ExtDate date=ExtDate::currentDate(), + ExtDateTable(TQWidget *tqparent=0, + ExtDate date=ExtDate::tqcurrentDate(), const char* name=0, WFlags f=0); /** @@ -286,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 - * sizeHint() simply returns a multiple of maxCell. + * tqsizeHint() simply returns a multiple of maxCell. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Set the font size of the date table. */ diff --git a/libkdeedu/extdate/extdatetime.cpp b/libkdeedu/extdate/extdatetime.cpp index fe32cf91..2af13595 100644 --- a/libkdeedu/extdate/extdatetime.cpp +++ b/libkdeedu/extdate/extdatetime.cpp @@ -77,7 +77,7 @@ TQString ExtDate::m_longDayNames[7] = { ExtDate::ExtDate( int y, int m, int d) { if ( !isValid(y,m,d) ) { -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "ExtDate: Invalid date %04d-%02d-%02d", y, m, d ); #endif m_year = 0; @@ -232,20 +232,20 @@ int ExtDate::weekNumber( int *yearNum ) const return week; } -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE TQString ExtDate::shortMonthName( int month ) {return m_shortMonthNames[month-1];} TQString ExtDate::shortDayName( int weekday ) {return m_shortDayNames[weekday-1];} TQString ExtDate::longMonthName( int month ) {return m_longMonthNames[month-1];} TQString ExtDate::longDayName( int weekday ) {return m_longDayNames[weekday-1];} -#endif //QT_NO_TEXTDATE +#endif //TQT_NO_TEXTDATE -#ifndef QT_NO_TEXTSTRING -#if !defined(QT_NO_SPRINTF) +#ifndef TQT_NO_TEXTSTRING +#if !defined(TQT_NO_SPRINTF) TQString ExtDate::toString( Qt::DateFormat f) const { - QString a_format; + TQString a_format; - if ( ! isValid() ) return TQString::null; + if ( ! isValid() ) return TQString(); switch (f) { @@ -272,7 +272,7 @@ TQString ExtDate::toString( Qt::DateFormat f) const TQString ExtDate::toString( const TQString& format ) const { - if ( ! isValid() ) return TQString::null; + if ( ! isValid() ) return TQString(); //We use the KDE Date format specs. //Replace occurences of the following tokens with their @@ -293,16 +293,16 @@ TQString ExtDate::toString( const TQString& format ) const TQString result( format ); - result.replace( "%Y", TQString().sprintf( "%d", year() ) ); - result.replace( "%y", TQString().sprintf( "%02d", (year() % 100) ) ); - result.replace( "%n", TQString().sprintf( "%d", month() ) ); - result.replace( "%m", TQString().sprintf( "%02d", month() ) ); - result.replace( "%e", TQString().sprintf( "%d", day() ) ); - result.replace( "%d", TQString().sprintf( "%02d", day() ) ); - result.replace( "%b", shortMonthName( month() ) ); - result.replace( "%B", longMonthName( month() ) ); - result.replace( "%a", shortDayName( dayOfWeek() ) ); - result.replace( "%A", longDayName( dayOfWeek() ) ); + result.tqreplace( "%Y", TQString().sprintf( "%d", year() ) ); + result.tqreplace( "%y", TQString().sprintf( "%02d", (year() % 100) ) ); + result.tqreplace( "%n", TQString().sprintf( "%d", month() ) ); + result.tqreplace( "%m", TQString().sprintf( "%02d", month() ) ); + result.tqreplace( "%e", TQString().sprintf( "%d", day() ) ); + result.tqreplace( "%d", TQString().sprintf( "%02d", day() ) ); + result.tqreplace( "%b", shortMonthName( month() ) ); + result.tqreplace( "%B", longMonthName( month() ) ); + result.tqreplace( "%a", shortDayName( dayOfWeek() ) ); + result.tqreplace( "%A", longDayName( dayOfWeek() ) ); return result; } @@ -311,7 +311,7 @@ TQString ExtDate::toString( const TQString& format ) const bool ExtDate::setYMD( int y, int m, int d ) { if ( ! isValid(y,m,d) ) { -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "ExtDate: Invalid date %04d-%02d-%02d", y, m, d ); #endif m_year = 0; @@ -377,7 +377,7 @@ int ExtDate::daysTo( const ExtDate & a_date) const return a_date.jd() - jd(); } -ExtDate ExtDate::currentDate(Qt::TimeSpec ts) +ExtDate ExtDate::tqcurrentDate(Qt::TimeSpec ts) { time_t a_current_time; struct tm a_current_time_tm; @@ -385,11 +385,11 @@ ExtDate ExtDate::currentDate(Qt::TimeSpec ts) time(&a_current_time); switch (ts) { - case Qt::LocalTime : + case TQt::LocalTime : localtime_r(&a_current_time, &a_current_time_tm); break; - case Qt::UTC : + case TQt::UTC : gmtime_r(&a_current_time, &a_current_time_tm); break; @@ -400,7 +400,7 @@ ExtDate ExtDate::currentDate(Qt::TimeSpec ts) return ExtDate(a_current_time_tm.tm_year + 1900, a_current_time_tm.tm_mon + 1, a_current_time_tm.tm_mday); } -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING //Try both DateFormat values ExtDate ExtDate::fromString( const TQString& s ) { @@ -417,7 +417,7 @@ ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f ) ExtDate dt = ExtDate(); //initialize invalid date if ( s.isEmpty() ) { return dt; } if ( f == Qt::LocalDate ) { //can't use LocalFormat -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "TQDate::fromString: Parameter out of range" ); #endif return dt; @@ -436,7 +436,7 @@ ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f ) break; default : -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE case Qt::TextDate : { //Three possible date formats: @@ -499,12 +499,12 @@ ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f ) } #else break; -#endif //ifndef QT_NO_TEXTDATE +#endif //ifndef TQT_NO_TEXTDATE } return dt; } -#endif //ifndef QT_NO_DATESTRING +#endif //ifndef TQT_NO_DATESTRING bool ExtDate::isValid( int y, int m, int d ) { @@ -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 currentDateTime(), which returns a ExtDateTime object set + function tqcurrentDateTime(), 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 @@ -710,8 +710,8 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC ) } /*! - Sets the date and time to \a ts time (\c Qt::LocalTime or \c - Qt::UTC) given the number of seconds that have passed since + Sets the date and time to \a ts time (\c TQt::LocalTime or \c + TQt::UTC) given the number of seconds that have passed since 1970-01-01T00:00:00, Coordinated Universal Time (UTC). On systems that do not support timezones this function will behave as if local time were UTC. @@ -726,11 +726,11 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts ) time_t tmp = (time_t) secsSince1Jan1970UTC; tm *brokenDown = 0; -#if defined(Q_OS_UNIX) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) +#if defined(Q_OS_UNIX) && defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) // posix compliant system // use the reentrant versions of localtime() and gmtime() where available tm res; - if ( ts == Qt::LocalTime ) + if ( ts == TQt::LocalTime ) brokenDown = localtime_r( &tmp, &res ); if ( !brokenDown ) { brokenDown = gmtime_r( &tmp, &res ); @@ -742,7 +742,7 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts ) } } #else - if ( ts == Qt::LocalTime ) + if ( ts == TQt::LocalTime ) brokenDown = localtime( &tmp ); if ( !brokenDown ) { brokenDown = gmtime( &tmp ); @@ -763,8 +763,8 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts ) // MSECS_PER_MIN * brokenDown->tm_min + // 1000 * brokenDown->tm_sec; } -#ifndef QT_NO_DATESTRING -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_DATESTRING +#ifndef TQT_NO_SPRINTF /*! \overload @@ -792,12 +792,12 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts ) TQString ExtDateTime::toString( Qt::DateFormat f ) const { if ( !isValid() ) - return TQString::null; + return TQString(); if ( f == Qt::ISODate ) { return d.toString( Qt::ISODate ) + "T" + t.toString( Qt::ISODate ); } -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE else if ( f == Qt::TextDate ) { return toString( "%a %b %e %Y %H:%M:%S" ); } @@ -807,14 +807,14 @@ TQString ExtDateTime::toString( Qt::DateFormat f ) const + " " + KGlobal::locale()->timeFormat() ); } - return TQString::null; + return TQString(); } #endif TQString ExtDateTime::toString( const TQString& format ) const { if ( !isValid() ) - return TQString::null; + return TQString(); //Parse the date portion of the format string TQString result = date().toString( format ); @@ -833,17 +833,17 @@ TQString ExtDateTime::toString( const TQString& format ) const int h = time().hour(); - result.replace( "%H", TQString().sprintf( "%02d", h ) ); - result.replace( "%k", TQString().sprintf( "%d", h ) ); - result.replace( "%I", TQString().sprintf( "%02d", ( h > 12 ) ? h-12 : h ) ); - result.replace( "%l", TQString().sprintf( "%d", ( h > 12 ) ? h-12 : h ) ); - result.replace( "%M", TQString().sprintf( "%02d", time().minute() ) ); - result.replace( "%S", TQString().sprintf( "%02d", time().second() ) ); - result.replace( "%p", TQString().sprintf( "%s", ( h > 12 ) ? "pm" : "am" ) ); + result.tqreplace( "%H", TQString().sprintf( "%02d", h ) ); + result.tqreplace( "%k", TQString().sprintf( "%d", h ) ); + result.tqreplace( "%I", TQString().sprintf( "%02d", ( h > 12 ) ? h-12 : h ) ); + result.tqreplace( "%l", TQString().sprintf( "%d", ( h > 12 ) ? h-12 : h ) ); + result.tqreplace( "%M", TQString().sprintf( "%02d", time().minute() ) ); + result.tqreplace( "%S", TQString().sprintf( "%02d", time().second() ) ); + result.tqreplace( "%p", TQString().sprintf( "%s", ( h > 12 ) ? "pm" : "am" ) ); return result; } -#endif //QT_NO_DATESTRING +#endif //TQT_NO_DATESTRING /*! Returns a ExtDateTime object containing a datetime \a ndays days @@ -933,7 +933,7 @@ int ExtDateTime::daysTo( const ExtDateTime &dt ) const Example: \code - ExtDateTime dt = ExtDateTime::currentDateTime(); + ExtDateTime dt = ExtDateTime::tqcurrentDateTime(); ExtDateTime xmas( ExtDate(dt.date().year(),12,24), TQTime(17,00) ); kdDebug( ) << "There are " << dt.secsTo(xmas) << " seconds to Christmas" << endl; \endcode @@ -1023,33 +1023,33 @@ bool ExtDateTime::operator>=( const ExtDateTime &dt ) const Returns the current datetime, as reported by the system clock. - \sa ExtDate::currentDate(), TQTime::currentTime() + \sa ExtDate::tqcurrentDate(), TQTime::currentTime() */ -ExtDateTime ExtDateTime::currentDateTime() +ExtDateTime ExtDateTime::tqcurrentDateTime() { - return currentDateTime( Qt::LocalTime ); + return tqcurrentDateTime( Qt::LocalTime ); } /*! Returns the current datetime, as reported by the system clock, for the TimeSpec \a ts. The default TimeSpec is LocalTime. - \sa ExtDate::currentDate(), TQTime::currentTime(), Qt::TimeSpec + \sa ExtDate::tqcurrentDate(), TQTime::currentTime(), Qt::TimeSpec */ -ExtDateTime ExtDateTime::currentDateTime( Qt::TimeSpec ts ) +ExtDateTime ExtDateTime::tqcurrentDateTime( Qt::TimeSpec ts ) { ExtDateTime dt; - dt.setDate( ExtDate::currentDate(ts) ); + dt.setDate( ExtDate::tqcurrentDate(ts) ); TQTime t = t.currentTime(ts); if ( t.hour()==0 && t.minute()==0 ) // midnight or right after? - dt.setDate( ExtDate::currentDate(ts) ); // fetch date again + dt.setDate( ExtDate::tqcurrentDate(ts) ); // fetch date again dt.setTime( t ); return dt; } -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING /*! Returns the ExtDateTime represented by the string \a s, using the format \a f, or an invalid datetime if this is not possible. @@ -1076,7 +1076,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) ExtDateTime dt; if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) { -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "ExtDateTime::fromString: Parameter out of range" ); #endif dt.d.setJD( INVALID_DAY ); @@ -1084,7 +1084,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) } if ( f == Qt::ISODate ) { - if ( s.length() <= 10 || ! s.contains( ':' ) ) { //no time specified + if ( s.length() <= 10 || ! s.tqcontains( ':' ) ) { //no time specified TQTime t = TQTime(0,0,0); return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ) ); } else { @@ -1092,14 +1092,14 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) TQTime::fromString( s.mid(11), Qt::ISODate ) ); } } -#if !defined(QT_NO_REGEXP) && !defined(QT_NO_TEXTDATE) +#if !defined(TQT_NO_REGEXP) && !defined(TQT_NO_TEXTDATE) else if ( f == Qt::TextDate ) { //parse the time, if it exists. TQTime time; TQString sd = s; int hour, minute, second; - int pivot = s.find( TQRegExp(TQString::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); + int pivot = s.tqfind( TQRegExp(TQString::tqfromLatin1("[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(); @@ -1114,21 +1114,21 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) return ExtDateTime( date, time ); } -#endif //QT_NO_REGEXP +#endif //TQT_NO_REGEXP return ExtDateTime(); } -#endif //QT_NO_DATESTRING +#endif //TQT_NO_DATESTRING -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM KDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDate & date) { - return ostream << (Q_UINT32)(date.jd()); + return ostream << (TQ_UINT32)(date.jd()); } KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) { - Q_UINT32 julday; + TQ_UINT32 julday; ostream >> julday; date.setJD( julday ); return ostream; @@ -1136,7 +1136,9 @@ KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) KDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDateTime & dt) { - return ostream << dt.d << dt.t; + ostream << dt.d; + ostream << dt.t; + return ostream; } KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDateTime & dt) @@ -1145,4 +1147,4 @@ KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDateTime & dt) return ostream; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM diff --git a/libkdeedu/extdate/extdatetime.h b/libkdeedu/extdate/extdatetime.h index 0830af83..0ebe324f 100644 --- a/libkdeedu/extdate/extdatetime.h +++ b/libkdeedu/extdate/extdatetime.h @@ -57,8 +57,8 @@ public: int weekNumber( int *yearNum = 0 ) const; long int jd() const { return m_jd; } -#ifndef QT_NO_TEXTDATE -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_TEXTDATE +#ifndef TQT_NO_COMPAT static TQString monthName( int month ) { return shortMonthName( month ); } static TQString dayName( int weekday ) { return shortDayName( weekday ); } #endif @@ -66,9 +66,9 @@ public: static TQString shortDayName( int weekday ); static TQString longMonthName( int month ); static TQString longDayName( int weekday ); -#endif //QT_NO_TEXTDATE -#ifndef QT_NO_TEXTSTRING -#if !defined(QT_NO_SPRINTF) +#endif //TQT_NO_TEXTDATE +#ifndef TQT_NO_TEXTSTRING +#if !defined(TQT_NO_SPRINTF) TQString toString( Qt::DateFormat f = Qt::TextDate ) const; #endif TQString toString( const TQString& format ) const; @@ -88,8 +88,8 @@ 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 currentDate( Qt::TimeSpec ts = Qt::LocalTime ); -#ifndef QT_NO_DATESTRING + static ExtDate tqcurrentDate( Qt::TimeSpec ts = Qt::LocalTime ); +#ifndef TQT_NO_DATESTRING static ExtDate fromString( const TQString &s ); static ExtDate fromString( const TQString &s, Qt::DateFormat f ); #endif @@ -113,11 +113,11 @@ private: friend class ExtDateTime; -#ifndef QT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & ); - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & ); +#ifndef TQT_NO_DATASTREAM + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & ); #endif }; @@ -142,8 +142,8 @@ public: void setTime( const TQTime &time ) { t = time; } void setTime_t( uint secsSince1Jan1970UTC ); void setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ); -#ifndef QT_NO_DATESTRING -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_DATESTRING +#ifndef TQT_NO_SPRINTF TQString toString( Qt::DateFormat f = Qt::TextDate ) const; #endif TQString toString( const TQString& format ) const; @@ -162,18 +162,18 @@ public: bool operator>( const ExtDateTime &dt ) const; bool operator>=( const ExtDateTime &dt ) const; - static ExtDateTime currentDateTime(); - static ExtDateTime currentDateTime( Qt::TimeSpec ); -#ifndef QT_NO_DATESTRING + static ExtDateTime tqcurrentDateTime(); + static ExtDateTime tqcurrentDateTime( Qt::TimeSpec ); +#ifndef TQT_NO_DATESTRING static ExtDateTime fromString( const TQString &s ); static ExtDateTime fromString( const TQString &s, Qt::DateFormat f ); #endif private: ExtDate d; TQTime t; -#ifndef QT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime &); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & ); +#ifndef TQT_NO_DATASTREAM + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDateTime &); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDateTime & ); #endif }; @@ -181,10 +181,10 @@ private: Date and time stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & ); -#endif // QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const ExtDate & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, ExtDate & ); +#endif // TQT_NO_DATASTREAM #endif // EXTDATE_H diff --git a/libkdeedu/extdate/extdatetimeedit.cpp b/libkdeedu/extdate/extdatetimeedit.cpp index 203f1dbb..e5ff6087 100644 --- a/libkdeedu/extdate/extdatetimeedit.cpp +++ b/libkdeedu/extdate/extdatetimeedit.cpp @@ -25,12 +25,12 @@ #include "extdatetimeedit.h" -#ifndef QT_NO_DATETIMEEDIT +#ifndef TQT_NO_DATETIMEEDIT -//#include "../kernel/qinternal_p.h" -//#include "../kernel/qrichtext_p.h" -#include -#include +//#include "../kernel/tqinternal_p.h" +//#include "../kernel/tqrichtext_p.h" +#include +#include #include #include #include @@ -38,15 +38,15 @@ #include #include #include -#include //need for QTimeEdit +#include //need for TQTimeEdit #define EXTDATETIMEEDIT_HIDDEN_CHAR '0' -static QString *lDateSep = 0; -static QString *lTimeSep = 0; +static TQString *lDateSep = 0; +static TQString *lTimeSep = 0; static bool lAMPM = FALSE; -static QString *lAM = 0; -static QString *lPM = 0; +static TQString *lAM = 0; +static TQString *lPM = 0; static ExtDateEdit::Order lOrder = ExtDateEdit::YMD; static int refcount = 0; @@ -74,8 +74,8 @@ static void readLocaleSettings() lDateSep = new TQString(); lTimeSep = new TQString(); -#if defined(Q_WS_WIN) - QT_WA( { +#if defined(TQ_WS_WIN) + TQT_WA( { TCHAR data[10]; GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_SDATE, data, 10 ); *lDateSep = TQString::fromUcs2( (ushort*)data ); @@ -113,9 +113,9 @@ static void readLocaleSettings() *lTimeSep = ":"; #endif TQString d = ExtDate( 1999, 11, 22 ).toString( Qt::LocalDate ); - dpos = d.find( "22" ); - mpos = d.find( "11" ); - ypos = d.find( "99" ); + dpos = d.tqfind( "22" ); + mpos = d.tqfind( "11" ); + ypos = d.tqfind( "99" ); if ( dpos > -1 && mpos > -1 && ypos > -1 ) { // test for DMY, MDY, YMD, YDM if ( dpos < mpos && mpos < ypos ) { @@ -133,19 +133,19 @@ static void readLocaleSettings() // this code needs to change if new formats are added -#ifndef Q_WS_WIN - TQString sep = d.mid( QMIN( dpos, mpos ) + 2, QABS( dpos - mpos ) - 2 ); - if ( d.contains( sep ) == 2 ) { +#ifndef TQ_WS_WIN + TQString sep = d.mid( TQMIN( dpos, mpos ) + 2, TQABS( dpos - mpos ) - 2 ); + if ( d.tqcontains( sep ) == 2 ) { *lDateSep = sep; } #endif } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN TQString t = TQTime( 11, 22, 33 ).toString( Qt::LocalDate ); - dpos = t.find( "11" ); - mpos = t.find( "22" ); - ypos = t.find( "33" ); + dpos = t.tqfind( "11" ); + mpos = t.tqfind( "22" ); + ypos = t.tqfind( "33" ); // We only allow hhmmss if ( dpos > -1 && dpos < mpos && mpos < ypos ) { TQString sep = t.mid( dpos + 2, mpos - dpos - 2 ); @@ -182,11 +182,11 @@ class ExtDateTimeEditorPrivate public: ExtDateTimeEditorPrivate() : frm( TRUE ), - parag( new QTextParagraph( 0, 0, 0, FALSE ) ), + parag( new TQTextParagraph( 0, 0, 0, FALSE ) ), focusSec(0) { parag->formatter()->setWrapEnabled( FALSE ); - cursor = new QTextCursor( 0 ); + cursor = new TQTextCursor( 0 ); cursor->setParagraph( parag ); offset = 0; sep = localDateSep(); @@ -200,7 +200,7 @@ public: cleanup(); } - void appendSection( const QNumberSection& sec ) + void appendSection( const TQNumberSection& sec ) { sections.append( sec ); @@ -235,7 +235,7 @@ public: } return -1; } - QNumberSection section( int idx ) const + TQNumberSection section( int idx ) const { return sections[idx]; } @@ -266,20 +266,20 @@ public: { int fw = 0; if ( frm ) - fw = style.pixelMetric(TQStyle::PM_DefaultFrameWidth); + fw = style.tqpixelMetric(TQStyle::PM_DefaultFrameWidth); parag->truncate( 0 ); parag->append( txt ); if ( !focus ) - parag->removeSelection( QTextDocument::Standard ); + parag->removeSelection( TQTextDocument::Standard ); else { applyFocusSelection(); } /* color all EXTDATETIMEEDIT_HIDDEN_CHAR chars to background color */ - QTextFormat *fb = parag->formatCollection()->format( p.font(), + TQTextFormat *fb = parag->formatCollection()->format( p.font(), cg.base() ); - QTextFormat *nf = parag->formatCollection()->format( p.font(), + TQTextFormat *nf = parag->formatCollection()->format( p.font(), cg.text() ); for ( uint i = 0; i < txt.length(); ++i ) { parag->setFormat( i, 1, nf ); @@ -295,7 +295,7 @@ public: TQRect r( rect.x(), rect.y(), rect.width() - 2 * ( 2 + fw ), rect.height() ); parag->pseudoDocument()->docRect = r; - parag->invalidate(0); + parag->tqinvalidate(0); parag->format(); int xoff = 2 + fw - offset; @@ -322,7 +322,7 @@ protected: if ( focusSec > -1 ) { int selstart = sections[ focusSec ].selectionStart(); int selend = sections[ focusSec ].selectionEnd(); - parag->setSelection( QTextDocument::Standard, selstart, selend ); + parag->setSelection( TQTextDocument::Standard, selstart, selend ); parag->format(); if ( parag->at( selstart )->x < offset || parag->at( selend )->x + parag->string()->width( selend ) > offset + sz.width() ) { @@ -332,52 +332,25 @@ protected: } private: bool frm; - QTextParagraph *parag; - QTextCursor *cursor; + TQTextParagraph *parag; + TQTextCursor *cursor; TQSize sz; int focusSec; - TQValueList< QNumberSection > sections; + TQValueList< TQNumberSection > sections; TQString sep; int offset; }; -class ExtDateTimeSpinWidget : public QSpinWidget -{ -public: - ExtDateTimeSpinWidget( TQWidget *parent, const char *name ) - : TQSpinWidget( parent, name ) - { - } - -protected: -#ifndef QT_NO_WHEELEVENT - void wheelEvent( TQWheelEvent *e ) - { - ExtDateTimeEditor *editor = (ExtDateTimeEditor*)editWidget()->qt_cast( "ExtDateTimeEditor" ); - Q_ASSERT( editor ); - if ( !editor ) - return; - - int section = editor->sectionAt( e->pos() ); - editor->setFocusSection( section ); - - if ( section == -1 ) - return; - TQSpinWidget::wheelEvent( e ); - } -#endif -}; - /*! - Constructs an empty datetime editor with parent \a parent and + Constructs an empty datetime editor with tqparent \a tqparent and called \a name. */ -ExtDateTimeEditor::ExtDateTimeEditor( ExtDateTimeEditBase * parent, +ExtDateTimeEditor::ExtDateTimeEditor( ExtDateTimeEditBase * tqparent, const char * name ) - : TQWidget( parent, name, WNoAutoErase ) + : TQWidget( tqparent, name, WNoAutoErase ) { d = new ExtDateTimeEditorPrivate(); - cw = parent; + cw = tqparent; init(); } @@ -399,7 +372,7 @@ void ExtDateTimeEditor::init() setBackgroundMode( PaletteBase ); setFocusSection( -1 ); installEventFilter( this ); - setFocusPolicy( WheelFocus ); + setFocusPolicy( TQ_WheelFocus ); } @@ -411,7 +384,7 @@ bool ExtDateTimeEditor::event( TQEvent *e ) { if ( e->type() == TQEvent::FocusIn || e->type() == TQEvent::FocusOut ) { if ( e->type() == TQEvent::FocusOut ) - qApp->sendEvent( cw, e ); + tqApp->sendEvent( cw, e ); update( rect() ); } else if ( e->type() == TQEvent::AccelOverride ) { TQKeyEvent* ke = (TQKeyEvent*) e; @@ -458,12 +431,12 @@ void ExtDateTimeEditor::paintEvent( TQPaintEvent * ) } } - QSharedDoubleBuffer buffer( this ); + TQSharedDoubleBuffer buffer( this ); const TQBrush &bg = - colorGroup().brush( isEnabled() ? TQColorGroup::Base : TQColorGroup::Background ); + tqcolorGroup().brush( isEnabled() ? TQColorGroup::Base : TQColorGroup::Background ); buffer.painter()->fillRect( 0, 0, width(), height(), bg ); - d->paint( txt, hasFocus(), *buffer.painter(), colorGroup(), rect(), - style() ); + d->paint( txt, hasFocus(), *buffer.painter(), tqcolorGroup(), rect(), + tqstyle() ); buffer.end(); } @@ -492,7 +465,7 @@ void ExtDateTimeEditor::mousePressEvent( TQMouseEvent *e ) int sec = sectionAt( p ); if ( sec != -1 ) { cw->setFocusSection( sec ); - repaint( rect(), FALSE ); + tqrepaint( rect(), FALSE ); } } @@ -501,20 +474,20 @@ void ExtDateTimeEditor::mousePressEvent( TQMouseEvent *e ) */ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) { - if ( o == this ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; switch ( ke->key() ) { case Key_Right: if ( d->focusSection() < (int)d->sectionCount()-1 ) { if ( cw->setFocusSection( focusSection()+1 ) ) - repaint( rect(), FALSE ); + tqrepaint( rect(), FALSE ); } return TRUE; case Key_Left: if ( d->focusSection() > 0 ) { if ( cw->setFocusSection( focusSection()-1 ) ) - repaint( rect(), FALSE ); + tqrepaint( rect(), FALSE ); } return TRUE; case Key_Up: @@ -524,32 +497,32 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) cw->stepDown(); return TRUE; case Key_Backspace: - if ( ::qt_cast(cw) ) + if ( ::tqqt_cast(cw) ) ((ExtDateEdit*)cw)->removeFirstNumber( d->focusSection() ); - else if ( ::qt_cast(cw) ) - ((QTimeEdit*)cw)->removeFirstNumber( d->focusSection() ); + else if ( ::tqqt_cast(cw) ) + ((TQTimeEdit*)cw)->removeFirstNumber( d->focusSection() ); return TRUE; case Key_Delete: cw->removeLastNumber( d->focusSection() ); return TRUE; case Key_Tab: case Key_BackTab: { - if ( ke->state() == Qt::ControlButton ) + if ( ke->state() == TQt::ControlButton ) return FALSE; TQWidget *w = this; bool hadDateEdit = FALSE; while ( w ) { - if ( ::qt_cast(w) && qstrcmp( w->name(), "qt_spin_widget" ) != 0 || - ::qt_cast(w) ) + if ( ::tqqt_cast(w) && qstrcmp( w->name(), "qt_spin_widget" ) != 0 || + ::tqqt_cast(w) ) break; - hadDateEdit = hadDateEdit || ::qt_cast(w); - w = w->parentWidget(); + hadDateEdit = hadDateEdit || ::tqqt_cast(w); + w = w->tqparentWidget(); } if ( w ) { - if ( !::qt_cast(w) ) { - w = w->parentWidget(); + if ( !::tqqt_cast(w) ) { + w = w->tqparentWidget(); } else { ExtDateTimeEdit *ed = (ExtDateTimeEdit*)w; if ( hadDateEdit && ke->key() == Key_Tab ) { @@ -559,29 +532,29 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) ed->dateEdit()->setFocus(); return TRUE; } else { - while ( w && !::qt_cast(w) ) - w = w->parentWidget(); + while ( w && !::tqqt_cast(w) ) + w = w->tqparentWidget(); } } - qApp->sendEvent( w, e ); + tqApp->sendEvent( w, e ); return TRUE; } } break; default: - TQString txt = ke->text().lower(); + TQString txt = TQString(ke->text()).lower(); if ( !txt.isEmpty() && !separator().isEmpty() && txt[0] == separator()[0] ) { // do the same thing as KEY_RIGHT when the user presses the separator key if ( d->focusSection() < 2 ) { if ( cw->setFocusSection( focusSection()+1 ) ) - repaint( rect(), FALSE ); + tqrepaint( rect(), FALSE ); } return TRUE; - } else if ( !txt.isEmpty() && ::qt_cast(cw) && focusSection() == (int) d->sectionCount()-1 ) { + } else if ( !txt.isEmpty() && ::tqqt_cast(cw) && focusSection() == (int) d->sectionCount()-1 ) { // the first character of the AM/PM indicator toggles if the section has focus - QTimeEdit *te = (QTimeEdit*)cw; + TQTimeEdit *te = (TQTimeEdit*)cw; TQTime time = te->time(); - if ( lAMPM && lAM && lPM && (te->display()&QTimeEdit::AMPM) ) { + if ( lAMPM && lAM && lPM && (te->display()&TQTimeEdit::AMPM) ) { if ( txt[0] == (*lAM).lower()[0] && time.hour() >= 12 ) { time.setHMS( time.hour()-12, time.minute(), time.second(), time.msec() ); te->setTime( time ); @@ -608,7 +581,7 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) Appends the number section \a sec to the editor. */ -void ExtDateTimeEditor::appendSection( const QNumberSection& sec ) +void ExtDateTimeEditor::appendSection( const TQNumberSection& sec ) { d->appendSection( sec ); } @@ -678,7 +651,7 @@ bool ExtDateTimeEditor::setFocusSection( int sec ) \internal Small abstract class that provides some functions that are common - for both ExtDateEdit and QTimeEdit. Its used internally by + for both ExtDateEdit and TQTimeEdit. Its used internally by ExtDateTimeEditor. */ @@ -767,9 +740,9 @@ public: with a date, e.g. \code - ExtDateEdit *dateEdit = new ExtDateEdit( ExtDate::currentDate(), this ); - dateEdit->setRange( ExtDate::currentDate().addDays( -365 ), - ExtDate::currentDate().addDays( 365 ) ); + ExtDateEdit *dateEdit = new ExtDateEdit( ExtDate::tqcurrentDate(), this ); + dateEdit->setRange( ExtDate::tqcurrentDate().addDays( -365 ), + ExtDate::tqcurrentDate().addDays( 365 ) ); dateEdit->setOrder( ExtDateEdit::MDY ); dateEdit->setAutoAdvance( TRUE ); \endcode @@ -793,7 +766,7 @@ public: \image html datetimewidgets.png "Date Time Widgets" - \sa ExtDate QTimeEdit ExtDateTimeEdit + \sa ExtDate TQTimeEdit ExtDateTimeEdit */ /*! @@ -806,7 +779,7 @@ public: /*! - \enum QTimeEdit::Display + \enum TQTimeEdit::Display This enum defines the sections that comprise a time @@ -819,12 +792,12 @@ public: */ /*! - Constructs an empty date editor which is a child of \a parent and + Constructs an empty date editor which is a child of \a tqparent and called name \a name. */ -ExtDateEdit::ExtDateEdit( TQWidget * parent, const char * name ) - : ExtDateTimeEditBase( parent, name ) +ExtDateEdit::ExtDateEdit( TQWidget * tqparent, const char * name ) + : ExtDateTimeEditBase( tqparent, name ) { init(); updateButtons(); @@ -833,14 +806,14 @@ ExtDateEdit::ExtDateEdit( TQWidget * parent, const char * name ) /*! \overload - Constructs a date editor with the initial value \a date, parent \a - parent and called \a name. + Constructs a date editor with the initial value \a date, tqparent \a + tqparent and called \a name. The date editor is initialized with \a date. */ -ExtDateEdit::ExtDateEdit( const ExtDate& date, TQWidget * parent, const char * name ) - : ExtDateTimeEditBase( parent, name ) +ExtDateEdit::ExtDateEdit( const ExtDate& date, TQWidget * tqparent, const char * name ) + : ExtDateTimeEditBase( tqparent, name ) { init(); setDate( date ); @@ -861,9 +834,9 @@ void ExtDateEdit::init() connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) ); connect( this, TQT_SIGNAL( valueChanged(const ExtDate&) ), TQT_SLOT( updateButtons() ) ); - d->ed->appendSection( QNumberSection( 0,4 ) ); - d->ed->appendSection( QNumberSection( 5,7 ) ); - d->ed->appendSection( QNumberSection( 8,10 ) ); + d->ed->appendSection( TQNumberSection( 0,4 ) ); + d->ed->appendSection( TQNumberSection( 5,7 ) ); + d->ed->appendSection( TQNumberSection( 8,10 ) ); d->yearSection = -1; d->monthSection = -1; @@ -883,7 +856,7 @@ void ExtDateEdit::init() d->max = ExtDate( 50000, 12, 31 ); d->changed = FALSE; - setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); + tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); refcount++; } @@ -997,24 +970,24 @@ void ExtDateEdit::resizeEvent( TQResizeEvent * ) /*! \reimp */ -TQSize ExtDateEdit::sizeHint() const +TQSize ExtDateEdit::tqsizeHint() const { constPolish(); TQFontMetrics fm( font() ); - int fw = style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); - int h = QMAX( fm.lineSpacing(), 14 ) + 2; + int fw = tqstyle().tqpixelMetric( 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; - return TQSize( w, QMAX(h + fw * 2,20) ).expandedTo( TQApplication::globalStrut() ); + return TQSize( w, TQMAX(h + fw * 2,20) ).expandedTo( TQApplication::globalStrut() ); } /*! \reimp */ -TQSize ExtDateEdit::minimumSizeHint() const +TQSize ExtDateEdit::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } @@ -1160,7 +1133,7 @@ void ExtDateEdit::setOrder( ExtDateEdit::Order order ) } if ( isVisible() ) - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->tqrepaint( d->ed->rect(), FALSE ); } @@ -1198,7 +1171,7 @@ void ExtDateEdit::stepUp() emit valueChanged( date() ); } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->tqrepaint( d->ed->rect(), FALSE ); } @@ -1232,7 +1205,7 @@ void ExtDateEdit::stepDown() emit valueChanged( date() ); } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->tqrepaint( d->ed->rect(), FALSE ); } /*! @@ -1295,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. - currentDate()). That way, attempts to set the date property to an + tqcurrentDate()). 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 @@ -1319,7 +1292,7 @@ void ExtDateEdit::setDate( const ExtDate& date ) emit valueChanged( date ); } d->changed = FALSE; - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->tqrepaint( d->ed->rect(), FALSE ); } ExtDate ExtDateEdit::date() const @@ -1341,8 +1314,8 @@ ExtDate ExtDateEdit::date() const bool ExtDateEdit::outOfRange( int y, int m, int d ) const { if ( ExtDate::isValid( y, m, d ) ) { - ExtDate currentDate( y, m, d ); - if ( currentDate > maxValue() || currentDate < minValue() ) { + ExtDate tqcurrentDate( y, m, d ); + if ( tqcurrentDate > maxValue() || tqcurrentDate < minValue() ) { //## outOfRange should set overwrite? return TRUE; } @@ -1454,8 +1427,8 @@ void ExtDateEdit::addNumber( int sec, int num ) emit valueChanged( date() ); } d->overwrite = overwrite; - d->timerId = startTimer( qApp->doubleClickInterval()*4 ); - d->ed->repaint( d->ed->rect(), FALSE ); + d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); + d->ed->tqrepaint( d->ed->rect(), FALSE ); } @@ -1502,7 +1475,7 @@ void ExtDateEdit::fix() changed = TRUE; } - int currentYear = ExtDate::currentDate().year(); + int currentYear = ExtDate::tqcurrentDate().year(); int year = d->y; /* No longer valid for extended dates if ( year < 100 ) { @@ -1608,7 +1581,7 @@ void ExtDateEdit::removeFirstNumber( int sec ) d->d = txt.toInt(); d->dayCache = d->d; } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->tqrepaint( d->ed->rect(), FALSE ); } /*! \reimp @@ -1634,7 +1607,7 @@ void ExtDateEdit::removeLastNumber( int sec ) d->d = txt.toInt(); d->dayCache = d->d; } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->tqrepaint( d->ed->rect(), FALSE ); } /*! @@ -1675,7 +1648,7 @@ void ExtDateEdit::timerEvent( TQTimerEvent * ) /////////// -class QTimeEditPrivate +class TQTimeEditPrivate { public: int h; @@ -1694,26 +1667,26 @@ public: }; /*! - \class QTimeEdit ExtDatetimeedit.h - \brief The QTimeEdit class provides a time editor. + \class TQTimeEdit ExtDatetimeedit.h + \brief The TQTimeEdit class provides a time editor. \ingroup advanced \ingroup time \mainclass - QTimeEdit allows the user to edit times by using the keyboard or + TQTimeEdit allows the user to edit times by using the keyboard or the arrow keys to increase/decrease time values. The arrow keys - can be used to move from section to section within the QTimeEdit + can be used to move from section to section within the TQTimeEdit box. The user can automatically be moved to the next section once they complete a section using setAutoAdvance(). Times appear in - hour, minute, second order. It is recommended that the QTimeEdit + hour, minute, second order. It is recommended that the TQTimeEdit is initialised with a time, e.g. \code TQTime timeNow = TQTime::currentTime(); - QTimeEdit *timeEdit = new QTimeEdit( timeNow, this ); + TQTimeEdit *timeEdit = new TQTimeEdit( timeNow, this ); timeEdit->setRange( timeNow, timeNow.addSecs( 60 * 60 ) ); \endcode - Here we've created a QTimeEdit widget set to the current time. + Here we've created a TQTimeEdit widget set to the current time. We've also set the minimum value to the current time and the maximum time to one hour from now. @@ -1721,7 +1694,7 @@ public: default to the maximum and minimum values for a TQTime. You can change this by calling setMinValue(), setMaxValue() or setRange(). - Terminology: A QTimeWidget consists of three sections, one each + Terminology: A TQTimeWidget consists of three sections, one each for the hour, minute and second. You can change the separator character using setSeparator(), by default the separator is read from the system's settings. @@ -1733,12 +1706,12 @@ public: // /*! -// Constructs an empty time edit with parent \a parent and called \a +// Constructs an empty time edit with tqparent \a tqparent and called \a // name. // */ // -// QTimeEdit::QTimeEdit( TQWidget * parent, const char * name ) -// : ExtDateTimeEditBase( parent, name ) +// TQTimeEdit::TQTimeEdit( TQWidget * tqparent, const char * name ) +// : ExtDateTimeEditBase( tqparent, name ) // { // init(); // } @@ -1747,11 +1720,11 @@ public: // \overload // // Constructs a time edit with the initial time value, \a time, -// parent \a parent and called \a name. +// tqparent \a tqparent and called \a name. // */ // -// QTimeEdit::QTimeEdit( const TQTime& time, TQWidget * parent, const char * name ) -// : ExtDateTimeEditBase( parent, name ) +// TQTimeEdit::TQTimeEdit( const TQTime& time, TQWidget * tqparent, const char * name ) +// : ExtDateTimeEditBase( tqparent, name ) // { // init(); // setTime( time ); @@ -1760,9 +1733,9 @@ public: // /*! \internal // */ // -// void QTimeEdit::init() +// void TQTimeEdit::init() // { -// d = new QTimeEditPrivate(); +// d = new TQTimeEditPrivate(); // d->ed = new ExtDateTimeEditor( this, "time edit base" ); // d->controls = new ExtDateTimeSpinWidget( this, qstrcmp( name(), "qt_datetime_timeedit" ) == 0 ? "qt_spin_widget" : "time edit controls" ); // d->controls->setEditWidget( d->ed ); @@ -1770,9 +1743,9 @@ public: // connect( d->controls, TQT_SIGNAL( stepUpPressed() ), TQT_SLOT( stepUp() ) ); // connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) ); // -// d->ed->appendSection( QNumberSection( 0,0, TRUE, 0 ) ); -// d->ed->appendSection( QNumberSection( 0,0, TRUE, 1 ) ); -// d->ed->appendSection( QNumberSection( 0,0, TRUE, 2 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 2 ) ); // d->ed->setSeparator( localTimeSep() ); // // d->h = 0; @@ -1781,7 +1754,7 @@ public: // d->display = Hours | Minutes | Seconds; // if ( lAMPM ) { // d->display |= AMPM; -// d->ed->appendSection( QNumberSection( 0,0, FALSE, 3 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, FALSE, 3 ) ); // } // d->adv = FALSE; // d->overwrite = TRUE; @@ -1791,7 +1764,7 @@ public: // d->max = TQTime( 23, 59, 59 ); // d->changed = FALSE; // -// setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); +// tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); // // refcount++; // } @@ -1800,7 +1773,7 @@ public: // Destroys the object and frees any allocated resources. // */ // -// QTimeEdit::~QTimeEdit() +// TQTimeEdit::~TQTimeEdit() // { // delete d; // if ( !--refcount ) @@ -1808,33 +1781,33 @@ public: // } // // /*! -// \property QTimeEdit::minValue +// \property TQTimeEdit::minValue // \brief the minimum time value // // Setting the minimum time value is equivalent to calling -// QTimeEdit::setRange( \e t, maxValue() ), where \e t is the minimum +// TQTimeEdit::setRange( \e t, maxValue() ), where \e t is the minimum // time. The default minimum time is 00:00:00. // // \sa maxValue setRange() // */ // -// TQTime QTimeEdit::minValue() const +// TQTime TQTimeEdit::minValue() const // { // return d->min; // } // // /*! -// \property QTimeEdit::maxValue +// \property TQTimeEdit::maxValue // \brief the maximum time value // // Setting the maximum time value is equivalent to calling -// QTimeEdit::setRange( minValue(), \e t ), where \e t is the maximum +// TQTimeEdit::setRange( minValue(), \e t ), where \e t is the maximum // time. The default maximum time is 23:59:59. // // \sa minValue setRange() // */ // -// TQTime QTimeEdit::maxValue() const +// TQTime TQTimeEdit::maxValue() const // { // return d->max; // } @@ -1846,7 +1819,7 @@ public: // Similarly, if \a max is invalid no maximum time is set. // */ // -// void QTimeEdit::setRange( const TQTime& min, const TQTime& max ) +// void TQTimeEdit::setRange( const TQTime& min, const TQTime& max ) // { // if ( min.isValid() ) // d->min = min; @@ -1855,13 +1828,13 @@ public: // } // // /*! -// \property QTimeEdit::display +// \property TQTimeEdit::display // \brief the sections that are displayed in the time edit // // The value can be any combination of the values in the Display enum. // By default, the widget displays hours, minutes and seconds. // */ -// void QTimeEdit::setDisplay( uint display ) +// void TQTimeEdit::setDisplay( uint display ) // { // if ( d->display == display ) // return; @@ -1869,32 +1842,32 @@ public: // d->ed->clearSections(); // d->display = display; // if ( d->display & Hours ) -// d->ed->appendSection( QNumberSection( 0,0, TRUE, 0 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); // if ( d->display & Minutes ) -// d->ed->appendSection( QNumberSection( 0,0, TRUE, 1 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); // if ( d->display & Seconds ) -// d->ed->appendSection( QNumberSection( 0,0, TRUE, 2 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 2 ) ); // if ( d->display & AMPM ) -// d->ed->appendSection( QNumberSection( 0,0, FALSE, 3 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, FALSE, 3 ) ); // // d->ed->setFocusSection( 0 ); // d->ed->update(); // } // -// uint QTimeEdit::display() const +// uint TQTimeEdit::display() const // { // return d->display; // } // // /*! -// \property QTimeEdit::time +// \property TQTimeEdit::time // \brief the editor's time value. // // When changing the time property, if the time is less than // minValue(), or is greater than maxValue(), nothing happens. // */ // -// void QTimeEdit::setTime( const TQTime& time ) +// void TQTimeEdit::setTime( const TQTime& time ) // { // if ( !time.isValid() ) { // d->h = 0; @@ -1909,10 +1882,10 @@ public: // emit valueChanged( time ); // } // d->changed = FALSE; -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->tqrepaint( d->ed->rect(), FALSE ); // } // -// TQTime QTimeEdit::time() const +// TQTime TQTimeEdit::time() const // { // if ( TQTime::isValid( d->h, d->m, d->s ) ) // return TQTime( d->h, d->m, d->s ); @@ -1920,7 +1893,7 @@ public: // } // // /*! -// \property QTimeEdit::autoAdvance +// \property TQTimeEdit::autoAdvance // \brief whether the editor automatically advances to the next // section // @@ -1929,12 +1902,12 @@ public: // The default is FALSE. // */ // -// void QTimeEdit::setAutoAdvance( bool advance ) +// void TQTimeEdit::setAutoAdvance( bool advance ) // { // d->adv = advance; // } // -// bool QTimeEdit::autoAdvance() const +// bool TQTimeEdit::autoAdvance() const // { // return d->adv; // } @@ -1944,7 +1917,7 @@ public: // character of \a s is used. // */ // -// void QTimeEdit::setSeparator( const TQString& s ) +// void TQTimeEdit::setSeparator( const TQString& s ) // { // d->ed->setSeparator( s ); // } @@ -1953,14 +1926,14 @@ public: // Returns the editor's separator. // */ // -// TQString QTimeEdit::separator() const +// TQString TQTimeEdit::separator() const // { // return d->ed->separator(); // } // // // /*! -// \fn void QTimeEdit::valueChanged( const TQTime& time ) +// \fn void TQTimeEdit::valueChanged( const TQTime& time ) // // This signal is emitted whenever the editor's value changes. The \a // time parameter is the new value. @@ -1970,7 +1943,7 @@ public: // // */ // -// bool QTimeEdit::event( TQEvent *e ) +// bool TQTimeEdit::event( TQEvent *e ) // { // if ( e->type() == TQEvent::FocusOut ) { // d->typing = FALSE; @@ -1989,7 +1962,7 @@ public: // // */ // -// void QTimeEdit::timerEvent( TQTimerEvent * ) +// void TQTimeEdit::timerEvent( TQTimerEvent * ) // { // d->overwrite = TRUE; // } @@ -1999,7 +1972,7 @@ public: // // */ // -// void QTimeEdit::stepUp() +// void TQTimeEdit::stepUp() // { // int sec = d->ed->mapSection( d->ed->focusSection() ); // bool accepted = TRUE; @@ -2030,8 +2003,8 @@ public: // break; // default: // accepted = FALSE; -// #ifdef QT_CHECK_RANGE -// qWarning( "QTimeEdit::stepUp: Focus section out of range!" ); +// #ifdef TQT_CHECK_RANGE +// qWarning( "TQTimeEdit::stepUp: Focus section out of range!" ); // #endif // break; // } @@ -2039,7 +2012,7 @@ public: // d->changed = TRUE; // emit valueChanged( time() ); // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->tqrepaint( d->ed->rect(), FALSE ); // } // // @@ -2047,7 +2020,7 @@ public: // // */ // -// void QTimeEdit::stepDown() +// void TQTimeEdit::stepDown() // { // int sec = d->ed->mapSection( d->ed->focusSection() ); // @@ -2079,8 +2052,8 @@ public: // break; // default: // accepted = FALSE; -// #ifdef QT_CHECK_RANGE -// qWarning( "QTimeEdit::stepDown: Focus section out of range!" ); +// #ifdef TQT_CHECK_RANGE +// qWarning( "TQTimeEdit::stepDown: Focus section out of range!" ); // #endif // break; // } @@ -2088,7 +2061,7 @@ public: // d->changed = TRUE; // emit valueChanged( time() ); // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->tqrepaint( d->ed->rect(), FALSE ); // } // // @@ -2098,7 +2071,7 @@ public: // on \a sec. // */ // -// TQString QTimeEdit::sectionFormattedText( int sec ) +// TQString TQTimeEdit::sectionFormattedText( int sec ) // { // TQString txt; // txt = sectionText( sec ); @@ -2117,7 +2090,7 @@ public: // // */ // -// bool QTimeEdit::setFocusSection( int sec ) +// bool TQTimeEdit::setFocusSection( int sec ) // { // if ( sec != d->ed->focusSection() ) { // killTimer( d->timerId ); @@ -2141,7 +2114,7 @@ public: // range 0..24. // */ // -// void QTimeEdit::setHour( int h ) +// void TQTimeEdit::setHour( int h ) // { // if ( h < 0 ) // h = 0; @@ -2156,7 +2129,7 @@ public: // range 0..59. // */ // -// void QTimeEdit::setMinute( int m ) +// void TQTimeEdit::setMinute( int m ) // { // if ( m < 0 ) // m = 0; @@ -2171,7 +2144,7 @@ public: // range 0..59. // */ // -// void QTimeEdit::setSecond( int s ) +// void TQTimeEdit::setSecond( int s ) // { // if ( s < 0 ) // s = 0; @@ -2187,7 +2160,7 @@ public: // // */ // -// TQString QTimeEdit::sectionText( int sec ) +// TQString TQTimeEdit::sectionText( int sec ) // { // sec = d->ed->mapSection( sec ); // @@ -2214,12 +2187,12 @@ public: // if ( lAM ) // txt = *lAM; // else -// txt = TQString::fromLatin1( "AM" ); +// txt = TQString::tqfromLatin1( "AM" ); // } else { // if ( lPM ) // txt = *lPM; // else -// txt = TQString::fromLatin1( "PM" ); +// txt = TQString::tqfromLatin1( "PM" ); // } // break; // default: @@ -2233,7 +2206,7 @@ public: // Returns TRUE if \a h, \a m, and \a s are out of range. // */ // -// bool QTimeEdit::outOfRange( int h, int m, int s ) const +// bool TQTimeEdit::outOfRange( int h, int m, int s ) const // { // if ( TQTime::isValid( h, m, s ) ) { // TQTime currentTime( h, m, s ); @@ -2250,7 +2223,7 @@ public: // // */ // -// void QTimeEdit::addNumber( int sec, int num ) +// void TQTimeEdit::addNumber( int sec, int num ) // { // if ( sec == -1 ) // return; @@ -2369,8 +2342,8 @@ public: // if ( accepted ) // emit valueChanged( time() ); // d->overwrite = overwrite; -// d->timerId = startTimer( qApp->doubleClickInterval()*4 ); -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); +// d->ed->tqrepaint( d->ed->rect(), FALSE ); // } // // @@ -2381,7 +2354,7 @@ public: // remove the first number from \a sec by pressing the backspace key. // */ // -// void QTimeEdit::removeFirstNumber( int sec ) +// void TQTimeEdit::removeFirstNumber( int sec ) // { // if ( sec == -1 ) // return; @@ -2410,13 +2383,13 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->tqrepaint( d->ed->rect(), FALSE ); // } // // /*! \reimp // // */ -// void QTimeEdit::removeLastNumber( int sec ) +// void TQTimeEdit::removeLastNumber( int sec ) // { // if ( sec == -1 ) // return; @@ -2445,23 +2418,23 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->tqrepaint( d->ed->rect(), FALSE ); // } // // /*! \reimp // */ -// void QTimeEdit::resizeEvent( TQResizeEvent * ) +// void TQTimeEdit::resizeEvent( TQResizeEvent * ) // { // d->controls->resize( width(), height() ); // } // // /*! \reimp // */ -// TQSize QTimeEdit::sizeHint() const +// TQSize TQTimeEdit::tqsizeHint() const // { // constPolish(); // TQFontMetrics fm( font() ); -// int fw = style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); +// int fw = tqstyle().tqpixelMetric( 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; @@ -2469,17 +2442,17 @@ public: // if ( lAM ) // w += fm.width( *lAM ) + 4; // else -// w += fm.width( TQString::fromLatin1( "AM" ) ) + 4; +// w += fm.width( TQString::tqfromLatin1( "AM" ) ) + 4; // } // -// return TQSize( w, QMAX(h + fw * 2,20) ).expandedTo( TQApplication::globalStrut() ); +// return TQSize( w, TQMAX(h + fw * 2,20) ).expandedTo( TQApplication::globalStrut() ); // } // // /*! \reimp // */ -// TQSize QTimeEdit::minimumSizeHint() const +// TQSize TQTimeEdit::tqminimumSizeHint() const // { -// return sizeHint(); +// return tqsizeHint(); // } // // /*! @@ -2490,7 +2463,7 @@ public: // // // ### Remove in 4.0? // -// void QTimeEdit::updateButtons() +// void TQTimeEdit::updateButtons() // { // if ( !isEnabled() ) // return; @@ -2511,13 +2484,13 @@ public: /*! \class ExtDateTimeEdit ExtDatetimeedit.h - \brief The ExtDateTimeEdit class combines a ExtDateEdit and QTimeEdit + \brief The ExtDateTimeEdit class combines a ExtDateEdit and TQTimeEdit widget into a single widget for editing datetimes. \ingroup advanced \ingroup time - ExtDateTimeEdit consists of a ExtDateEdit and QTimeEdit widget placed + ExtDateTimeEdit consists of a ExtDateEdit and TQTimeEdit widget placed side by side and offers the functionality of both. The user can edit the date and time by using the keyboard or the arrow keys to increase/decrease date or time values. The Tab key can be used to @@ -2534,16 +2507,16 @@ public: It is recommended that the ExtDateTimeEdit is initialised with a datetime, e.g. \code - ExtDateTimeEdit *dateTimeEdit = new ExtDateTimeEdit( ExtDateTime::currentDateTime(), this ); - dateTimeEdit->dateEdit()->setRange( ExtDateTime::currentDate(), - ExtDateTime::currentDate().addDays( 7 ) ); + ExtDateTimeEdit *dateTimeEdit = new ExtDateTimeEdit( ExtDateTime::tqcurrentDateTime(), this ); + dateTimeEdit->dateEdit()->setRange( ExtDateTime::tqcurrentDate(), + ExtDateTime::tqcurrentDate().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 date of a week from now. Terminology: A ExtDateEdit widget consists of three 'sections', one - each for the year, month and day. Similarly a QTimeEdit consists + each for the year, month and day. Similarly a TQTimeEdit consists of three sections, one each for the hour, minute and second. The character that separates each date section is specified with setDateSeparator(); similarly setTimeSeparator() is used for the @@ -2551,15 +2524,15 @@ public: \image html datetimewidgets.png "Date Time Widgets" - \sa ExtDateEdit QTimeEdit + \sa ExtDateEdit TQTimeEdit */ /*! - Constructs an empty datetime edit with parent \a parent and called + Constructs an empty datetime edit with tqparent \a tqparent and called \a name. */ -ExtDateTimeEdit::ExtDateTimeEdit( TQWidget * parent, const char * name ) - : TQWidget( parent, name ) +ExtDateTimeEdit::ExtDateTimeEdit( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ) { init(); } @@ -2569,11 +2542,11 @@ ExtDateTimeEdit::ExtDateTimeEdit( TQWidget * parent, const char * name ) \overload Constructs a datetime edit with the initial value \a datetime, - parent \a parent and called \a name. + tqparent \a tqparent and called \a name. */ ExtDateTimeEdit::ExtDateTimeEdit( const ExtDateTime& datetime, - TQWidget * parent, const char * name ) - : TQWidget( parent, name ) + TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ) { init(); setDateTime( datetime ); @@ -2600,8 +2573,8 @@ ExtDateTimeEdit::~ExtDateTimeEdit() void ExtDateTimeEdit::resizeEvent( TQResizeEvent * ) { - int dw = de->sizeHint().width(); - int tw = te->sizeHint().width(); + int dw = de->tqsizeHint().width(); + int tw = te->tqsizeHint().width(); int w = width(); int h = height(); int extra = w - ( dw + tw ); @@ -2620,12 +2593,12 @@ void ExtDateTimeEdit::resizeEvent( TQResizeEvent * ) /*! \reimp */ -TQSize ExtDateTimeEdit::minimumSizeHint() const +TQSize ExtDateTimeEdit::tqminimumSizeHint() const { - TQSize dsh = de->minimumSizeHint(); - TQSize tsh = te->minimumSizeHint(); + TQSize dsh = de->tqminimumSizeHint(); + TQSize tsh = te->tqminimumSizeHint(); return TQSize( dsh.width() + tsh.width(), - QMAX( dsh.height(), tsh.height() ) ); + TQMAX( dsh.height(), tsh.height() ) ); } /*! \internal @@ -2635,26 +2608,26 @@ void ExtDateTimeEdit::init() { d = new ExtDateTimeEditPrivate(); de = new ExtDateEdit( this, "qt_datetime_dateedit" ); - te = new QTimeEdit( this, "qt_datetime_timeedit" ); + te = new TQTimeEdit( this, "qt_datetime_timeedit" ); d->adv = FALSE; connect( de, TQT_SIGNAL( valueChanged( const ExtDate& ) ), this, TQT_SLOT( newValue( const ExtDate& ) ) ); connect( te, TQT_SIGNAL( valueChanged( const TQTime& ) ), this, TQT_SLOT( newValue( const TQTime& ) ) ); setFocusProxy( de ); - setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); + tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } /*! \reimp */ -TQSize ExtDateTimeEdit::sizeHint() const +TQSize ExtDateTimeEdit::tqsizeHint() const { constPolish(); - TQSize dsh = de->sizeHint(); - TQSize tsh = te->sizeHint(); + TQSize dsh = de->tqsizeHint(); + TQSize tsh = te->tqsizeHint(); return TQSize( dsh.width() + tsh.width(), - QMAX( dsh.height(), tsh.height() ) ); + TQMAX( dsh.height(), tsh.height() ) ); } /*! @@ -2740,7 +2713,7 @@ bool ExtDateTimeEdit::autoAdvance() const */ /*! - \fn QTimeEdit* ExtDateTimeEdit::timeEdit() + \fn TQTimeEdit* ExtDateTimeEdit::timeEdit() Returns the internal widget used for editing the time part of the datetime. diff --git a/libkdeedu/extdate/extdatetimeedit.h b/libkdeedu/extdate/extdatetimeedit.h index 4bcf78c8..3aad17d9 100644 --- a/libkdeedu/extdate/extdatetimeedit.h +++ b/libkdeedu/extdate/extdatetimeedit.h @@ -5,7 +5,7 @@ ** ** Created : 001103 ** -** Original QDateTimeEdit Copyright (C) 2000 Trolltech AS. All rights reserved. +** Original TQDateTimeEdit Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** >> modifications to introduce ExtDate (C) 2004 Jason Harris ** >> ExtDate modifications are licensed under the GPL: http://www.gnu.org/licenses/gpl.html @@ -25,23 +25,24 @@ #ifndef EXTDATETIMEEDIT_H #define EXTDATETIMEEDIT_H -#ifndef QT_H +#ifndef TQT_H #include #include -#endif // QT_H +#endif // TQT_H #include "extdatetime.h" -#ifndef QT_NO_DATETIMEEDIT +#ifndef TQT_NO_DATETIMEEDIT -class QTimeEdit; +class TQTimeEdit; -class ExtDateTimeEditBase : public QWidget +class ExtDateTimeEditBase : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ExtDateTimeEditBase( TQWidget* parent=0, const char* name=0 ) - : TQWidget( parent, name ) {} + ExtDateTimeEditBase( TQWidget* tqparent=0, const char* name=0 ) + : TQWidget( tqparent, name ) {} virtual bool setFocusSection( int sec ) = 0; virtual TQString sectionFormattedText( int sec ) = 0; @@ -53,7 +54,7 @@ public slots: virtual void stepDown() = 0; private: -#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator= +#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator= ExtDateTimeEditBase( const ExtDateTimeEditBase & ); ExtDateTimeEditBase &operator=( const ExtDateTimeEditBase & ); #endif @@ -64,16 +65,17 @@ class ExtDateEditPrivate; class KDE_EXPORT ExtDateEdit : public ExtDateTimeEditBase { Q_OBJECT + TQ_OBJECT Q_ENUMS( Order ) - Q_PROPERTY( Order order READ order WRITE setOrder ) -// Q_PROPERTY( ExtDate date READ date WRITE setDate ) - Q_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) -// Q_PROPERTY( ExtDate maxValue READ maxValue WRITE setMaxValue ) -// Q_PROPERTY( ExtDate minValue READ minValue WRITE setMinValue ) + TQ_PROPERTY( Order order READ order WRITE setOrder ) +// TQ_PROPERTY( ExtDate date READ date WRITE setDate ) + TQ_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) +// TQ_PROPERTY( ExtDate maxValue READ maxValue WRITE setMaxValue ) +// TQ_PROPERTY( ExtDate minValue READ minValue WRITE setMinValue ) public: - ExtDateEdit( TQWidget* parent=0, const char* name=0 ); - ExtDateEdit( const ExtDate& date, TQWidget* parent=0, const char* name=0 ); + ExtDateEdit( TQWidget* tqparent=0, const char* name=0 ); + ExtDateEdit( const ExtDate& date, TQWidget* tqparent=0, const char* name=0 ); ~ExtDateEdit(); enum Order { DMY /**< Day-Month-Year */, @@ -81,8 +83,8 @@ public: YMD /**< Year-Month-Day, also the default */, YDM /**< Year-Day-Month @deprecated Included for completeness. */ }; - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; public slots: virtual void setDate( const ExtDate& date ); @@ -136,23 +138,24 @@ private: TQString sectionText( int sec ) const; ExtDateEditPrivate* d; -#if defined(Q_DISABLE_COPY) +#if defined(TQ_DISABLE_COPY) ExtDateEdit( const ExtDateEdit & ); ExtDateEdit &operator=( const ExtDateEdit & ); #endif }; -// class QTimeEditPrivate; +// class TQTimeEditPrivate; // -// class Q_EXPORT QTimeEdit : public ExtDateTimeEditBase +// class TQ_EXPORT TQTimeEdit : public ExtDateTimeEditBase // { // Q_OBJECT -// Q_SETS( Display ) -// Q_PROPERTY( TQTime time READ time WRITE setTime ) -// Q_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) -// Q_PROPERTY( TQTime maxValue READ maxValue WRITE setMaxValue ) -// Q_PROPERTY( TQTime minValue READ minValue WRITE setMinValue ) -// Q_PROPERTY( Display display READ display WRITE setDisplay ) +// TQ_OBJECT +// TQ_SETS( Display ) +// TQ_PROPERTY( TQTime time READ time WRITE setTime ) +// TQ_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) +// TQ_PROPERTY( TQTime maxValue READ maxValue WRITE setMaxValue ) +// TQ_PROPERTY( TQTime minValue READ minValue WRITE setMinValue ) +// TQ_PROPERTY( Display display READ display WRITE setDisplay ) // // public: // enum Display { @@ -163,12 +166,12 @@ private: // AMPM = 0x10 // }; // -// QTimeEdit( TQWidget* parent=0, const char* name=0 ); -// QTimeEdit( const TQTime& time, TQWidget* parent=0, const char* name=0 ); -// ~QTimeEdit(); +// TQTimeEdit( TQWidget* tqparent=0, const char* name=0 ); +// TQTimeEdit( const TQTime& time, TQWidget* tqparent=0, const char* name=0 ); +// ~TQTimeEdit(); // -// TQSize sizeHint() const; -// TQSize minimumSizeHint() const; +// TQSize tqsizeHint() const; +// TQSize tqminimumSizeHint() const; // // public slots: // virtual void setTime( const TQTime& time ); @@ -217,30 +220,31 @@ private: // private: // void init(); // TQString sectionText( int sec ); -// QTimeEditPrivate* d; +// TQTimeEditPrivate* d; // -// #if defined(Q_DISABLE_COPY) -// QTimeEdit( const QTimeEdit & ); -// QTimeEdit &operator=( const QTimeEdit & ); +// #if defined(TQ_DISABLE_COPY) +// TQTimeEdit( const TQTimeEdit & ); +// TQTimeEdit &operator=( const TQTimeEdit & ); // #endif // }; // class ExtDateTimeEditPrivate; -class KDE_EXPORT ExtDateTimeEdit : public QWidget +class KDE_EXPORT ExtDateTimeEdit : public TQWidget { Q_OBJECT -// Q_PROPERTY( ExtDateTime dateTime READ dateTime WRITE setDateTime ) + TQ_OBJECT +// TQ_PROPERTY( ExtDateTime dateTime READ dateTime WRITE setDateTime ) public: - ExtDateTimeEdit( TQWidget* parent=0, const char* name=0 ); - ExtDateTimeEdit( const ExtDateTime& datetime, TQWidget* parent=0, + ExtDateTimeEdit( TQWidget* tqparent=0, const char* name=0 ); + ExtDateTimeEdit( const ExtDateTime& datetime, TQWidget* tqparent=0, const char* name=0 ); ~ExtDateTimeEdit(); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; public slots: virtual void setDateTime( const ExtDateTime & dt ); @@ -249,7 +253,7 @@ public: ExtDateTime dateTime() const; ExtDateEdit* dateEdit() { return de; } - QTimeEdit* timeEdit() { return te; } + TQTimeEdit* timeEdit() { return te; } virtual void setAutoAdvance( bool advance ); bool autoAdvance() const; @@ -258,31 +262,31 @@ signals: void valueChanged( const ExtDateTime& datetime ); protected: - // ### make init() private in Qt 4.0 + // ### make init() private in TQt 4.0 void init(); void resizeEvent( TQResizeEvent * ); protected slots: - // ### make these two functions private in Qt 4.0, + // ### make these two functions private in TQt 4.0, // and merge them into one with no parameter void newValue( const ExtDate& d ); void newValue( const TQTime& t ); private: ExtDateEdit* de; - QTimeEdit* te; + TQTimeEdit* te; ExtDateTimeEditPrivate* d; -#if defined(Q_DISABLE_COPY) +#if defined(TQ_DISABLE_COPY) ExtDateTimeEdit( const ExtDateTimeEdit & ); ExtDateTimeEdit &operator=( const ExtDateTimeEdit & ); #endif }; -class QNumberSection +class TQNumberSection { public: - QNumberSection( int selStart = 0, int selEnd = 0, bool separat = TRUE, int actual = -1 ) + TQNumberSection( int selStart = 0, int selEnd = 0, bool separat = TRUE, int actual = -1 ) : selstart( selStart ), selend( selEnd ), act( actual ), sep( separat ) {} int selectionStart() const { return selstart; } @@ -292,7 +296,7 @@ public: int width() const { return selend - selstart; } int index() const { return act; } bool separator() const { return sep; } - Q_DUMMY_COMPARISON_OPERATOR( QNumberSection ) + TQ_DUMMY_COMPARISON_OPERATOR( TQNumberSection ) private: int selstart :12; int selend :12; @@ -302,11 +306,12 @@ private: class ExtDateTimeEditorPrivate; -class ExtDateTimeEditor : public QWidget +class ExtDateTimeEditor : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ExtDateTimeEditor( ExtDateTimeEditBase * parent=0, + ExtDateTimeEditor( ExtDateTimeEditBase * tqparent=0, const char * name=0 ); ~ExtDateTimeEditor(); @@ -318,7 +323,7 @@ public: int focusSection() const; bool setFocusSection( int s ); - void appendSection( const QNumberSection& sec ); + void appendSection( const TQNumberSection& sec ); void clearSections(); void setSectionSelection( int sec, int selstart, int selend ); bool eventFilter( TQObject *o, TQEvent *e ); @@ -337,5 +342,34 @@ private: ExtDateTimeEditorPrivate* d; }; +class ExtDateTimeSpinWidget : public TQSpinWidget +{ + Q_OBJECT + TQ_OBJECT +public: + ExtDateTimeSpinWidget( TQWidget *tqparent, const char *name ) + : TQSpinWidget( tqparent, name ) + { + } + +protected: +#ifndef TQT_NO_WHEELEVENT + void wheelEvent( TQWheelEvent *e ) + { + ExtDateTimeEditor *editor = (ExtDateTimeEditor*)editWidget()->qt_cast( "ExtDateTimeEditor" ); + Q_ASSERT( editor ); + if ( !editor ) + return; + + int section = editor->sectionAt( e->pos() ); + editor->setFocusSection( section ); + + if ( section == -1 ) + return; + TQSpinWidget::wheelEvent( e ); + } +#endif +}; + #endif #endif diff --git a/libkdeedu/extdate/extdatewidget.cpp b/libkdeedu/extdate/extdatewidget.cpp index 5f5d19d6..f787293f 100644 --- a/libkdeedu/extdate/extdatewidget.cpp +++ b/libkdeedu/extdate/extdatewidget.cpp @@ -30,13 +30,13 @@ #include "extdatewidget.h" #include "extcalendarsystemgregorian.h" -class ExtDateWidgetSpinBox : public QSpinBox +class ExtDateWidgetSpinBox : public TQSpinBox { public: - ExtDateWidgetSpinBox(int min, int max, TQWidget *parent) - : TQSpinBox(min, max, 1, parent) + ExtDateWidgetSpinBox(int min, int max, TQWidget *tqparent) + : TQSpinBox(min, max, 1, tqparent) { - editor()->setAlignment(AlignRight); + editor()->tqsetAlignment(AlignRight); } }; @@ -53,16 +53,16 @@ public: }; -ExtDateWidget::ExtDateWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +ExtDateWidget::ExtDateWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { - init(ExtDate::currentDate()); + init(ExtDate::tqcurrentDate()); setDate(ExtDate()); } -ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, +ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { init(date); setDate(date); @@ -74,8 +74,8 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, // { // d = new ExtDateWidgetPrivate; // KLocale *locale = KGlobal::locale(); -// TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); -// layout->setAutoAdd(true); +// TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); +// tqlayout->setAutoAdd(true); // d->m_day = new ExtDateWidgetSpinBox(1, 1, this); // d->m_month = new TQComboBox(false, this); // for (int i = 1; ; ++i) @@ -98,8 +98,8 @@ void ExtDateWidget::init(const ExtDate& date) { d = new ExtDateWidgetPrivate; //KLocale *locale = KGlobal::locale(); - TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + tqlayout->setAutoAdd(true); d->m_day = new ExtDateWidgetSpinBox(1, 1, this); d->m_month = new TQComboBox(false, this); for (int i = 1; ; ++i) @@ -157,15 +157,15 @@ void ExtDateWidget::slotDateChanged( ) int y,m,day; y = d->m_year->value(); - y = QMIN(QMAX(y, d->calendar->minValidYear()), d->calendar->maxValidYear()); + y = TQMIN(TQMAX(y, d->calendar->minValidYear()), d->calendar->maxValidYear()); d->calendar->setYMD(date, y, 1, 1); m = d->m_month->currentItem()+1; - m = QMIN(QMAX(m,1), d->calendar->monthsInYear(date)); + m = TQMIN(TQMAX(m,1), d->calendar->monthsInYear(date)); d->calendar->setYMD(date, y, m, 1); day = d->m_day->value(); - day = QMIN(QMAX(day,1), d->calendar->daysInMonth(date)); + day = TQMIN(TQMAX(day,1), d->calendar->daysInMonth(date)); d->calendar->setYMD(date, y, m, day); setDate(date); diff --git a/libkdeedu/extdate/extdatewidget.h b/libkdeedu/extdate/extdatewidget.h index f2fd3045..2aa2ee0d 100644 --- a/libkdeedu/extdate/extdatewidget.h +++ b/libkdeedu/extdate/extdatewidget.h @@ -32,21 +32,22 @@ * @short A pushbutton to display or allow user selection of a date. * @version $Id$ */ -class KDE_EXPORT ExtDateWidget : public QWidget +class KDE_EXPORT ExtDateWidget : public TQWidget { Q_OBJECT -// Q_PROPERTY( ExtDate date READ date WRITE setDate ) + TQ_OBJECT +// TQ_PROPERTY( ExtDate date READ date WRITE setDate ) public: /** * Constructs a date selection widget, initialized to the current CPU date. */ - ExtDateWidget( TQWidget *parent=0, const char *name=0 ); + ExtDateWidget( TQWidget *tqparent=0, const char *name=0 ); /** * Constructs a date selection widget with the initial date set to @p date. */ - ExtDateWidget( const ExtDate &date, TQWidget *parent=0, const char *name=0 ); + ExtDateWidget( const ExtDate &date, TQWidget *tqparent=0, const char *name=0 ); /** * Destructs the date selection widget. diff --git a/libkdeedu/extdate/test_extdate.cc b/libkdeedu/extdate/test_extdate.cc index d63d1558..63b2120b 100644 --- a/libkdeedu/extdate/test_extdate.cc +++ b/libkdeedu/extdate/test_extdate.cc @@ -5,7 +5,7 @@ void test1_unit(int a_year) { - std::cout << a_year << " (QDate|ExtDate): " << ((TQDate::leapYear(a_year)) ? "yes" : "no") + std::cout << a_year << " (TQDate|ExtDate): " << ((TQDate::leapYear(a_year)) ? "yes" : "no") <<"|"<< ((ExtDate::leapYear(a_year)) ? "yes" : "no") << std::endl; } @@ -46,7 +46,7 @@ void test1() void test2_unit(int y, int m, int d) { - QDate q(y, m, d); + TQDate q(y, m, d); ExtDate e(y, m, d); int q_week_number = q.dayOfWeek(); int e_week_number = e.dayOfWeek(); @@ -128,7 +128,7 @@ void test2() void test3_unit(int y, int m, int d, int dm) { - QDate q(y, m, d); + TQDate q(y, m, d); ExtDate e(y, m, d); TQDate q2 = q.addMonths(dm); ExtDate e2 = e.addMonths(dm); @@ -157,9 +157,9 @@ void test3() } void test4_unit(int y, int m, int d, int dy) { - QDate q(y, m, d); + TQDate q(y, m, d); ExtDate e(y, m, d); - QDate q2 = q.addYears(dy); + TQDate q2 = q.addYears(dy); ExtDate e2 = e.addYears(dy); std::cout << e.toString("%d.%m.%Y").local8Bit() << " + " << dy << " years :: ExtDate : " << e2.toString().local8Bit() << " TQDate : " @@ -225,7 +225,7 @@ void test5() uint i; std::cout << "Date.toString(\"...\")" << std::endl; - std::cout << "Ext Format : ExtDate :: Q Format : QDate\n" << std::endl; + std::cout << "Ext Format : ExtDate :: Q Format : TQDate\n" << std::endl; for (i = 0 ; i < sizeof(q_set_of_formats)/sizeof(q_set_of_formats[0]) ; i++) { @@ -277,16 +277,16 @@ void test6() void test7() { std::cout << "Express the current date:\n" << std::endl; - TQDate q = TQDate::currentDate(Qt::LocalTime); - ExtDate e = ExtDate::currentDate(Qt::TimeSpec(Qt::LocalTime)); - std::cout << "Qt::LocalTime :: ExtDate : " << e.toString().local8Bit() << " TQDate : " + TQDate q = TQDate::tqcurrentDate(TQt::LocalTime); + ExtDate e = ExtDate::tqcurrentDate(TQt::TimeSpec(TQt::LocalTime)); + std::cout << "TQt::LocalTime :: ExtDate : " << e.toString().local8Bit() << " TQDate : " << q.toString().local8Bit() << std::endl; - q = TQDate::currentDate(Qt::UTC); - e = ExtDate::currentDate(Qt::UTC); - std::cout << "Qt::UTC :: ExtDate : " << e.toString().local8Bit() << " TQDate : " + q = TQDate::tqcurrentDate(TQt::UTC); + e = ExtDate::tqcurrentDate(TQt::UTC); + std::cout << "TQt::UTC :: ExtDate : " << e.toString().local8Bit() << " TQDate : " << q.toString().local8Bit() << std::endl; - q = TQDate::currentDate(); - e = ExtDate::currentDate(); + q = TQDate::tqcurrentDate(); + e = ExtDate::tqcurrentDate(); std::cout << " :: 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::currentDateTime(); - ExtDateTime e = ExtDateTime::currentDateTime(); + TQDateTime q = TQDateTime::tqcurrentDateTime(); + ExtDateTime e = ExtDateTime::tqcurrentDateTime(); std::cout << q.toString().local8Bit() << " : " << e.toString().local8Bit() << std::endl; std::cout << "--------------------" << std::endl; diff --git a/libkdeedu/extdate/testwidget.cpp b/libkdeedu/extdate/testwidget.cpp index 0267ddeb..a6489cce 100644 --- a/libkdeedu/extdate/testwidget.cpp +++ b/libkdeedu/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::currentDate(), w ); - edw = new ExtDateWidget( ExtDate::currentDate(), w ); + kdw = new KDateWidget( TQDate::tqcurrentDate(), w ); + edw = new ExtDateWidget( ExtDate::tqcurrentDate(), w ); glay->addWidget( kdpLabel, 0, 0 ); glay->addWidget( edpLabel, 0, 1 ); diff --git a/libkdeedu/extdate/testwidget.h b/libkdeedu/extdate/testwidget.h index ed6fb70b..283cb3d4 100644 --- a/libkdeedu/extdate/testwidget.h +++ b/libkdeedu/extdate/testwidget.h @@ -31,8 +31,9 @@ class ExtDate; class TestWidget : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - TestWidget( TQWidget *parent, const char *name ); + TestWidget( TQWidget *tqparent, const char *name ); ~TestWidget() {} public slots: diff --git a/libkdeedu/kdeeducore/keduvocdata.cpp b/libkdeedu/kdeeducore/keduvocdata.cpp index c59d7595..ca289f7d 100644 --- a/libkdeedu/kdeeducore/keduvocdata.cpp +++ b/libkdeedu/kdeeducore/keduvocdata.cpp @@ -69,13 +69,13 @@ TQString KEduVocDataItem::getText(const TQString &tagName) const return element.text(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/libkdeedu/kdeeduplot/kplotaxis.h b/libkdeedu/kdeeduplot/kplotaxis.h index 107620b8..3209b18c 100644 --- a/libkdeedu/kdeeduplot/kplotaxis.h +++ b/libkdeedu/kdeeduplot/kplotaxis.h @@ -77,7 +77,7 @@ public: private: bool m_visible; ///< Property "visible" defines if Axis is drawn or not. - QString m_label; ///< The label of the axis. + TQString m_label; ///< The label of the axis. int m_labelFieldWidth; ///< Field width for number labels, see TQString::arg(). char m_labelFmt; ///< Number format for number labels, see TQString::arg(). int m_labelPrec; ///< Number precision for number labels, see TQString::arg(). diff --git a/libkdeedu/kdeeduplot/kplotobject.h b/libkdeedu/kdeeduplot/kplotobject.h index 2474fc32..f1074cb6 100644 --- a/libkdeedu/kdeeduplot/kplotobject.h +++ b/libkdeedu/kdeeduplot/kplotobject.h @@ -82,7 +82,7 @@ private: *@short Encapsulates an object to be plotted in a KPlotWidget. *@author Jason Harris *@version 1.0 - *Each KPlotObject consists of a list of QPoints, an object type, a color, a size, + *Each KPlotObject consists of a list of TQPoints, an object type, a color, a size, *and a TQString name. An additional integer (param) specifies something further *about the object's appearance, depending on its type. There is a draw function *for plotting the object on a KPlotWidget's TQPainter. @@ -101,7 +101,7 @@ public: /**@enum CPARAM *Parameter specifying the kind of line. These are numerically equal to - *the Qt::PenStyle enum values. + *the TQt::PenStyle enum values. */ enum CPARAM { NO_LINE=0, SOLID=1, DASHED=2, DOTTED=3, DASHDOTTED=4, DASHDOTDOTTED=5, UNKNOWN_CURVE }; @@ -187,7 +187,7 @@ public: */ void removePoint( unsigned int index ); -/**@return the number of QPoints currently in the list +/**@return the number of TQPoints currently in the list */ unsigned int count() const { return pList.count(); } diff --git a/libkdeedu/kdeeduplot/kplotwidget.cpp b/libkdeedu/kdeeduplot/kplotwidget.cpp index 99e9b321..22fba3b0 100644 --- a/libkdeedu/kdeeduplot/kplotwidget.cpp +++ b/libkdeedu/kdeeduplot/kplotwidget.cpp @@ -23,8 +23,8 @@ #include "kplotwidget.h" #include "kplotwidget.moc" -KPlotWidget::KPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name ) - : TQWidget( parent, name, WNoAutoErase ), +KPlotWidget::KPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name ) + : TQWidget( tqparent, name, WNoAutoErase ), dXtick(0.0), dYtick(0.0), nmajX(0), nminX(0), nmajY(0), nminY(0), ShowTickMarks( true ), ShowTickLabels( true ), ShowGrid( false ) @@ -178,7 +178,7 @@ void KPlotWidget::drawObjects( TQPainter *p ) { } } - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); break; } @@ -195,14 +195,14 @@ void KPlotWidget::drawObjects( TQPainter *p ) { case KPlotObject::LABEL : //draw label centered at point in x, and slightly below point in y. { TQPoint q = po->points()->first()->qpoint( PixRect, DataRect ); - p->drawText( q.x()-20, q.y()+6, 40, 10, Qt::AlignCenter | Qt::DontClip, po->name() ); + p->drawText( q.x()-20, q.y()+6, 40, 10, TQt::AlignCenter | TQt::DontClip, po->name() ); break; } case KPlotObject::POLYGON : { p->setPen( TQPen( TQColor( po->color() ), po->size(), (TQPen::PenStyle)po->param() ) ); - p->setBrush( po->color() ); + p->setBrush( TQColor( po->color() ) ); TQPointArray a( po->count() ); @@ -223,7 +223,7 @@ void KPlotWidget::drawObjects( TQPainter *p ) { double KPlotWidget::dmod( double a, double b ) { return ( b * ( ( a / b ) - int( a / b ) ) ); } void KPlotWidget::drawBox( TQPainter *p ) { - //First, fill in padding region with bgColor() to mask out-of-bounds plot data + //First, fill in padding region with bgColor() to tqmask out-of-bounds plot data p->setPen( bgColor() ); p->setBrush( bgColor() ); @@ -259,7 +259,7 @@ void KPlotWidget::drawBox( TQPainter *p ) { } p->setPen( fgColor() ); - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); if (BottomAxis.isVisible() || LeftAxis.isVisible()) p->drawRect( PixRect ); //box outline @@ -294,10 +294,10 @@ void KPlotWidget::drawBox( TQPainter *p ) { double lab = x0 + ix*dXtick; if ( fabs(lab)/dXtick < 0.00001 ) lab = 0.0; //fix occassional roundoff error with "0.0" label - TQString str = TQString( "%1" ).arg( lab, BottomAxis.labelFieldWidth(), BottomAxis.labelFmt(), BottomAxis.labelPrec() ); + TQString str = TQString( "%1" ).tqarg( lab, BottomAxis.labelFieldWidth(), BottomAxis.labelFmt(), BottomAxis.labelPrec() ); if ( px > 0 && px < PixRect.width() ) { TQRect r( px - BIGTICKSIZE, PixRect.height()+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } } @@ -316,7 +316,7 @@ void KPlotWidget::drawBox( TQPainter *p ) { // Draw X Axis Label if ( ! BottomAxis.label().isEmpty() ) { TQRect r( 0, PixRect.height() + 2*YPADDING, PixRect.width(), YPADDING ); - p->drawText( r, Qt::AlignCenter, BottomAxis.label() ); + p->drawText( r, TQt::AlignCenter, BottomAxis.label() ); } } @@ -340,10 +340,10 @@ void KPlotWidget::drawBox( TQPainter *p ) { double lab = y0 + iy*dYtick; if ( fabs(lab)/dYtick < 0.00001 ) lab = 0.0; //fix occassional roundoff error with "0.0" label - TQString str = TQString( "%1" ).arg( lab, LeftAxis.labelFieldWidth(), LeftAxis.labelFmt(), LeftAxis.labelPrec() ); + TQString str = TQString( "%1" ).tqarg( lab, LeftAxis.labelFieldWidth(), LeftAxis.labelFmt(), LeftAxis.labelPrec() ); if ( py > 0 && py < PixRect.height() ) { TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } } @@ -368,7 +368,7 @@ void KPlotWidget::drawBox( TQPainter *p ) { p->rotate( -90.0 ); TQRect r( 0, 0, PixRect.height(), XPADDING ); - p->drawText( r, Qt::AlignCenter, LeftAxis.label() ); //draw the label, now that we are sideways + p->drawText( r, TQt::AlignCenter, LeftAxis.label() ); //draw the label, now that we are sideways p->restore(); //restore translation/rotation state } diff --git a/libkdeedu/kdeeduplot/kplotwidget.h b/libkdeedu/kdeeduplot/kplotwidget.h index 5ed550ec..2545ff83 100644 --- a/libkdeedu/kdeeduplot/kplotwidget.h +++ b/libkdeedu/kdeeduplot/kplotwidget.h @@ -40,16 +40,17 @@ class TQPixmap; class KDE_EXPORT KPlotWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /**@short Constructor. Sets the primary x and y limits in data units. *@param x1 the minimum X value in data units *@param x2 the maximum X value in data units *@param y1 the minimum Y value in data units *@param y2 the maximum Y value in data units - *@param parent the parent widget + *@param tqparent the tqparent widget *@param name name label for the KPlotWidget */ - KPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 ); + KPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=0, const char* name=0 ); /**Destructor (empty) */ @@ -99,7 +100,7 @@ public: *@param i the index of th item to be replaced *@param o pointer to the replacement KPlotObject */ - virtual void replaceObject( int i, KPlotObject *o ) { ObjectList.replace( i, o ); } + virtual void replaceObject( int i, KPlotObject *o ) { ObjectList.tqreplace( i, o ); } /**@return the number of KPlotObjects in the list */ @@ -212,7 +213,7 @@ public: KPlotAxis LeftAxis; protected: - /**@short the paint event handler, executed when update() or repaint() is called. + /**@short the paint event handler, executed when update() or tqrepaint() is called. */ virtual void paintEvent( TQPaintEvent* /* e */ ); diff --git a/libkdeedu/kdeeduui/kdeeduglossary.cpp b/libkdeedu/kdeeduui/kdeeduglossary.cpp index 1b0902b1..ff108975 100644 --- a/libkdeedu/kdeeduui/kdeeduglossary.cpp +++ b/libkdeedu/kdeeduui/kdeeduglossary.cpp @@ -41,25 +41,25 @@ Glossary::~Glossary() bool Glossary::loadLayout( TQDomDocument &Document, const KURL& url ) { - TQFile layoutFile( url.path() ); + TQFile tqlayoutFile( url.path() ); - if (!layoutFile.exists()) + if (!tqlayoutFile.exists()) { - kdDebug() << "no such file: " << layoutFile.name() << endl; + kdDebug() << "no such file: " << tqlayoutFile.name() << endl; return false; } - if (!layoutFile.open(IO_ReadOnly)) + if (!tqlayoutFile.open(IO_ReadOnly)) return false; ///Check if document is well-formed - if (!Document.setContent(&layoutFile)) + if (!Document.setContent(&tqlayoutFile)) { kdDebug() << "wrong xml" << endl; - layoutFile.close(); + tqlayoutFile.close(); return false; } - layoutFile.close(); + tqlayoutFile.close(); return true; } @@ -100,8 +100,8 @@ void Glossary::fixImagePath() for ( ; it != itEnd ; ++it ) { - ( *it )->setDesc( ( *it )->desc().replace("[img]", firstpart ) ); - ( *it )->setDesc( ( *it )->desc().replace("[/img]", "\" />" ) ); + ( *it )->setDesc( ( *it )->desc().tqreplace("[img]", firstpart ) ); + ( *it )->setDesc( ( *it )->desc().tqreplace("[/img]", "\" />" ) ); } } @@ -136,15 +136,15 @@ TQValueList Glossary::readItems( TQDomDocument &itemDocument ) item->setName( i18n( nameNode.toElement( ).text().utf8() ) ); - item->setDesc( desc.replace("[b]", "" ) ); - item->setDesc( item->desc().replace("[/b]", "" ) ); - item->setDesc( item->desc().replace("[i]", "" ) ); - item->setDesc( item->desc().replace("[/i]", "" ) ); - item->setDesc( item->desc().replace("[sub]", "" ) ); - item->setDesc( item->desc().replace("[/sub]", "" ) ); - item->setDesc( item->desc().replace("[sup]", "" ) ); - item->setDesc( item->desc().replace("[/sup]", "" ) ); - item->setDesc( item->desc().replace("[br]", "
    " ) ); + item->setDesc( desc.tqreplace("[b]", "" ) ); + item->setDesc( item->desc().tqreplace("[/b]", "" ) ); + item->setDesc( item->desc().tqreplace("[i]", "" ) ); + item->setDesc( item->desc().tqreplace("[/i]", "" ) ); + item->setDesc( item->desc().tqreplace("[sub]", "" ) ); + item->setDesc( item->desc().tqreplace("[/sub]", "" ) ); + item->setDesc( item->desc().tqreplace("[sup]", "" ) ); + item->setDesc( item->desc().tqreplace("[/sup]", "" ) ); + item->setDesc( item->desc().tqreplace("[br]", "
    " ) ); refNodeList = refNode.elementsByTagName( "refitem" ); for ( uint it = 0; it < refNodeList.count(); it++ ) @@ -162,8 +162,8 @@ TQValueList Glossary::readItems( TQDomDocument &itemDocument ) -GlossaryDialog::GlossaryDialog( bool folded, TQWidget *parent, const char *name) - : KDialogBase( Plain, i18n( "Glossary" ), Close, NoDefault, parent, name, false ) +GlossaryDialog::GlossaryDialog( bool folded, TQWidget *tqparent, const char *name) + : KDialogBase( Plain, i18n( "Glossary" ), Close, NoDefault, tqparent, name, false ) { //this string will be used for all items. If a backgroundpicture should //be used call Glossary::setBackgroundPicture(). @@ -216,7 +216,7 @@ GlossaryDialog::~GlossaryDialog() void GlossaryDialog::keyPressEvent(TQKeyEvent* e) { - if (e->key() == Qt::Key_Return) { + if (e->key() == TQt::Key_Return) { e->ignore(); } KDialogBase::keyPressEvent(e); @@ -396,7 +396,7 @@ TQString GlossaryItem::parseReferences() const htmlcode += "
    "; else first = false; - htmlcode += TQString( "%2" ).arg( m_ref[i], m_ref[i] ); + htmlcode += TQString( "%2" ).tqarg( m_ref[i], m_ref[i] ); } return htmlcode; diff --git a/libkdeedu/kdeeduui/kdeeduglossary.h b/libkdeedu/kdeeduui/kdeeduglossary.h index 44b0cf85..e6a0622f 100644 --- a/libkdeedu/kdeeduui/kdeeduglossary.h +++ b/libkdeedu/kdeeduui/kdeeduglossary.h @@ -148,7 +148,7 @@ class Glossary TQString m_picturepath; /** - * Load the layout from an XML file. + * Load the tqlayout from an XML file. * * @param doc The TQDomDocument which will contain the read XML * contents. @@ -174,7 +174,7 @@ class Glossary * A GlossaryItem stores the information of the content of * the item and its name. Furthermore, every item can have * a number of pictures or references associated to it. - * These are stored as QStringLists. + * These are stored as TQStringLists. */ class GlossaryItem { @@ -240,9 +240,10 @@ class GlossaryItem class GlossaryDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GlossaryDialog( bool folded = true, TQWidget *parent=0, const char *name=0); + GlossaryDialog( bool folded = true, TQWidget *tqparent=0, const char *name=0); ~GlossaryDialog(); void keyPressEvent(TQKeyEvent*); diff --git a/libkdeedu/kdeeduui/kedusimpleentrydlg.h b/libkdeedu/kdeeduui/kedusimpleentrydlg.h index f110fab6..d84fe00c 100644 --- a/libkdeedu/kdeeduui/kedusimpleentrydlg.h +++ b/libkdeedu/kdeeduui/kedusimpleentrydlg.h @@ -7,6 +7,7 @@ class KEduSimpleEntryDlg : public KEduSimpleEntryDlgForm { Q_OBJECT + TQ_OBJECT public: diff --git a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui b/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui index 32fa6b68..82c5203f 100644 --- a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui +++ b/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui @@ -1,10 +1,10 @@ KEduSimpleEntryDlgForm - + Simple_entry_dialog - + 0 0 @@ -15,11 +15,11 @@ Simple Entry Dialog - + e_original - + 40 80 @@ -28,11 +28,11 @@ - + e_translation - + 40 180 @@ -41,11 +41,11 @@ - + PushButton1 - + 50 360 @@ -57,11 +57,11 @@ &OK - + PushButton1_2 - + 460 360 @@ -73,11 +73,11 @@ C&ancel - + TextLabel1 - + 40 50 @@ -89,11 +89,11 @@ Original: - + TextLabel1_2 - + 40 150 @@ -106,5 +106,5 @@ - +