From ba6b21419810544e0c8666969d21d72161d9084c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:20:25 -0600 Subject: [PATCH] Rename obsolete tq methods to standard names --- kalzium/ChangeLog | 2 +- kalzium/src/detailinfodlg.cpp | 6 +- kalzium/src/elementdataviewer.cpp | 10 +-- kalzium/src/eqchemview.cpp | 2 +- kalzium/src/kalzium.h | 2 +- kalzium/src/plotsetupwidget.ui | 6 +- kalzium/src/settings_colors.ui | 66 ++++++++--------- kalzium/src/somwidget.ui | 4 +- kalzium/src/spectrumview.ui | 4 +- kalzium/src/timewidget.ui | 4 +- kanagram/src/mainsettingswidget.ui | 4 +- kanagram/src/vocabeditwidget.ui | 14 ++-- kanagram/src/vocabsettingswidget.ui | 4 +- kbruch/ChangeLog | 4 +- kbruch/src/exercisecompare.cpp | 6 +- kbruch/src/exerciseconvert.cpp | 6 +- kbruch/src/exercisefactorize.cpp | 74 +++++++++---------- kbruch/src/exercisefactorize.h | 16 ++-- kbruch/src/statisticsview.cpp | 16 ++-- kbruch/src/statisticsview.h | 2 +- kbruch/src/taskview.cpp | 8 +- kbruch/src/taskvieweroptionsbase.ui | 4 +- keduca/keduca/kcheckeduca.cpp | 6 +- keduca/keduca/keducaprefs.cpp | 12 +-- keduca/keduca/kradioeduca.cpp | 6 +- keduca/keducabuilder/kcontroladdeditbase.ui | 14 ++-- keduca/keducabuilder/kcontrolheader.cpp | 18 ++--- keduca/keducabuilder/kcontrolheaderbase.ui | 2 +- keduca/libkeduca/kgallerydialogbase.ui | 10 +-- kgeography/src/kgeography.cpp | 4 +- kgeography/src/mapasker.cpp | 2 +- khangman/khangman/advanced.ui | 2 +- khangman/khangman/khangman.cpp | 2 +- khangman/khangman/normal.ui | 2 +- khangman/khangman/timerdlg.ui | 4 +- kig/kig/kig_view.cpp | 10 +-- kig/kig/kig_view.h | 2 +- kig/modes/edittypebase.ui | 8 +- kig/modes/linkslabel.cpp | 24 +++--- kig/modes/typesdialogbase.ui | 8 +- kig/objects/text_type.cc | 2 +- kiten/configdictionariesbase.ui | 16 ++-- kiten/configlearn.ui | 4 +- kiten/configsearching.ui | 2 +- kiten/dict.cpp | 2 +- kiten/edict | 20 ++--- kiten/edict_doc.html | 2 +- kiten/kiten.cpp | 8 +- kiten/learn.cpp | 8 +- kiten/rad.cpp | 26 +++---- klatin/klatin/klatinchoose.ui | 6 +- klatin/klatin/klatingrammarwidget.ui | 8 +- klatin/klatin/klatinresultsdialog.ui | 4 +- klatin/klatin/klatinsettings_vocabpage.ui | 8 +- klatin/klatin/klatinverbswidget.ui | 8 +- klatin/klatin/klatinvocabwidget.ui | 8 +- klettres/klettres/klettres.cpp | 2 +- kmplot/kmplot/FktDlgData.ui | 2 +- kmplot/kmplot/kprinterdlg.cpp | 12 +-- kmplot/kmplot/qeditconstant.ui | 2 +- kmplot/kmplot/qeditparametric.ui | 4 +- kmplot/kmplot/settingspagecolor.ui | 8 +- kmplot/kmplot/settingspagecoords.ui | 16 ++-- kmplot/kmplot/settingspageprecision.ui | 2 +- kmplot/kmplot/settingspagescaling.ui | 2 +- kstars/ChangeLog | 2 +- kstars/kstars/addcatdialogui.ui | 12 +-- kstars/kstars/addlinkdialogui.ui | 4 +- kstars/kstars/ccdpreviewui.ui | 14 ++-- kstars/kstars/ccdpreviewwg.cpp | 4 +- kstars/kstars/details_data.ui | 18 ++--- kstars/kstars/details_links.ui | 6 +- kstars/kstars/details_position.ui | 22 +++--- kstars/kstars/devmanager.ui | 6 +- kstars/kstars/finddialog.cpp | 2 +- kstars/kstars/fovdialogui.ui | 2 +- kstars/kstars/histdialog.ui | 6 +- kstars/kstars/imagereductionui.ui | 16 ++-- kstars/kstars/imgsequencedlgui.ui | 16 ++-- kstars/kstars/indiconf.ui | 6 +- kstars/kstars/indidevice.cpp | 12 +-- kstars/kstars/indielement.h | 4 +- kstars/kstars/indigroup.h | 2 +- kstars/kstars/indihostconf.ui | 6 +- kstars/kstars/indiproperty.cpp | 2 +- kstars/kstars/kstarsinit.cpp | 2 +- kstars/kstars/kswizardui.ui | 32 ++++---- kstars/kstars/locationdialog.cpp | 16 ++-- kstars/kstars/newfovui.ui | 48 ++++++------ kstars/kstars/opsadvancedui.ui | 6 +- kstars/kstars/opscatalogui.ui | 14 ++-- kstars/kstars/opscolorsui.ui | 8 +- kstars/kstars/opssolarsystemui.ui | 4 +- kstars/kstars/starobject.cpp | 2 +- kstars/kstars/streamformui.ui | 2 +- kstars/kstars/streamwg.cpp | 2 +- kstars/kstars/telescopepropui.ui | 10 +-- kstars/kstars/telescopewizard.ui | 20 ++--- kstars/kstars/thumbnailpickerui.ui | 14 ++-- kstars/kstars/timedialog.cpp | 2 +- kstars/kstars/tools/altvstimeui.ui | 10 +-- kstars/kstars/tools/argchangeviewoption.ui | 2 +- kstars/kstars/tools/argexportimage.ui | 6 +- kstars/kstars/tools/arglooktoward.ui | 2 +- kstars/kstars/tools/argsetactionindi.ui | 6 +- kstars/kstars/tools/argsetaltaz.ui | 2 +- kstars/kstars/tools/argsetccdtempindi.ui | 6 +- kstars/kstars/tools/argsetcolor.ui | 4 +- kstars/kstars/tools/argsetfilternumindi.ui | 6 +- kstars/kstars/tools/argsetfocustimeoutindi.ui | 6 +- kstars/kstars/tools/argsetframetypeindi.ui | 6 +- kstars/kstars/tools/argsetgeolocation.ui | 8 +- kstars/kstars/tools/argsetgeolocationindi.ui | 6 +- kstars/kstars/tools/argsetlocaltime.ui | 2 +- kstars/kstars/tools/argsetportindi.ui | 2 +- kstars/kstars/tools/argsetradec.ui | 2 +- kstars/kstars/tools/argsetscopeactionindi.ui | 6 +- kstars/kstars/tools/argsettargetcoordindi.ui | 6 +- kstars/kstars/tools/argsettargetnameindi.ui | 8 +- kstars/kstars/tools/argsettrack.ui | 2 +- kstars/kstars/tools/argsetutcindi.ui | 6 +- kstars/kstars/tools/argshutdownindi.ui | 4 +- kstars/kstars/tools/argstartexposureindi.ui | 6 +- kstars/kstars/tools/argstartfocusindi.ui | 6 +- kstars/kstars/tools/argstartindi.ui | 4 +- kstars/kstars/tools/argswitchindi.ui | 4 +- kstars/kstars/tools/argtimescale.ui | 2 +- kstars/kstars/tools/argwaitfor.ui | 2 +- kstars/kstars/tools/argwaitforkey.ui | 2 +- kstars/kstars/tools/argzoom.ui | 2 +- kstars/kstars/tools/lcgenerator.cpp | 12 +-- kstars/kstars/tools/modcalcangdistdlg.ui | 6 +- kstars/kstars/tools/modcalcapcoorddlg.ui | 8 +- kstars/kstars/tools/modcalcazeldlg.ui | 8 +- kstars/kstars/tools/modcalcdaylengthdlg.ui | 8 +- .../kstars/tools/modcalceclipticcoordsdlg.ui | 8 +- kstars/kstars/tools/modcalcequinoxdlg.ui | 4 +- kstars/kstars/tools/modcalcgalcoorddlg.ui | 8 +- kstars/kstars/tools/modcalcgeoddlg.ui | 10 +-- kstars/kstars/tools/modcalcjddlg.ui | 6 +- kstars/kstars/tools/modcalcplanetsdlg.ui | 22 +++--- kstars/kstars/tools/modcalcprecdlg.ui | 8 +- kstars/kstars/tools/modcalcsidtimedlg.ui | 12 +-- kstars/kstars/tools/modcalcvlsrdlg.ui | 10 +-- kstars/kstars/tools/observinglistui.ui | 4 +- kstars/kstars/tools/obslistwizardui.ui | 22 +++--- kstars/kstars/tools/optionstreeview.ui | 2 +- kstars/kstars/tools/planetviewerui.ui | 2 +- kstars/kstars/tools/scriptbuilderui.ui | 10 +-- kstars/kstars/tools/scriptnamedialog.ui | 4 +- kstars/kstars/tools/wutdialogui.ui | 12 +-- ktouch/ChangeLog | 2 +- 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/src/ktouch.cpp | 16 ++-- ktouch/src/ktouch.h | 10 +-- ktouch/src/ktouchcoloreditor_dlg.ui | 14 ++-- ktouch/src/ktouchdefaults.h | 2 +- ktouch/src/ktouchkeyboard.cpp | 30 ++++---- ktouch/src/ktouchkeyboard.h | 6 +- ktouch/src/ktouchkeyboardeditor.cpp | 4 +- ktouch/src/ktouchkeyboardeditor_dlg.ui | 4 +- ktouch/src/ktouchkeyboardwidget.cpp | 34 ++++----- ktouch/src/ktouchkeyboardwidget.h | 12 +-- ktouch/src/ktouchkeys.h | 2 +- ktouch/src/ktouchlectureeditor_dlg.ui | 14 ++-- ktouch/src/ktouchopenrequest_dlg.ui | 4 +- ktouch/src/ktouchprefcolorslayout.ui | 6 +- ktouch/src/ktouchprefgenerallayout.ui | 6 +- ktouch/src/ktouchprefkeyboardlayout.ui | 6 +- ktouch/src/ktouchpreftraininglayout.ui | 4 +- ktouch/src/ktouchstatistics_dlg.ui | 12 +-- ktouch/src/ktouchstatisticsdata.cpp | 10 +-- ktouch/src/ktouchstatuslayout.ui | 4 +- kturtle/src/dialogs.cpp | 42 +++++------ kturtle/src/dialogs.h | 6 +- kturtle/src/kturtle.cpp | 42 +++++------ .../common-dialogs/groupoptionsbase.ui | 2 +- .../common-dialogs/languageoptions.cpp | 36 ++++----- .../common-dialogs/languageoptionsbase.ui | 10 +-- .../common-dialogs/queryoptionsbase.ui | 2 +- .../common-dialogs/thresholdoptionsbase.ui | 2 +- .../entry-dialogs/PhoneticEntryPage.cpp | 14 ++-- .../entry-dialogs/TenseEntryPageForm.ui | 4 +- kvoctrain/kvoctrain/kva_clip.cpp | 10 +-- kvoctrain/kvoctrain/kvoctraintable.cpp | 2 +- kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp | 32 ++++---- .../kvoctrain/kvt-core/kvt-xml/XmlWriter.h | 4 +- kvoctrain/kvoctrain/kvt-core/langset.cpp | 4 +- kvoctrain/kvoctrain/kvt-core/langset.h | 2 +- .../query-dialogs/AdjQueryDlgForm.ui | 4 +- .../query-dialogs/ArtQueryDlgForm.ui | 4 +- .../kvoctrain/query-dialogs/MCQueryDlgForm.ui | 4 +- .../query-dialogs/RandomQueryDlgForm.ui | 4 +- .../query-dialogs/SimpleQueryDlgForm.ui | 6 +- .../query-dialogs/VerbQueryDlgForm.ui | 14 ++-- kwordquiz/src/dlglanguagebase.ui | 4 +- kwordquiz/src/dlgrcbase.ui | 6 +- kwordquiz/src/dlgsortbase.ui | 2 +- kwordquiz/src/dlgspecchar.cpp | 2 +- kwordquiz/src/flashviewbase.ui | 4 +- kwordquiz/src/kwordquiz.cpp | 4 +- kwordquiz/src/multipleviewbase.ui | 14 ++-- kwordquiz/src/prefcharacterbase.ui | 2 +- kwordquiz/src/qaviewbase.ui | 12 +-- kwordquiz/src/wqprintdialogpage.cpp | 6 +- libtdeedu/extdate/extdatepicker.cpp | 2 +- libtdeedu/extdate/extdatetimeedit.cpp | 6 +- libtdeedu/extdate/extdatewidget.cpp | 8 +- libtdeedu/tdeeduui/tdeeduglossary.h | 2 +- 247 files changed, 933 insertions(+), 933 deletions(-) diff --git a/kalzium/ChangeLog b/kalzium/ChangeLog index ce67fc51..61d29e3a 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 tqlayout of the detailed information dialog + - Improved layout 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/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index 727700d4..8a1ace69 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -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 *tqlayout = new TQVBoxLayout( frame ); - tqlayout->setMargin( 0 ); + TQVBoxLayout *layout = new TQVBoxLayout( frame ); + layout->setMargin( 0 ); KHTMLPart *w = new KHTMLPart( frame, "html-part", TQT_TQOBJECT(frame) ); - tqlayout->addWidget( w->view() ); + layout->addWidget( w->view() ); return w; } diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp index bf717d42..376f136b 100644 --- a/kalzium/src/elementdataviewer.cpp +++ b/kalzium/src/elementdataviewer.cpp @@ -41,7 +41,7 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) yData = new AxisData(); - TQHBoxLayout *tqlayout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() ); + TQHBoxLayout *layout = 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() ); - tqlayout->addWidget( m_pPlotSetupWidget ); - tqlayout->addWidget( m_pPlotWidget ); - tqlayout->setStretchFactor( m_pPlotSetupWidget, 0 ); - tqlayout->setStretchFactor( m_pPlotWidget, 1 ); + layout->addWidget( m_pPlotSetupWidget ); + layout->addWidget( m_pPlotWidget ); + layout->setStretchFactor( m_pPlotSetupWidget, 0 ); + layout->setStretchFactor( m_pPlotWidget, 1 ); // setup the list of names EList::iterator it = d->ElementList.begin(); diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp index 918b9ac6..fee6e9c7 100644 --- a/kalzium/src/eqchemview.cpp +++ b/kalzium/src/eqchemview.cpp @@ -50,7 +50,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent) { settingsChanged(); - TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView tqlayout"); + TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView layout"); m_eqResult = new EqResult(this); m_eqedit = new KLineEdit(this); diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h index 7994fd76..e83ccf4a 100644 --- a/kalzium/src/kalzium.h +++ b/kalzium/src/kalzium.h @@ -106,7 +106,7 @@ class Kalzium : public KMainWindow KToggleAction *m_actionCrystal; /** - * the tqlayout of the central Widget ( CentralWidget ) + * the layout of the central Widget ( CentralWidget ) */ TQVBoxLayout *m_pCentralLayout; diff --git a/kalzium/src/plotsetupwidget.ui b/kalzium/src/plotsetupwidget.ui index ad0ee99e..b777713c 100644 --- a/kalzium/src/plotsetupwidget.ui +++ b/kalzium/src/plotsetupwidget.ui @@ -26,7 +26,7 @@ - tqlayout4 + layout4 @@ -69,7 +69,7 @@ - tqlayout2 + layout2 @@ -114,7 +114,7 @@ - tqlayout3 + layout3 diff --git a/kalzium/src/settings_colors.ui b/kalzium/src/settings_colors.ui index 1e025f4f..cd9316cb 100644 --- a/kalzium/src/settings_colors.ui +++ b/kalzium/src/settings_colors.ui @@ -36,7 +36,7 @@ - tqlayout32 + layout32 @@ -44,7 +44,7 @@ - tqlayout28 + layout28 @@ -70,7 +70,7 @@ - tqlayout29 + layout29 @@ -96,7 +96,7 @@ - tqlayout30 + layout30 @@ -122,7 +122,7 @@ - tqlayout31 + layout31 @@ -163,7 +163,7 @@ - tqlayout26 + layout26 @@ -171,7 +171,7 @@ - tqlayout23 + layout23 @@ -197,7 +197,7 @@ - tqlayout24 + layout24 @@ -223,7 +223,7 @@ - tqlayout25 + layout25 @@ -249,7 +249,7 @@ - tqlayout26 + layout26 @@ -290,7 +290,7 @@ - tqlayout22 + layout22 @@ -298,7 +298,7 @@ - tqlayout12 + layout12 @@ -324,7 +324,7 @@ - tqlayout19 + layout19 @@ -350,7 +350,7 @@ - tqlayout18 + layout18 @@ -376,7 +376,7 @@ - tqlayout17 + layout17 @@ -402,7 +402,7 @@ - tqlayout16 + layout16 @@ -428,7 +428,7 @@ - tqlayout15 + layout15 @@ -454,7 +454,7 @@ - tqlayout14 + layout14 @@ -480,7 +480,7 @@ - tqlayout13 + layout13 @@ -521,7 +521,7 @@ - tqlayout14 + layout14 @@ -529,7 +529,7 @@ - tqlayout13 + layout13 @@ -558,7 +558,7 @@ - tqlayout6 + layout6 @@ -584,7 +584,7 @@ - tqlayout7 + layout7 @@ -625,7 +625,7 @@ - tqlayout36 + layout36 @@ -633,7 +633,7 @@ - tqlayout12_2 + layout12_2 @@ -659,7 +659,7 @@ - tqlayout19_2 + layout19_2 @@ -685,7 +685,7 @@ - tqlayout18_2 + layout18_2 @@ -711,7 +711,7 @@ - tqlayout17_2 + layout17_2 @@ -737,7 +737,7 @@ - tqlayout16_2 + layout16_2 @@ -763,7 +763,7 @@ - tqlayout15_2 + layout15_2 @@ -789,7 +789,7 @@ - tqlayout14_2 + layout14_2 @@ -815,7 +815,7 @@ - tqlayout13_2 + layout13_2 @@ -841,7 +841,7 @@ - tqlayout35 + layout35 diff --git a/kalzium/src/somwidget.ui b/kalzium/src/somwidget.ui index 0b41d400..1494a1fe 100644 --- a/kalzium/src/somwidget.ui +++ b/kalzium/src/somwidget.ui @@ -67,7 +67,7 @@ the state of matter - tqlayout3 + layout3 @@ -102,7 +102,7 @@ the state of matter - tqlayout4 + layout4 diff --git a/kalzium/src/spectrumview.ui b/kalzium/src/spectrumview.ui index f136aa5d..785d21af 100644 --- a/kalzium/src/spectrumview.ui +++ b/kalzium/src/spectrumview.ui @@ -38,7 +38,7 @@ - tqlayout2 + layout2 @@ -110,7 +110,7 @@ - tqlayout4 + layout4 diff --git a/kalzium/src/timewidget.ui b/kalzium/src/timewidget.ui index 72eafd28..a684726f 100644 --- a/kalzium/src/timewidget.ui +++ b/kalzium/src/timewidget.ui @@ -35,7 +35,7 @@ - tqlayout3 + layout3 @@ -78,7 +78,7 @@ - tqlayout5 + layout5 diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui index 034479fb..285d6d64 100644 --- a/kanagram/src/mainsettingswidget.ui +++ b/kanagram/src/mainsettingswidget.ui @@ -86,7 +86,7 @@ - tqlayout2 + layout2 @@ -114,7 +114,7 @@ - tqlayout2 + layout2 diff --git a/kanagram/src/vocabeditwidget.ui b/kanagram/src/vocabeditwidget.ui index 370c7120..32104c5f 100644 --- a/kanagram/src/vocabeditwidget.ui +++ b/kanagram/src/vocabeditwidget.ui @@ -21,7 +21,7 @@ - tqlayout7 + layout7 @@ -29,7 +29,7 @@ - tqlayout6 + layout6 @@ -55,7 +55,7 @@ - tqlayout8 + layout8 @@ -63,7 +63,7 @@ - tqlayout5 + layout5 @@ -111,7 +111,7 @@ - tqlayout7 + layout7 @@ -119,7 +119,7 @@ - tqlayout6 + layout6 @@ -161,7 +161,7 @@ - tqlayout4 + layout4 diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui index 71d754d8..6ef70fd1 100644 --- a/kanagram/src/vocabsettingswidget.ui +++ b/kanagram/src/vocabsettingswidget.ui @@ -21,7 +21,7 @@ - tqlayout3 + layout3 @@ -29,7 +29,7 @@ - tqlayout1 + layout1 diff --git a/kbruch/ChangeLog b/kbruch/ChangeLog index be301b7b..688ef69f 100644 --- a/kbruch/ChangeLog +++ b/kbruch/ChangeLog @@ -1,6 +1,6 @@ 2003-04-28 Sebastian Stein - * fixed tqlayout problem with help of Dominique Devries + * fixed layout problem with help of Dominique Devries * compiler warnings () removed by Dominique Devries @@ -10,7 +10,7 @@ 2003-04-24 Sebastian Stein - * experiments with the tqlayout problem, but found no solution + * experiments with the layout problem, but found no solution * removed #define TRUE, used type bool instead diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp index c00c6dd0..6da65952 100644 --- a/kbruch/src/exercisecompare.cpp +++ b/kbruch/src/exercisecompare.cpp @@ -129,7 +129,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name): // that the user can start typing without moving the focus m_signButton->setFocus(); - // show the whole tqlayout + // show the whole layout baseWidget->show(); // add tooltip and qwhatsthis help to the widget @@ -301,9 +301,9 @@ void ExerciseCompare::slotSignButtonClicked() { // in RTL desktops, we still need to allign the // execise to the left. On TQt4, you can set the direction - // of the tqlayout to LTR (instead of inherit), but on TQt3 + // of the layout to LTR (instead of inherit), but on TQt3 // the only way of fixing it is inserting the widgets in reversed - // order to the tqlayout. + // order to the layout. // // 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/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp index 0c97688a..a3b61ab1 100644 --- a/kbruch/src/exerciseconvert.cpp +++ b/kbruch/src/exerciseconvert.cpp @@ -120,9 +120,9 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): // in RTL desktops, we still need to allign the // execise to the left. On TQt4, you can set the direction - // of the tqlayout to LTR (instead of inherit), but on TQt3 + // of the layout to LTR (instead of inherit), but on TQt3 // the only way of fixing it is inserting the widgets in reversed - // order to the tqlayout. + // order to the layout. // // if you need help with this feel free to contact me - Diego ) // This should fix parts of bug #116831 @@ -163,7 +163,7 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): // that the user can start typing without moving the focus numer_edit->setFocus(); - // show the whole tqlayout + // show the whole layout baseWidget->show(); // add tooltip and qwhatsthis help to the widget diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp index aa12a766..691c5816 100644 --- a/kbruch/src/exercisefactorize.cpp +++ b/kbruch/src/exercisefactorize.cpp @@ -64,40 +64,40 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name): Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout"); - tqlayout9 = new TQVBoxLayout( 0, 0, 6, "tqlayout9"); + layout9 = new TQVBoxLayout( 0, 0, 6, "layout9"); // The following method fix the problem in // bug #116831, reverse order in RTL desktops. // Amit Ramon amit.ramon@kdemail.net - tqlayout4 = createFactorsLayout(); - tqlayout9->addLayout(tqlayout4); + layout4 = createFactorsLayout(); + layout9->addLayout(layout4); spacer2 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout9->addItem( spacer2 ); + layout9->addItem( spacer2 ); - tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); + layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); // The following method fix the problem in // bug #116831, reverse order in RTL desktops. // Amit Ramon amit.ramon@kdemail.net - tqlayout1 = createButtonsLayout(); - tqlayout2->addLayout(tqlayout1); + layout1 = createButtonsLayout(); + layout2->addLayout(layout1); m_removeLastFactorButton = new TQPushButton( this, "m_removeLastFactorButton" ); - tqlayout2->addWidget( m_removeLastFactorButton ); - tqlayout9->addLayout( tqlayout2 ); + layout2->addWidget( m_removeLastFactorButton ); + layout9->addLayout( layout2 ); spacer4 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout9->addItem( spacer4 ); + layout9->addItem( spacer4 ); - tqlayout7 = new TQHBoxLayout( 0, 0, 6, "tqlayout7"); + layout7 = new TQHBoxLayout( 0, 0, 6, "layout7"); spacer3 = new TQSpacerItem( 361, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout7->addItem( spacer3 ); + layout7->addItem( spacer3 ); m_checkButton = new TQPushButton( this, "m_checkButton" ); - tqlayout7->addWidget( m_checkButton ); - tqlayout9->addLayout( tqlayout7 ); - Form1Layout->addLayout( tqlayout9 ); + layout7->addWidget( m_checkButton ); + layout9->addLayout( layout7 ); + Form1Layout->addLayout( layout9 ); // the current task TQString tmp_str; @@ -228,16 +228,16 @@ void ExerciseFactorize::update() // // The following method was added to fix -// bug #116831 (reverse tqlayout in RTL desktops) +// bug #116831 (reverse layout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // -/** Create the tqlayout that hold the exercise widgets +/** Create the layout that hold the exercise widgets */ TQHBoxLayout* ExerciseFactorize::createFactorsLayout() { // first create all widgets - TQHBoxLayout* tqlayout = new TQHBoxLayout( 0, 0, 6, "tqlayout4"); + TQHBoxLayout* layout = new TQHBoxLayout( 0, 0, 6, "layout4"); 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 tqlayout. + // now add the widgets to the layout. // if we are in a RTL desktop, add them // in a reverse order if (TQApplication::reverseLayout()) { - tqlayout->addItem( spacer1 ); - tqlayout->addWidget( result_label ); - tqlayout->addWidget( m_factorsWidget ); - tqlayout->addWidget( m_factorsEnteredEdit ); - tqlayout->addWidget( m_equalSignLabel ); - tqlayout->addWidget( m_taskLabel ); + layout->addItem( spacer1 ); + layout->addWidget( result_label ); + layout->addWidget( m_factorsWidget ); + layout->addWidget( m_factorsEnteredEdit ); + layout->addWidget( m_equalSignLabel ); + layout->addWidget( m_taskLabel ); } else { - tqlayout->addWidget( m_taskLabel ); - tqlayout->addWidget( m_equalSignLabel ); - tqlayout->addWidget( m_factorsEnteredEdit ); - tqlayout->addWidget( m_factorsWidget ); - tqlayout->addWidget( result_label ); - tqlayout->addItem( spacer1 ); + layout->addWidget( m_taskLabel ); + layout->addWidget( m_equalSignLabel ); + layout->addWidget( m_factorsEnteredEdit ); + layout->addWidget( m_factorsWidget ); + layout->addWidget( result_label ); + layout->addItem( spacer1 ); } - return tqlayout; + return layout; } // // The following method was added to fix -// bug #116831 (reverse tqlayout in RTL desktops) +// bug #116831 (reverse layout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // -/** Create the tqlayout that hold the exercise widgets +/** Create the layout 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* tqlayout = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout1"); + TQGridLayout* layout = new TQGridLayout( 0, 1, 1, 0, 6, "layout1"); // first row buttons m_factor2Button = new TQPushButton( this, "m_factor2Button" ); @@ -348,12 +348,12 @@ TQGridLayout* ExerciseFactorize::createButtonsLayout() for (int col = 0; col < _COLS; col++) { - tqlayout->addWidget(buttons[row][buttonIdx], row, col ); + layout->addWidget(buttons[row][buttonIdx], row, col ); buttonIdx += step; } } - return tqlayout; + return layout; } diff --git a/kbruch/src/exercisefactorize.h b/kbruch/src/exercisefactorize.h index 8a6f5c2c..c5ded345 100644 --- a/kbruch/src/exercisefactorize.h +++ b/kbruch/src/exercisefactorize.h @@ -116,14 +116,14 @@ private: // // the following two methods were added to fix - // bug #116831 (reverse tqlayout in RTL desktops) + // bug #116831 (reverse layout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // - /** create the factor widgets tqlayout */ + /** create the factor widgets layout */ TQHBoxLayout* createFactorsLayout(); - /** create the (answer) buttons tqlayout */ + /** create the (answer) buttons layout */ TQGridLayout* createButtonsLayout(); @@ -136,14 +136,14 @@ private: protected: TQVBoxLayout* Form1Layout; - TQVBoxLayout* tqlayout9; + TQVBoxLayout* layout9; TQSpacerItem* spacer4; - TQHBoxLayout* tqlayout4; + TQHBoxLayout* layout4; TQSpacerItem* spacer1; TQSpacerItem* spacer2; - TQVBoxLayout* tqlayout2; - TQGridLayout* tqlayout1; - TQHBoxLayout* tqlayout7; + TQVBoxLayout* layout2; + TQGridLayout* layout1; + TQHBoxLayout* layout7; TQSpacerItem* spacer3; private slots: diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp index 9dfabd01..2d51a653 100644 --- a/kbruch/src/statisticsview.cpp +++ b/kbruch/src/statisticsview.cpp @@ -48,17 +48,17 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name): /* set the caption of the window */ // setCaption(i18n("Statistics")); - /* add a tqlayout as a base */ - tqlayout1 = new TQVBoxLayout(this); - tqlayout1->setSpacing(6); - tqlayout1->setMargin(6); + /* add a layout as a base */ + layout1 = new TQVBoxLayout(this); + layout1->setSpacing(6); + layout1->setMargin(6); /* now add a v-spacer */ TQSpacerItem * v_spacer = new TQSpacerItem(1, 1); - tqlayout1->addItem(v_spacer); + layout1->addItem(v_spacer); /* create a grid to show the labels */ - labelGrid = new TQGridLayout(tqlayout1, 3, 2); + labelGrid = new TQGridLayout(layout1, 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); - tqlayout1->addItem(v_spacer); + layout1->addItem(v_spacer); /* the Reset button */ - buttonLayout = new TQHBoxLayout(tqlayout1); + buttonLayout = new TQHBoxLayout(layout1); resetBtn = new TQPushButton(i18n("&Reset"), this); TQObject::connect(resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetStatistics())); buttonLayout->addWidget(resetBtn); diff --git a/kbruch/src/statisticsview.h b/kbruch/src/statisticsview.h index 9b2821b8..c95eec0e 100644 --- a/kbruch/src/statisticsview.h +++ b/kbruch/src/statisticsview.h @@ -66,7 +66,7 @@ private: TQPushButton * resetBtn; TQHBoxLayout * buttonLayout; - TQVBoxLayout * tqlayout1; + TQVBoxLayout * layout1; TQGridLayout * labelGrid; TQLabel * result1Label; TQLabel * result2Label; diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp index 2cb4f8ec..7189aca7 100644 --- a/kbruch/src/taskview.cpp +++ b/kbruch/src/taskview.cpp @@ -114,9 +114,9 @@ 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 TQt4, you can set the direction - // of the tqlayout to LTR (instead of inherit), but on TQt3 + // of the layout to LTR (instead of inherit), but on TQt3 // the only way of fixing it is inserting the widgets in reversed - // order to the tqlayout. + // order to the layout. // // if you need help with this feel free to contact me - Diego ) // This should fix parts of bug #116831 @@ -158,10 +158,10 @@ TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, // that the user can start typing without moving the focus numer_edit->setFocus(); - // show the whole tqlayout + // show the whole layout baseWidget->show(); - // show the whole tqlayout + // show the whole layout m_taskWidget->show(); m_resultWidget->hide(); diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui index d7bdd95a..66f45d15 100644 --- a/kbruch/src/taskvieweroptionsbase.ui +++ b/kbruch/src/taskvieweroptionsbase.ui @@ -18,7 +18,7 @@ - tqlayout2 + layout2 @@ -57,7 +57,7 @@ - tqlayout7 + layout7 diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp index edeb42fd..5a9a60dc 100644 --- a/keduca/keduca/kcheckeduca.cpp +++ b/keduca/keduca/kcheckeduca.cpp @@ -38,7 +38,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ int extra_width, indicator_width; extra_width = 8; - indicator_width = tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0); + indicator_width = style().pixelMetric(TQStyle::PM_IndicatorWidth, 0); y = 0; x = indicator_width + extra_width; //### @@ -68,7 +68,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0); if ( hasFocus() ) { -// TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo, +// TQRect br = style().itemRect( p, x, y, rw, rh+yo, // AlignLeft|AlignVCenter|ShowPrefix, // isEnabled(), // pixmap(), text().visual() ); @@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index dbf130dc..16eb6ff7 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -45,9 +45,9 @@ void KEducaPrefs::setPageGeneral() TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" ); buttonGroup1->setTitle( i18n( "General" ) ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->tqlayout()->setSpacing( 0 ); - buttonGroup1->tqlayout()->setMargin( 0 ); - TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() ); + buttonGroup1->layout()->setSpacing( 0 ); + buttonGroup1->layout()->setMargin( 0 ); + TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() ); buttonGroup1Layout->setAlignment( TQt::AlignTop ); buttonGroup1Layout->setSpacing( 6 ); buttonGroup1Layout->setMargin( 11 ); @@ -63,9 +63,9 @@ void KEducaPrefs::setPageGeneral() TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" ); GroupBox1->setTitle( i18n( "Order" ) ); GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->tqlayout()->setSpacing( 0 ); - GroupBox1->tqlayout()->setMargin( 0 ); - TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() ); + GroupBox1->layout()->setSpacing( 0 ); + GroupBox1->layout()->setMargin( 0 ); + TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); GroupBox1Layout->setAlignment( TQt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp index 4cf0185f..96792e24 100644 --- a/keduca/keduca/kradioeduca.cpp +++ b/keduca/keduca/kradioeduca.cpp @@ -37,7 +37,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) int x, y, w, h; int extra_width, indicator_width; extra_width = 8; - indicator_width = tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); + indicator_width = style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); y = 0; x = indicator_width + extra_width; //### @@ -67,7 +67,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0); if ( hasFocus() ) { -// TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo, +// TQRect br = style().itemRect( p, x, y, rw, rh+yo, // AlignLeft|AlignVCenter|ShowPrefix, // isEnabled(), // pixmap(), text().visual() ); @@ -78,6 +78,6 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) br.setTop( br.top()-2 ); br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui index da846f6c..c5736e3d 100644 --- a/keduca/keducabuilder/kcontroladdeditbase.ui +++ b/keduca/keducabuilder/kcontroladdeditbase.ui @@ -293,7 +293,7 @@ - tqlayout1 + layout1 @@ -325,7 +325,7 @@ - tqlayout2 + layout2 @@ -502,7 +502,7 @@ - tqlayout11 + layout11 @@ -510,7 +510,7 @@ - tqlayout3 + layout3 @@ -575,7 +575,7 @@ - tqlayout7 + layout7 @@ -630,7 +630,7 @@ - tqlayout17 + layout17 @@ -679,7 +679,7 @@ - tqlayout16 + layout16 diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index f126d07d..5c323c3c 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -82,9 +82,9 @@ void KControlHeader::init() TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" ); GroupBox7->setTitle( i18n( "Description" ) ); GroupBox7->setColumnLayout(0, Qt::Vertical ); - GroupBox7->tqlayout()->setSpacing( 0 ); - GroupBox7->tqlayout()->setMargin( 0 ); - TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() ); + GroupBox7->layout()->setSpacing( 0 ); + GroupBox7->layout()->setMargin( 0 ); + TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() ); GroupBox7Layout->setAlignment( TQt::AlignTop ); GroupBox7Layout->setSpacing( 6 ); GroupBox7Layout->setMargin( 11 ); @@ -147,9 +147,9 @@ void KControlHeader::init() TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" ); GroupBox8->setTitle( i18n( "Picture" ) ); GroupBox8->setColumnLayout(0, Qt::Vertical ); - GroupBox8->tqlayout()->setSpacing( 0 ); - GroupBox8->tqlayout()->setMargin( 0 ); - TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() ); + GroupBox8->layout()->setSpacing( 0 ); + GroupBox8->layout()->setMargin( 0 ); + TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() ); GroupBox8Layout->setAlignment( TQt::AlignTop ); GroupBox8Layout->setSpacing( 6 ); GroupBox8Layout->setMargin( 11 ); @@ -165,9 +165,9 @@ void KControlHeader::init() TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" ); GroupBox6->setTitle( i18n( "Author" ) ); GroupBox6->setColumnLayout(0, Qt::Vertical ); - GroupBox6->tqlayout()->setSpacing( 0 ); - GroupBox6->tqlayout()->setMargin( 0 ); - TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() ); + GroupBox6->layout()->setSpacing( 0 ); + GroupBox6->layout()->setMargin( 0 ); + TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() ); GroupBox6Layout->setAlignment( TQt::AlignTop ); GroupBox6Layout->setSpacing( 6 ); GroupBox6Layout->setMargin( 11 ); diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui index 77b29513..1c94005d 100644 --- a/keduca/keducabuilder/kcontrolheaderbase.ui +++ b/keduca/keducabuilder/kcontrolheaderbase.ui @@ -188,7 +188,7 @@ - tqlayout2 + layout2 diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui index 3c23a6dd..5150ee42 100644 --- a/keduca/libkeduca/kgallerydialogbase.ui +++ b/keduca/libkeduca/kgallerydialogbase.ui @@ -24,7 +24,7 @@ - tqlayout13 + layout13 @@ -32,7 +32,7 @@ - tqlayout4 + layout4 @@ -58,7 +58,7 @@ - tqlayout3 + layout3 @@ -81,7 +81,7 @@ - tqlayout12 + layout12 @@ -264,7 +264,7 @@ - tqlayout2 + layout2 diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp index ea293a75..3fd4ab1f 100644 --- a/kgeography/src/kgeography.cpp +++ b/kgeography/src/kgeography.cpp @@ -59,8 +59,8 @@ 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 -> tqlayout() -> setSpacing(KDialog::spacingHint()); - p_underLeftWidget -> tqlayout() -> setMargin(KDialog::marginHint()); + p_underLeftWidget -> layout() -> setSpacing(KDialog::spacingHint()); + p_underLeftWidget -> layout() -> setMargin(KDialog::marginHint()); p_leftWidget -> setStretchFactor(p_underLeftWidget, 1); setCentralWidget(p_bigWidget); diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp index 3426fecf..daf4ed6d 100644 --- a/kgeography/src/mapasker.cpp +++ b/kgeography/src/mapasker.cpp @@ -51,7 +51,7 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou if (asker) { - TQBoxLayout *vbl = dynamic_cast(w -> tqlayout()); + TQBoxLayout *vbl = dynamic_cast(w -> layout()); p_next = new TQLabel(w); p_next -> setAlignment(AlignTop | AlignHCenter); p_fill = new TQWidget(w); diff --git a/khangman/khangman/advanced.ui b/khangman/khangman/advanced.ui index 7910fab7..6290dd7c 100644 --- a/khangman/khangman/advanced.ui +++ b/khangman/khangman/advanced.ui @@ -18,7 +18,7 @@ - tqlayout2 + layout2 diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 5d859347..9c3e54b4 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -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.tqunicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); TQRect r(4, 4, 120, 120); diff --git a/khangman/khangman/normal.ui b/khangman/khangman/normal.ui index b7d3df2e..99b31c4e 100644 --- a/khangman/khangman/normal.ui +++ b/khangman/khangman/normal.ui @@ -18,7 +18,7 @@ - tqlayout4 + layout4 diff --git a/khangman/khangman/timerdlg.ui b/khangman/khangman/timerdlg.ui index 8721f408..fcea8d8b 100644 --- a/khangman/khangman/timerdlg.ui +++ b/khangman/khangman/timerdlg.ui @@ -29,7 +29,7 @@ - tqlayout5 + layout5 @@ -124,7 +124,7 @@ - tqlayout6 + layout6 diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp index 24f507d9..f9d70f29 100644 --- a/kig/kig/kig_view.cpp +++ b/kig/kig/kig_view.cpp @@ -290,13 +290,13 @@ KigView::KigView( KigPart* part, TQWidget* parent, const char* name ) : TQWidget( parent, name ), - mtqlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ), + mlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ), mupdatingscrollbars( false ), mrealwidget( 0 ), mpart( part ) { connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) ); - mtqlayout = new TQGridLayout( this, 2, 2 ); + mlayout = new TQGridLayout( this, 2, 2 ); mrightscroll = new TQScrollBar(Qt::Vertical, this, "Right Scrollbar" ); // TODO: make this configurable... mrightscroll->setTracking( true ); @@ -310,9 +310,9 @@ KigView::KigView( KigPart* part, connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( updateScrollBars() ) ); mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen ); - mtqlayout->addWidget( mbottomscroll, 1, 0 ); - mtqlayout->addWidget( mrealwidget, 0, 0 ); - mtqlayout->addWidget( mrightscroll, 0, 1 ); + mlayout->addWidget( mbottomscroll, 1, 0 ); + mlayout->addWidget( mrealwidget, 0, 0 ); + mlayout->addWidget( mrightscroll, 0, 1 ); resize( sizeHint() ); mrealwidget->recenterScreen(); diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h index e574d6f0..28cc9947 100644 --- a/kig/kig/kig_view.h +++ b/kig/kig/kig_view.h @@ -230,7 +230,7 @@ class KigView Q_OBJECT TQ_OBJECT - TQGridLayout* mtqlayout; + TQGridLayout* mlayout; TQScrollBar* mrightscroll; TQScrollBar* mbottomscroll; diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui index 91ff6df4..e0af9850 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -43,7 +43,7 @@ - tqlayout8 + layout8 @@ -51,7 +51,7 @@ - tqlayout8 + layout8 @@ -125,7 +125,7 @@ - tqlayout23 + layout23 @@ -179,7 +179,7 @@ - tqlayout24 + layout24 diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp index 693c165a..9d37d840 100644 --- a/kig/modes/linkslabel.cpp +++ b/kig/modes/linkslabel.cpp @@ -33,7 +33,7 @@ using namespace std; class LinksLabel::Private { public: - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; std::vector labels; std::vector urllabels; }; @@ -42,22 +42,22 @@ LinksLabel::LinksLabel( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { p = new Private; - p->tqlayout = new TQHBoxLayout( this ); + p->layout = new TQHBoxLayout( this ); TQLabel* l = new TQLabel( TQString::fromUtf8( "Dit is een " ), this ); p->labels.push_back( l ); - p->tqlayout->addWidget( l ); + p->layout->addWidget( l ); KURLLabel* u = new KURLLabel( TQString::fromUtf8( "http://www.kde.org/" ), TQString::fromUtf8( "url"), this ); p->urllabels.push_back( u ); - p->tqlayout->addWidget( u ); + p->layout->addWidget( u ); l = new TQLabel( TQString::fromUtf8( " !" ), this ); p->labels.push_back( l ); - p->tqlayout->addWidget(l ); + p->layout->addWidget(l ); - p->tqlayout->activate(); + p->layout->activate(); } LinksLabel::~LinksLabel() @@ -99,8 +99,8 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) p->urllabels.clear(); p->labels.clear(); - delete p->tqlayout; - p->tqlayout = new TQHBoxLayout( this ); + delete p->layout; + p->layout = 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->tqlayout->addWidget( l ); + p->layout->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->tqlayout->addWidget( l ); + p->layout->addWidget( l ); }; }; TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - p->tqlayout->addItem( spacer ); + p->layout->addItem( spacer ); - p->tqlayout->activate(); + p->layout->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/typesdialogbase.ui b/kig/modes/typesdialogbase.ui index 347eb831..90216532 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -30,7 +30,7 @@ - tqlayout1 + layout1 @@ -90,7 +90,7 @@ - tqlayout4 + layout4 @@ -98,7 +98,7 @@ - tqlayout3 + layout3 @@ -147,7 +147,7 @@ - tqlayout4 + layout4 diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cc index 09e84c30..425094c2 100644 --- a/kig/objects/text_type.cc +++ b/kig/objects/text_type.cc @@ -144,7 +144,7 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, if ( i == 0 ) { - TQClipboard* cb = kapp->tqclipboard(); + TQClipboard* cb = kapp->clipboard(); // copy the text into the clipboard const TextImp* ti = static_cast( c.imp() ); diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui index 6ef31c7f..3ad28605 100644 --- a/kiten/configdictionariesbase.ui +++ b/kiten/configdictionariesbase.ui @@ -36,7 +36,7 @@ - tqlayout52_2 + layout52_2 @@ -47,7 +47,7 @@ - tqlayout43_2 + layout43_2 @@ -82,7 +82,7 @@ - tqlayout51_2 + layout51_2 @@ -117,7 +117,7 @@ - tqlayout50_2 + layout50_2 @@ -177,7 +177,7 @@ - tqlayout52 + layout52 @@ -185,7 +185,7 @@ - tqlayout43 + layout43 @@ -220,7 +220,7 @@ - tqlayout51 + layout51 @@ -255,7 +255,7 @@ - tqlayout50 + layout50 diff --git a/kiten/configlearn.ui b/kiten/configlearn.ui index 26072ac2..03ae9d0d 100644 --- a/kiten/configlearn.ui +++ b/kiten/configlearn.ui @@ -21,7 +21,7 @@ - tqlayout12 + layout12 @@ -65,7 +65,7 @@ - tqlayout13 + layout13 diff --git a/kiten/configsearching.ui b/kiten/configsearching.ui index 39f7012b..82895d3c 100644 --- a/kiten/configsearching.ui +++ b/kiten/configsearching.ui @@ -21,7 +21,7 @@ - tqlayout9 + layout9 diff --git a/kiten/dict.cpp b/kiten/dict.cpp index 0b86e906..1e605ac3 100644 --- a/kiten/dict.cpp +++ b/kiten/dict.cpp @@ -50,7 +50,7 @@ using namespace Dict; TextType Dict::textType(const TQString &text) { - ushort first = text.at(0).tqunicode(); + ushort first = text.at(0).unicode(); if (first < 0x3000) return Text_Latin; diff --git a/kiten/edict b/kiten/edict index 55456bca..2a5ae421 100644 --- a/kiten/edict +++ b/kiten/edict @@ -6892,7 +6892,7 @@ ¥³¥Þ¥½¥ó /(abbr) commercial song/commercial jingle/ ¥³¥Þ¥ó¥É /(n) (1) (computer) command/(2) commando/(P)/ ¥³¥Þ¥ó¥É¥â¥¸¥å¡¼¥ë /command module/ -¥³¥Þ³ä¤ê [¥³¥Þ¤ï¤ê] /panel tqlayout/ +¥³¥Þ³ä¤ê [¥³¥Þ¤ï¤ê] /panel layout/ ¥³¥ß¥«¥ë /(adj-na,n) comical/(P)/ ¥³¥ß¥±¥Ã¥È /(abbr) comic market/convention where amateur manga artists sell their work/ ¥³¥ß¥Ã¥¯ /(adj-na,n) comic books/comics/(P)/ @@ -14625,7 +14625,7 @@ ¥×¥é¥ó¥Æ¡¼¥·¥ç¥ó /plantation/ ¥×¥é¥ó¥È /(n) plant/(P)/ ¥×¥é¥ó¥È¥ê¥Î¥Ù¡¼¥·¥ç¥ó /plant renovation/ -¥×¥é¥ó¥È¥ì¥¤¥¢¥¦¥È /plant tqlayout/ +¥×¥é¥ó¥È¥ì¥¤¥¢¥¦¥È /plant layout/ ¥×¥é¥ó¥ÈÍ¢½Ð [¥×¥é¥ó¥È¤æ¤·¤å¤Ä] /(n) export of manufacturing plant/ ¥×¥é¥ó¥Ê¡¼ /(n) planner/(P)/ ¥×¥é¥ó¥Ë¥ó¥° /(n) planning/(P)/ @@ -17996,8 +17996,8 @@ ¥ì¥¢ /rare/(P)/ ¥ì¥¢¥á¥¿¥ë /rare metal/ ¥ì¥¤ /(n) (1) lei/(2) ray/(P)/ -¥ì¥¤¥¢¥¦¥È /(n) tqlayout/(P)/ -¥ì¥¤¥¢¥¦¥È¥·¥¹¥Æ¥à /tqlayout-system/ +¥ì¥¤¥¢¥¦¥È /(n) layout/(P)/ +¥ì¥¤¥¢¥¦¥È¥·¥¹¥Æ¥à /layout-system/ ¥ì¥¤¥¢¥Ã¥× /(n,vs) lay-up/ ¥ì¥¤¥ª¥Õ /(n) layoff/(P)/ ¥ì¥¤¥·¥º¥à /racism/ @@ -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/tqlayout/editing/ +³ä¤êÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/layout/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/tqlayout/editing/ -³äÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/ +³äÉÕ [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/layout/editing/ +³äÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/layout/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/ @@ -52182,7 +52182,7 @@ »ú¿ô [¤¸¤¹¤¦] /(n) number of characters or letters/(P)/ »úÂÎ [¤¸¤¿¤¤] /(n) type/font/lettering/(P)/ »úŵ [¤¸¤Æ¤ó] /(n) character dictionary/ -»úÇÛ¤ê [¤¸¤¯¤Ð¤ê] /(n) word or letter tqlayout/ +»úÇÛ¤ê [¤¸¤¯¤Ð¤ê] /(n) word or letter layout/ »úÊì [¤¸¤Ü] /(n) letter (of the alphabet)/phonetic script/ »úËë [¤¸¤Þ¤¯] /(n) title/subtitle/(P)/ »úÌÌ [¤¸¤Å¤é] /(n) impression derived from or appearance of kanji/face/appearance of written words/ @@ -75370,7 +75370,7 @@ ÃϼÁ¿Þ [¤Á¤·¤Ä¤º] /(n) geological map/ ÃϼÁÄ´ºº [¤Á¤·¤Ä¤Á¤ç¤¦¤µ] /geological survey/ Ãϼç [¤¸¤Ì¤·] /(n) landlord/(P)/ -Ãϼè¤ê [¤¸¤É¤ê] /(n) tqlayout/obtaining land/ +Ãϼè¤ê [¤¸¤É¤ê] /(n) layout/obtaining land/ Ãϼò [¤¸¤¶¤±] /(n) local sake/ ÃϽê [¤¸¤·¤ç] /(n) estate/ ÃϾå [¤Á¤¸¤ç¤¦] /(n) above ground/(P)/ @@ -93602,7 +93602,7 @@ ÊѶÊÅÀ [¤Ø¤ó¤­¤ç¤¯¤Æ¤ó] /inflection point/ ÊÑ·¿ [¤Ø¤ó¤±¤¤] /(n) variety/variation/ ÊÑ·Á [¤Ø¤ó¤±¤¤] /(n,vs) transformation/variation/metamorphosis/modification/deformation/variety/deformity/monster/(P)/ -ÊÑ·Á¥´¥Þ [¤Ø¤ó¤±¤¤¥´¥Þ] /arbitrary panel tqlayout/ +ÊÑ·Á¥´¥Þ [¤Ø¤ó¤±¤¤¥´¥Þ] /arbitrary panel layout/ ÊÑ·Áµ¬Â§ [¤Ø¤ó¤±¤¤¤­¤½¤¯] /(n) transformational rule/ ÊÑ·ÁÀ¸À®Åý¸ìÏÀ [¤Ø¤ó¤±¤¤¤»¤¤¤»¤¤¤È¤¦¤´¤í¤ó] /(n) transformational generative syntax/ ÊÑ·ÁÃîÎà [¤Ø¤ó¤±¤¤¤Á¤å¤¦¤ë¤¤] /the amoeba/ diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html index 9341722a..fc52d1e4 100644 --- a/kiten/edict_doc.html +++ b/kiten/edict_doc.html @@ -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 tqlayout of the entries +coming from public sources, and the structure and layout of the entries themselves are quite unlike those in any published dictionary, adds a degree of protection to EDICT.

diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index 53b52a46..406554a8 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -257,7 +257,7 @@ 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).tqunicode(), 16))))); // show html entity + _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 // now show some compounds in which this kanji appears TQString kanji = toAddKanji.kanji(); @@ -529,9 +529,9 @@ void TopLevel::gradeSearch() TQString TopLevel::clipBoardText() // gets text from clipboard for globalaccels { - kapp->tqclipboard()->setSelectionMode(true); - TQString text = kapp->tqclipboard()->text().stripWhiteSpace(); - kapp->tqclipboard()->setSelectionMode(false); + kapp->clipboard()->setSelectionMode(true); + TQString text = kapp->clipboard()->text().stripWhiteSpace(); + kapp->clipboard()->setSelectionMode(false); return text; } diff --git a/kiten/learn.cpp b/kiten/learn.cpp index 16c5baeb..cc65cd35 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -138,12 +138,12 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) TQVBoxLayout *quizLayout = new TQVBoxLayout(quizTop, KDialog::marginHint(), KDialog::spacingHint()); quizLayout->addStretch(); - TQHBoxLayout *htqlayout = new TQHBoxLayout(quizLayout); + TQHBoxLayout *hlayout = new TQHBoxLayout(quizLayout); qKanji = new TQPushButton(quizTop); connect(qKanji, TQT_SIGNAL(clicked()), this, TQT_SLOT(qKanjiClicked())); - htqlayout->addStretch(); - htqlayout->addWidget(qKanji); - htqlayout->addStretch(); + hlayout->addStretch(); + hlayout->addWidget(qKanji); + hlayout->addStretch(); quizLayout->addStretch(); answers = new TQButtonGroup(1,Qt::Horizontal, quizTop); diff --git a/kiten/rad.cpp b/kiten/rad.cpp index 0d28c907..ab03e0c7 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -223,12 +223,12 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p hotlistNum = 3; rad = _rad; - TQHBoxLayout *htqlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); hotlistGroup = new TQButtonGroup(1,Qt::Horizontal, i18n("Hotlist"), this); //hotlistGroup->setRadioButtonExclusive(true); - vtqlayout->addWidget(hotlistGroup); + vlayout->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 *tqlayout = new TQVBoxLayout(vtqlayout, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(vlayout, KDialog::spacingHint()); totalStrokes = new TQCheckBox(i18n("Search by total strokes"), this); connect(totalStrokes, TQT_SIGNAL(clicked()), this, TQT_SLOT(totalClicked())); - tqlayout->addWidget(totalStrokes); + layout->addWidget(totalStrokes); - TQHBoxLayout *strokesLayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQHBoxLayout *strokesLayout = new TQHBoxLayout(layout, 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())); - tqlayout->addWidget(ok); + layout->addWidget(ok); cancel = new KPushButton( KStdGuiItem::cancel(), this ); connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(close())); - tqlayout->addWidget(cancel); + layout->addWidget(cancel); - TQVBoxLayout *middlevLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); + TQVBoxLayout *middlevLayout = new TQVBoxLayout(hlayout, 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 *rightvtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); + TQVBoxLayout *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); selectedList = new KListBox(this); - rightvtqlayout->addWidget(selectedList); + rightvlayout->addWidget(selectedList); connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); remove = new KPushButton(i18n("&Remove"), this); - rightvtqlayout->addWidget(remove); + rightvlayout->addWidget(remove); connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelected())); remove->setEnabled(false); clear = new KPushButton(KStdGuiItem::clear(), this); - rightvtqlayout->addWidget(clear); + rightvlayout->addWidget(clear); connect(clear, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearSelected())); clear->setEnabled(false); diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui index 2a7a664b..36f0a6da 100644 --- a/klatin/klatin/klatinchoose.ui +++ b/klatin/klatin/klatinchoose.ui @@ -26,7 +26,7 @@ - tqlayout81 + layout81 @@ -52,7 +52,7 @@ Please Choose Section of Revision - tqlayout80 + layout80 @@ -178,7 +178,7 @@ verb and noun tables - tqlayout79 + layout79 diff --git a/klatin/klatin/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui index 256c2ad9..04dc1ca9 100644 --- a/klatin/klatin/klatingrammarwidget.ui +++ b/klatin/klatin/klatingrammarwidget.ui @@ -51,7 +51,7 @@ - tqlayout39 + layout39 @@ -69,7 +69,7 @@ - tqlayout40 + layout40 @@ -280,7 +280,7 @@ Line 4 - tqlayout37 + layout37 @@ -326,7 +326,7 @@ Line 4 - tqlayout21 + layout21 diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui index 4de8e7f9..4de14db7 100644 --- a/klatin/klatin/klatinresultsdialog.ui +++ b/klatin/klatin/klatinresultsdialog.ui @@ -92,7 +92,7 @@ - tqlayout83 + layout83 @@ -164,7 +164,7 @@ - tqlayout70 + layout70 diff --git a/klatin/klatin/klatinsettings_vocabpage.ui b/klatin/klatin/klatinsettings_vocabpage.ui index bd35a37e..45642614 100644 --- a/klatin/klatin/klatinsettings_vocabpage.ui +++ b/klatin/klatin/klatinsettings_vocabpage.ui @@ -32,7 +32,7 @@ - tqlayout24 + layout24 @@ -40,7 +40,7 @@ - tqlayout10 + layout10 @@ -96,7 +96,7 @@ - tqlayout6 + layout6 @@ -115,7 +115,7 @@ - tqlayout6 + layout6 diff --git a/klatin/klatin/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui index 415225ae..4cfd546e 100644 --- a/klatin/klatin/klatinverbswidget.ui +++ b/klatin/klatin/klatinverbswidget.ui @@ -47,7 +47,7 @@ - tqlayout29 + layout29 @@ -119,7 +119,7 @@ tested on - tqlayout11 + layout11 @@ -324,7 +324,7 @@ Line 4 - tqlayout9 + layout9 @@ -367,7 +367,7 @@ Line 4 - tqlayout29 + layout29 diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui index 9b89d9e4..6fd39ff2 100644 --- a/klatin/klatin/klatinvocabwidget.ui +++ b/klatin/klatin/klatinvocabwidget.ui @@ -45,7 +45,7 @@ - tqlayout52 + layout52 @@ -245,7 +245,7 @@ - tqlayout53 + layout53 @@ -289,7 +289,7 @@ - tqlayout64 + layout64 @@ -333,7 +333,7 @@ - tqlayout18 + layout18 diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index 06d1ca12..c777f2b0 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -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.tqunicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); TQRect r(4, 4, 120, 120); diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui index 7f8ef8fc..705e2c09 100644 --- a/kmplot/kmplot/FktDlgData.ui +++ b/kmplot/kmplot/FktDlgData.ui @@ -33,7 +33,7 @@ - tqlayout3 + layout3 diff --git a/kmplot/kmplot/kprinterdlg.cpp b/kmplot/kmplot/kprinterdlg.cpp index 4ddc63f4..6b54ba77 100644 --- a/kmplot/kmplot/kprinterdlg.cpp +++ b/kmplot/kmplot/kprinterdlg.cpp @@ -37,16 +37,16 @@ KPrinterDlg::KPrinterDlg( TQWidget *parent, const char *name ) : KPrintDialogPage( parent, name ) { setTitle( i18n( "KmPlot Options" ) ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setMargin( KDialog::marginHint() ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setMargin( KDialog::marginHint() ); + layout->setSpacing( KDialog::spacingHint() ); printHeaderTable = new TQCheckBox( i18n( "Print header table" ), this ); transparent_background = new TQCheckBox( i18n( "Transparent background" ), this ); - tqlayout->addWidget( printHeaderTable ); - tqlayout->addWidget( transparent_background ); - tqlayout->addStretch( 1 ); + layout->addWidget( printHeaderTable ); + layout->addWidget( transparent_background ); + layout->addStretch( 1 ); } void KPrinterDlg::getOptions( TQMap& opts, bool include_def ) diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui index c368e865..02d3273f 100644 --- a/kmplot/kmplot/qeditconstant.ui +++ b/kmplot/kmplot/qeditconstant.ui @@ -40,7 +40,7 @@ - tqlayout1 + layout1 diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui index 50c01d75..46a36465 100644 --- a/kmplot/kmplot/qeditparametric.ui +++ b/kmplot/kmplot/qeditparametric.ui @@ -93,7 +93,7 @@ The name of a function must be unique. If you leave this line empty KmPlot will - tqlayout9 + layout9 @@ -156,7 +156,7 @@ Example: sin(t) - tqlayout8 + layout8 diff --git a/kmplot/kmplot/settingspagecolor.ui b/kmplot/kmplot/settingspagecolor.ui index 8656b3e8..5b938c04 100644 --- a/kmplot/kmplot/settingspagecolor.ui +++ b/kmplot/kmplot/settingspagecolor.ui @@ -33,7 +33,7 @@ - tqlayout2 + layout2 @@ -123,7 +123,7 @@ - tqlayout19 + layout19 @@ -131,7 +131,7 @@ - tqlayout16 + layout16 @@ -283,7 +283,7 @@ - tqlayout17 + layout17 diff --git a/kmplot/kmplot/settingspagecoords.ui b/kmplot/kmplot/settingspagecoords.ui index 067deba2..6293d0cd 100644 --- a/kmplot/kmplot/settingspagecoords.ui +++ b/kmplot/kmplot/settingspagecoords.ui @@ -33,7 +33,7 @@ - tqlayout23 + layout23 @@ -131,7 +131,7 @@ - tqlayout20 + layout20 @@ -277,7 +277,7 @@ - tqlayout20_2 + layout20_2 @@ -335,7 +335,7 @@ - tqlayout24 + layout24 @@ -375,7 +375,7 @@ - tqlayout25 + layout25 @@ -415,7 +415,7 @@ - tqlayout26 + layout26 @@ -458,7 +458,7 @@ - tqlayout22 + layout22 @@ -626,7 +626,7 @@ - tqlayout24 + layout24 diff --git a/kmplot/kmplot/settingspageprecision.ui b/kmplot/kmplot/settingspageprecision.ui index 7608a107..cafc3365 100644 --- a/kmplot/kmplot/settingspageprecision.ui +++ b/kmplot/kmplot/settingspageprecision.ui @@ -212,7 +212,7 @@ - tqlayout1 + layout1 diff --git a/kmplot/kmplot/settingspagescaling.ui b/kmplot/kmplot/settingspagescaling.ui index cac6a75b..eaaf0690 100644 --- a/kmplot/kmplot/settingspagescaling.ui +++ b/kmplot/kmplot/settingspagescaling.ui @@ -18,7 +18,7 @@ - tqlayout35 + layout35 diff --git a/kstars/ChangeLog b/kstars/ChangeLog index fe69e108..5c2b696a 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 tqlayout" error messages. +Fixed "extra layout" 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/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui index daa0ea0a..266cbefb 100644 --- a/kstars/kstars/addcatdialogui.ui +++ b/kstars/kstars/addcatdialogui.ui @@ -75,7 +75,7 @@ - tqlayout7 + layout7 @@ -109,7 +109,7 @@ - tqlayout8 + layout8 @@ -145,7 +145,7 @@ - tqlayout27 + layout27 @@ -177,7 +177,7 @@ - tqlayout13 + layout13 @@ -218,7 +218,7 @@ - tqlayout12 + layout12 @@ -258,7 +258,7 @@ - tqlayout4 + layout4 diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui index 290b2e35..e6310813 100644 --- a/kstars/kstars/addlinkdialogui.ui +++ b/kstars/kstars/addlinkdialogui.ui @@ -47,7 +47,7 @@ - tqlayout2 + layout2 @@ -97,7 +97,7 @@ - tqlayout1 + layout1 diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui index 8fc1abc2..1ea53d03 100644 --- a/kstars/kstars/ccdpreviewui.ui +++ b/kstars/kstars/ccdpreviewui.ui @@ -21,7 +21,7 @@ - tqlayout2 + layout2 @@ -133,7 +133,7 @@ - tqlayout19 + layout19 @@ -141,7 +141,7 @@ - tqlayout7 + layout7 @@ -237,7 +237,7 @@ - tqlayout18 + layout18 @@ -317,7 +317,7 @@ - tqlayout17 + layout17 @@ -325,7 +325,7 @@ - tqlayout11 + layout11 @@ -374,7 +374,7 @@ - tqlayout8 + layout8 diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index 84b5ffb7..10a4e22e 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -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 + tqlayout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() - + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()*6); + resize(wd + layout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() + + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + layout()->margin() * 2 + layout()->spacing()*6); streamFrame->resize(wd, ht); } diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui index 0b554684..aa555525 100644 --- a/kstars/kstars/details_data.ui +++ b/kstars/kstars/details_data.ui @@ -21,7 +21,7 @@ - tqlayout67 + layout67 @@ -76,7 +76,7 @@ - tqlayout20 + layout20 @@ -84,7 +84,7 @@ - tqlayout12 + layout12 @@ -92,7 +92,7 @@ - tqlayout60_2 + layout60_2 @@ -208,7 +208,7 @@ - tqlayout19 + layout19 @@ -248,7 +248,7 @@ - tqlayout22 + layout22 @@ -256,7 +256,7 @@ - tqlayout21 + layout21 @@ -458,7 +458,7 @@ - tqlayout36_2 + layout36_2 @@ -490,7 +490,7 @@ - tqlayout35_2 + layout35_2 diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui index 758a82d7..3b2a7bb2 100644 --- a/kstars/kstars/details_links.ui +++ b/kstars/kstars/details_links.ui @@ -21,7 +21,7 @@ - tqlayout79 + layout79 @@ -75,7 +75,7 @@ - tqlayout80 + layout80 @@ -115,7 +115,7 @@ - tqlayout91 + layout91 diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui index 689821cd..f09c720e 100644 --- a/kstars/kstars/details_position.ui +++ b/kstars/kstars/details_position.ui @@ -21,7 +21,7 @@ - tqlayout56 + layout56 @@ -70,7 +70,7 @@ - tqlayout54 + layout54 @@ -78,7 +78,7 @@ - tqlayout50 + layout50 @@ -203,7 +203,7 @@ - tqlayout50_2 + layout50_2 @@ -330,7 +330,7 @@ - tqlayout55 + layout55 @@ -338,7 +338,7 @@ - tqlayout53 + layout53 @@ -414,7 +414,7 @@ - tqlayout52 + layout52 @@ -496,7 +496,7 @@ - tqlayout76 + layout76 @@ -545,7 +545,7 @@ - tqlayout142 + layout142 @@ -553,7 +553,7 @@ - tqlayout141 + layout141 @@ -727,7 +727,7 @@ - tqlayout140 + layout140 diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui index 56a0029a..3755d1da 100644 --- a/kstars/kstars/devmanager.ui +++ b/kstars/kstars/devmanager.ui @@ -178,7 +178,7 @@ - tqlayout6 + layout6 @@ -278,7 +278,7 @@ - tqlayout5_2 + layout5_2 @@ -380,7 +380,7 @@ - tqlayout6 + layout6 diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index 8ef399f5..ba0ba696 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -73,7 +73,7 @@ FindDialog::FindDialog( TQWidget* parent ) : SearchList->setVScrollBarMode( TQListBox::AlwaysOn ); SearchList->setHScrollBarMode( TQListBox::AlwaysOff ); -//Pack Widgets into tqlayout manager +//Pack Widgets into layout manager hlay->addWidget( filterTypeLabel, 0, 0 ); hlay->addWidget( filterType, 0, 0 ); diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui index fd02a9d6..77f10219 100644 --- a/kstars/kstars/fovdialogui.ui +++ b/kstars/kstars/fovdialogui.ui @@ -38,7 +38,7 @@ - tqlayout4 + layout4 diff --git a/kstars/kstars/histdialog.ui b/kstars/kstars/histdialog.ui index c01043bc..aeda0098 100644 --- a/kstars/kstars/histdialog.ui +++ b/kstars/kstars/histdialog.ui @@ -44,7 +44,7 @@ - tqlayout17 + layout17 @@ -101,7 +101,7 @@ - tqlayout5 + layout5 @@ -224,7 +224,7 @@ - tqlayout13 + layout13 diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index faa1e7ef..7a2f75a2 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -21,7 +21,7 @@ - tqlayout13 + layout13 @@ -79,7 +79,7 @@ - tqlayout8 + layout8 @@ -189,7 +189,7 @@ - tqlayout1 + layout1 @@ -199,7 +199,7 @@ - tqlayout14 + layout14 @@ -257,7 +257,7 @@ - tqlayout7 + layout7 @@ -367,7 +367,7 @@ - tqlayout14_2 + layout14_2 @@ -425,7 +425,7 @@ - tqlayout7_2 + layout7_2 @@ -535,7 +535,7 @@ - tqlayout12 + layout12 diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui index a3f57deb..45b4dd60 100644 --- a/kstars/kstars/imgsequencedlgui.ui +++ b/kstars/kstars/imgsequencedlgui.ui @@ -38,7 +38,7 @@ - tqlayout25 + layout25 @@ -46,7 +46,7 @@ - tqlayout24 + layout24 @@ -152,7 +152,7 @@ - tqlayout9 + layout9 @@ -221,7 +221,7 @@ - tqlayout10 + layout10 @@ -240,7 +240,7 @@ - tqlayout30 + layout30 @@ -248,7 +248,7 @@ - tqlayout29 + layout29 @@ -328,7 +328,7 @@ - tqlayout28 + layout28 @@ -404,7 +404,7 @@ - tqlayout29_2 + layout29_2 diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui index afb72e3b..cf4c297e 100644 --- a/kstars/kstars/indiconf.ui +++ b/kstars/kstars/indiconf.ui @@ -43,7 +43,7 @@ - tqlayout4 + layout4 @@ -302,7 +302,7 @@ - tqlayout3 + layout3 @@ -328,7 +328,7 @@ - tqlayout4 + layout4 diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index fb211504..56e8407f 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -605,7 +605,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[]) return NULL; } - /* RemoveQt::Vertical spacer from group tqlayout, this is done everytime + /* RemoveQt::Vertical spacer from group layout, this is done everytime * a new property arrives. The spacer is then appended to the end of the * properties */ pg->propertyLayout->removeItem(pg->VerticalSpacer); @@ -775,7 +775,7 @@ int INDI_D::buildTextGUI(XMLEle *root, char errmsg[]) if (pp == NULL) return (-1); - /* get the permission, it will determine tqlayout issues */ + /* get the permission, it will determine layout 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 tqlayout issues */ + /* get the permission, it will determine layout 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 tqlayout */ + /* otherwise, build 1-4 button layout */ 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 tqlayout */ + /* 1-4 checkboxes layout */ 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 tqlayout issues */ + /* get the permission, it will determine layout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h index 8ef4d542..2e84d326 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 tqlayout */ +/* GUI layout */ #define PROPERTY_LABEL_WIDTH 80 #define ELEMENT_LABEL_WIDTH 175 #define ELEMENT_READ_WIDTH 175 @@ -98,7 +98,7 @@ class INDI_E : public TQObject PState state; /* control on/off t/f etc */ INDI_P *pp; /* parent property */ - TQHBoxLayout *EHBox; /*Qt::Horizontal tqlayout */ + TQHBoxLayout *EHBox; /*Qt::Horizontal layout */ /* GUI widgets, only malloced when needed */ KSqueezedTextLabel *label_w; // label diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h index 0b7651d5..b68a976d 100644 --- a/kstars/kstars/indigroup.h +++ b/kstars/kstars/indigroup.h @@ -34,7 +34,7 @@ class INDI_G TQString name; /* Group name */ INDI_D *dp; /* Parent device */ TQFrame *propertyContainer; /* Properties container */ - TQVBoxLayout *propertyLayout; /* Properties tqlayout */ + TQVBoxLayout *propertyLayout; /* Properties layout */ 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 91ad8cf5..2e332481 100644 --- a/kstars/kstars/indihostconf.ui +++ b/kstars/kstars/indihostconf.ui @@ -21,7 +21,7 @@ - tqlayout7 + layout7 @@ -29,7 +29,7 @@ - tqlayout6 + layout6 @@ -63,7 +63,7 @@ - tqlayout5 + layout5 diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 3d0345c1..112a69b4 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -450,7 +450,7 @@ void INDI_P::addGUI (XMLEle *root) light->show(); label_w->show(); - /* #3 Add theQt::Vertical tqlayout thay may contain several elements */ + /* #3 Add theQt::Vertical layout thay may contain several elements */ PHBox->addLayout(PVBox); } diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index 41628d96..97631bd0 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -467,7 +467,7 @@ void KStars::privatedata::buildGUI() { ks->initStatusBar(); ks->initActions(); - // create the tqlayout of the central widget + // create the layout of the central widget ks->topLayout = new TQVBoxLayout( ks->centralWidget ); ks->topLayout->addWidget( ks->skymap ); diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui index defb7319..2a612e2e 100644 --- a/kstars/kstars/kswizardui.ui +++ b/kstars/kstars/kswizardui.ui @@ -47,7 +47,7 @@ - tqlayout11 + layout11 @@ -63,7 +63,7 @@ - tqlayout10 + layout10 @@ -157,7 +157,7 @@ - tqlayout17 + layout17 @@ -173,7 +173,7 @@ - tqlayout16 + layout16 @@ -181,7 +181,7 @@ - tqlayout15 + layout15 @@ -206,7 +206,7 @@ - tqlayout14 + layout14 @@ -248,7 +248,7 @@ country.</p> - tqlayout4 + layout4 @@ -323,7 +323,7 @@ country.</p> - tqlayout12 + layout12 @@ -440,7 +440,7 @@ country.</p> - tqlayout18 + layout18 @@ -456,7 +456,7 @@ country.</p> - tqlayout17 + layout17 @@ -481,7 +481,7 @@ country.</p> - tqlayout16 + layout16 @@ -544,7 +544,7 @@ You can always set up devices later using the <b>Devices</b> menu. - tqlayout15 + layout15 @@ -661,7 +661,7 @@ and other astronomical devices such as CCD cameras and focusers. - tqlayout19 + layout19 @@ -677,7 +677,7 @@ and other astronomical devices such as CCD cameras and focusers. - tqlayout18 + layout18 @@ -702,7 +702,7 @@ and other astronomical devices such as CCD cameras and focusers. - tqlayout17 + layout17 @@ -744,7 +744,7 @@ button to proceed. </p> - tqlayout13 + layout13 diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 2f1462b8..8bbd34ac 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -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 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 + 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 CoordLay = new TQVBoxLayout( CoordBox, 6, 4 ); //root mgr for coordbox CoordLay->setSpacing( 6 ); CoordLay->setMargin( 6 ); - 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 + 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 //Create widgets CityFiltLabel = new TQLabel( CityBox ); diff --git a/kstars/kstars/newfovui.ui b/kstars/kstars/newfovui.ui index f5490b41..73cc811b 100644 --- a/kstars/kstars/newfovui.ui +++ b/kstars/kstars/newfovui.ui @@ -21,7 +21,7 @@ - tqlayout6 + layout6 @@ -74,7 +74,7 @@ - tqlayout16 + layout16 @@ -82,7 +82,7 @@ - tqlayout11 + layout11 @@ -116,7 +116,7 @@ - tqlayout15 + layout15 @@ -124,7 +124,7 @@ - tqlayout12 + layout12 @@ -160,7 +160,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout13 + layout13 @@ -196,7 +196,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout14 + layout14 @@ -253,7 +253,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout14 + layout14 @@ -376,7 +376,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" - tqlayout26 + layout26 @@ -384,7 +384,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" - tqlayout25 + layout25 @@ -410,7 +410,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" - tqlayout24 + layout24 @@ -418,7 +418,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" - tqlayout15 + layout15 @@ -460,7 +460,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout16 + layout16 @@ -513,7 +513,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout26_3 + layout26_3 @@ -521,7 +521,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout25_3 + layout25_3 @@ -547,7 +547,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout24_3 + layout24_3 @@ -555,7 +555,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout15_4 + layout15_4 @@ -597,7 +597,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout16_4 + layout16_4 @@ -654,7 +654,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - tqlayout36 + layout36 @@ -703,7 +703,7 @@ The computed HPBW angle (in arcminutes) will be displayed in the "Field of view" - tqlayout14 + layout14 @@ -751,7 +751,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to - tqlayout11 + layout11 @@ -759,7 +759,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to - tqlayout3 + layout3 @@ -767,7 +767,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to - tqlayout2 + layout2 @@ -854,7 +854,7 @@ Circle, Square, Crosshairs, Bullseye. - tqlayout10 + layout10 diff --git a/kstars/kstars/opsadvancedui.ui b/kstars/kstars/opsadvancedui.ui index cea4b508..54b01920 100644 --- a/kstars/kstars/opsadvancedui.ui +++ b/kstars/kstars/opsadvancedui.ui @@ -140,7 +140,7 @@ - tqlayout16 + layout16 @@ -200,7 +200,7 @@ - tqlayout20 + layout20 @@ -269,7 +269,7 @@ - tqlayout4 + layout4 diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui index d7012f99..1aa33488 100644 --- a/kstars/kstars/opscatalogui.ui +++ b/kstars/kstars/opscatalogui.ui @@ -52,7 +52,7 @@ - tqlayout8 + layout8 @@ -177,7 +177,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - tqlayout9 + layout9 @@ -234,7 +234,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - tqlayout7 + layout7 @@ -275,7 +275,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - tqlayout8 + layout8 @@ -329,7 +329,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - tqlayout15 + layout15 @@ -362,7 +362,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - tqlayout14 + layout14 @@ -436,7 +436,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - tqlayout8_2 + layout8_2 diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui index 1c08c304..fc70d791 100644 --- a/kstars/kstars/opscolorsui.ui +++ b/kstars/kstars/opscolorsui.ui @@ -43,7 +43,7 @@ - tqlayout4 + layout4 @@ -81,7 +81,7 @@ - tqlayout10 + layout10 @@ -113,7 +113,7 @@ - tqlayout11 + layout11 @@ -169,7 +169,7 @@ - tqlayout9 + layout9 diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui index 05cc5c28..3373e409 100644 --- a/kstars/kstars/opssolarsystemui.ui +++ b/kstars/kstars/opssolarsystemui.ui @@ -32,7 +32,7 @@ - tqlayout20 + layout20 @@ -462,7 +462,7 @@ - tqlayout12 + layout12 diff --git a/kstars/kstars/starobject.cpp b/kstars/kstars/starobject.cpp index 12fb5652..8e46b0db 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 tqunicode symbols for sigma; + //there are two unicode 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/streamformui.ui b/kstars/kstars/streamformui.ui index 86088d12..a4e34507 100644 --- a/kstars/kstars/streamformui.ui +++ b/kstars/kstars/streamformui.ui @@ -21,7 +21,7 @@ - tqlayout2 + layout2 diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 51bf3e4a..d000abfc 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -138,7 +138,7 @@ void StreamWG::setSize(int wd, int ht) streamFrame->totalBaseCount = wd * ht; - resize(wd + tqlayout()->margin() * 2 , ht + playB->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()); + resize(wd + layout()->margin() * 2 , ht + playB->height() + layout()->margin() * 2 + layout()->spacing()); streamFrame->resize(wd, ht); } diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui index 6968b989..91b3aefc 100644 --- a/kstars/kstars/telescopepropui.ui +++ b/kstars/kstars/telescopepropui.ui @@ -32,7 +32,7 @@ - tqlayout12 + layout12 @@ -110,7 +110,7 @@ - tqlayout8 + layout8 @@ -160,7 +160,7 @@ - tqlayout9 + layout9 @@ -186,7 +186,7 @@ - tqlayout5 + layout5 @@ -209,7 +209,7 @@ - tqlayout6 + layout6 diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui index 9e88ffe6..715219c4 100644 --- a/kstars/kstars/telescopewizard.ui +++ b/kstars/kstars/telescopewizard.ui @@ -44,7 +44,7 @@ - tqlayout12 + layout12 @@ -190,7 +190,7 @@ Please select your telescope model from the list below. Click next after selecti - tqlayout10 + layout10 @@ -329,7 +329,7 @@ Verify if the following time, date, and location settings are correct. If any of - tqlayout14 + layout14 @@ -337,7 +337,7 @@ Verify if the following time, date, and location settings are correct. If any of - tqlayout13 + layout13 @@ -345,7 +345,7 @@ Verify if the following time, date, and location settings are correct. If any of - tqlayout6 + layout6 @@ -353,7 +353,7 @@ Verify if the following time, date, and location settings are correct. If any of - tqlayout2 + layout2 @@ -384,7 +384,7 @@ Verify if the following time, date, and location settings are correct. If any of - tqlayout3 + layout3 @@ -417,7 +417,7 @@ Verify if the following time, date, and location settings are correct. If any of - tqlayout4 + layout4 @@ -450,7 +450,7 @@ Verify if the following time, date, and location settings are correct. If any of - tqlayout11 + layout11 @@ -547,7 +547,7 @@ Enter the port number your telescope is connected to. If you only have one seria - tqlayout17 + layout17 diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui index 1058ee6c..c3232750 100644 --- a/kstars/kstars/thumbnailpickerui.ui +++ b/kstars/kstars/thumbnailpickerui.ui @@ -24,7 +24,7 @@ - tqlayout9 + layout9 @@ -32,7 +32,7 @@ - tqlayout8 + layout8 @@ -110,7 +110,7 @@ - tqlayout10 + layout10 @@ -118,7 +118,7 @@ - tqlayout9 + layout9 @@ -143,7 +143,7 @@ - tqlayout8 + layout8 @@ -211,7 +211,7 @@ - tqlayout3 + layout3 @@ -236,7 +236,7 @@ - tqlayout2 + layout2 diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index f68d56dc..3f435314 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -36,7 +36,7 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) TQFrame *page = plainPage(); vlay = new TQVBoxLayout( page, 2, 2 ); - hlay = new TQHBoxLayout( 2 ); //this tqlayout will be added to the VLayout + hlay = new TQHBoxLayout( 2 ); //this layout will be added to the VLayout dPicker = new ExtDatePicker( page ); dPicker->setDate( now.date() ); diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui index 601854d0..629dc8d9 100644 --- a/kstars/kstars/tools/altvstimeui.ui +++ b/kstars/kstars/tools/altvstimeui.ui @@ -44,7 +44,7 @@ - tqlayout30 + layout30 @@ -175,7 +175,7 @@ - tqlayout6 + layout6 @@ -285,7 +285,7 @@ - tqlayout57 + layout57 @@ -331,7 +331,7 @@ - tqlayout25 + layout25 @@ -430,7 +430,7 @@ - tqlayout26 + layout26 diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui index aac25fe2..77629c58 100644 --- a/kstars/kstars/tools/argchangeviewoption.ui +++ b/kstars/kstars/tools/argchangeviewoption.ui @@ -18,7 +18,7 @@ - tqlayout2 + layout2 diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui index 8a1d00bc..b218bcda 100644 --- a/kstars/kstars/tools/argexportimage.ui +++ b/kstars/kstars/tools/argexportimage.ui @@ -18,7 +18,7 @@ - tqlayout7 + layout7 @@ -47,7 +47,7 @@ - tqlayout6 + layout6 @@ -72,7 +72,7 @@ - tqlayout5 + layout5 diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui index c8d47e35..a4e3f206 100644 --- a/kstars/kstars/tools/arglooktoward.ui +++ b/kstars/kstars/tools/arglooktoward.ui @@ -18,7 +18,7 @@ - tqlayout12 + layout12 diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui index b299ce35..f1268bba 100644 --- a/kstars/kstars/tools/argsetactionindi.ui +++ b/kstars/kstars/tools/argsetactionindi.ui @@ -21,7 +21,7 @@ - tqlayout50 + layout50 @@ -29,7 +29,7 @@ - tqlayout47 + layout47 @@ -55,7 +55,7 @@ - tqlayout48 + layout48 diff --git a/kstars/kstars/tools/argsetaltaz.ui b/kstars/kstars/tools/argsetaltaz.ui index 52a7aebf..7c22bea4 100644 --- a/kstars/kstars/tools/argsetaltaz.ui +++ b/kstars/kstars/tools/argsetaltaz.ui @@ -18,7 +18,7 @@ - tqlayout13 + layout13 diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui index 17eb9e8a..dc4cd195 100644 --- a/kstars/kstars/tools/argsetccdtempindi.ui +++ b/kstars/kstars/tools/argsetccdtempindi.ui @@ -18,7 +18,7 @@ - tqlayout64 + layout64 @@ -26,7 +26,7 @@ - tqlayout63 + layout63 @@ -52,7 +52,7 @@ - tqlayout62 + layout62 diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui index 86292282..ac096c45 100644 --- a/kstars/kstars/tools/argsetcolor.ui +++ b/kstars/kstars/tools/argsetcolor.ui @@ -18,7 +18,7 @@ - tqlayout11 + layout11 @@ -42,7 +42,7 @@ - tqlayout10 + layout10 diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui index a5681d90..83d79f09 100644 --- a/kstars/kstars/tools/argsetfilternumindi.ui +++ b/kstars/kstars/tools/argsetfilternumindi.ui @@ -21,7 +21,7 @@ - tqlayout64 + layout64 @@ -29,7 +29,7 @@ - tqlayout63 + layout63 @@ -55,7 +55,7 @@ - tqlayout62 + layout62 diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui index 0247bd6e..a736d577 100644 --- a/kstars/kstars/tools/argsetfocustimeoutindi.ui +++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui @@ -18,7 +18,7 @@ - tqlayout64 + layout64 @@ -26,7 +26,7 @@ - tqlayout63 + layout63 @@ -52,7 +52,7 @@ - tqlayout62 + layout62 diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui index 61dd9e9c..0a82d908 100644 --- a/kstars/kstars/tools/argsetframetypeindi.ui +++ b/kstars/kstars/tools/argsetframetypeindi.ui @@ -18,7 +18,7 @@ - tqlayout55 + layout55 @@ -26,7 +26,7 @@ - tqlayout47 + layout47 @@ -52,7 +52,7 @@ - tqlayout54 + layout54 diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index 1456e43d..ee80245d 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -18,7 +18,7 @@ - tqlayout36 + layout36 @@ -26,7 +26,7 @@ - tqlayout35 + layout35 @@ -34,7 +34,7 @@ - tqlayout34 + layout34 @@ -101,7 +101,7 @@ - tqlayout33 + layout33 diff --git a/kstars/kstars/tools/argsetgeolocationindi.ui b/kstars/kstars/tools/argsetgeolocationindi.ui index 9e7a5f6e..febc5a16 100644 --- a/kstars/kstars/tools/argsetgeolocationindi.ui +++ b/kstars/kstars/tools/argsetgeolocationindi.ui @@ -18,7 +18,7 @@ - tqlayout34 + layout34 @@ -26,7 +26,7 @@ - tqlayout32 + layout32 @@ -60,7 +60,7 @@ - tqlayout33 + layout33 diff --git a/kstars/kstars/tools/argsetlocaltime.ui b/kstars/kstars/tools/argsetlocaltime.ui index ef804797..a1c4ea04 100644 --- a/kstars/kstars/tools/argsetlocaltime.ui +++ b/kstars/kstars/tools/argsetlocaltime.ui @@ -23,7 +23,7 @@ - tqlayout43 + layout43 diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui index 215de8cc..43b9e538 100644 --- a/kstars/kstars/tools/argsetportindi.ui +++ b/kstars/kstars/tools/argsetportindi.ui @@ -18,7 +18,7 @@ - tqlayout23 + layout23 diff --git a/kstars/kstars/tools/argsetradec.ui b/kstars/kstars/tools/argsetradec.ui index f5d7eee0..5ad32a80 100644 --- a/kstars/kstars/tools/argsetradec.ui +++ b/kstars/kstars/tools/argsetradec.ui @@ -18,7 +18,7 @@ - tqlayout13 + layout13 diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui index 559083d2..3c69cb6c 100644 --- a/kstars/kstars/tools/argsetscopeactionindi.ui +++ b/kstars/kstars/tools/argsetscopeactionindi.ui @@ -18,7 +18,7 @@ - tqlayout55 + layout55 @@ -26,7 +26,7 @@ - tqlayout47 + layout47 @@ -52,7 +52,7 @@ - tqlayout54 + layout54 diff --git a/kstars/kstars/tools/argsettargetcoordindi.ui b/kstars/kstars/tools/argsettargetcoordindi.ui index 0876841e..d40cf07c 100644 --- a/kstars/kstars/tools/argsettargetcoordindi.ui +++ b/kstars/kstars/tools/argsettargetcoordindi.ui @@ -18,7 +18,7 @@ - tqlayout34 + layout34 @@ -26,7 +26,7 @@ - tqlayout32 + layout32 @@ -60,7 +60,7 @@ - tqlayout33 + layout33 diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui index ed1bb8b8..844df2f6 100644 --- a/kstars/kstars/tools/argsettargetnameindi.ui +++ b/kstars/kstars/tools/argsettargetnameindi.ui @@ -18,7 +18,7 @@ - tqlayout44 + layout44 @@ -26,7 +26,7 @@ - tqlayout40 + layout40 @@ -52,7 +52,7 @@ - tqlayout41 + layout41 @@ -72,7 +72,7 @@ - tqlayout42 + layout42 diff --git a/kstars/kstars/tools/argsettrack.ui b/kstars/kstars/tools/argsettrack.ui index e163e972..c8abd448 100644 --- a/kstars/kstars/tools/argsettrack.ui +++ b/kstars/kstars/tools/argsettrack.ui @@ -18,7 +18,7 @@ - tqlayout24 + layout24 diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui index 8c79ee06..09fa447b 100644 --- a/kstars/kstars/tools/argsetutcindi.ui +++ b/kstars/kstars/tools/argsetutcindi.ui @@ -18,7 +18,7 @@ - tqlayout88 + layout88 @@ -26,7 +26,7 @@ - tqlayout86 + layout86 @@ -52,7 +52,7 @@ - tqlayout87 + layout87 diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui index 77a1053e..126b5777 100644 --- a/kstars/kstars/tools/argshutdownindi.ui +++ b/kstars/kstars/tools/argshutdownindi.ui @@ -18,7 +18,7 @@ - tqlayout5 + layout5 @@ -26,7 +26,7 @@ - tqlayout4 + layout4 diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui index 163b2ae3..efc59043 100644 --- a/kstars/kstars/tools/argstartexposureindi.ui +++ b/kstars/kstars/tools/argstartexposureindi.ui @@ -18,7 +18,7 @@ - tqlayout64 + layout64 @@ -26,7 +26,7 @@ - tqlayout63 + layout63 @@ -52,7 +52,7 @@ - tqlayout62 + layout62 diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui index e4a39111..2c52cab0 100644 --- a/kstars/kstars/tools/argstartfocusindi.ui +++ b/kstars/kstars/tools/argstartfocusindi.ui @@ -18,7 +18,7 @@ - tqlayout55 + layout55 @@ -26,7 +26,7 @@ - tqlayout47 + layout47 @@ -52,7 +52,7 @@ - tqlayout54 + layout54 diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui index 308c2c79..166fd7d4 100644 --- a/kstars/kstars/tools/argstartindi.ui +++ b/kstars/kstars/tools/argstartindi.ui @@ -18,7 +18,7 @@ - tqlayout5 + layout5 @@ -26,7 +26,7 @@ - tqlayout4 + layout4 diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui index 6e83732e..efba3fa9 100644 --- a/kstars/kstars/tools/argswitchindi.ui +++ b/kstars/kstars/tools/argswitchindi.ui @@ -18,7 +18,7 @@ - tqlayout5 + layout5 @@ -26,7 +26,7 @@ - tqlayout4 + layout4 diff --git a/kstars/kstars/tools/argtimescale.ui b/kstars/kstars/tools/argtimescale.ui index dd5a9181..1039f9fd 100644 --- a/kstars/kstars/tools/argtimescale.ui +++ b/kstars/kstars/tools/argtimescale.ui @@ -18,7 +18,7 @@ - tqlayout4 + layout4 diff --git a/kstars/kstars/tools/argwaitfor.ui b/kstars/kstars/tools/argwaitfor.ui index 523ddbeb..24733f4c 100644 --- a/kstars/kstars/tools/argwaitfor.ui +++ b/kstars/kstars/tools/argwaitfor.ui @@ -18,7 +18,7 @@ - tqlayout17 + layout17 diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui index 40459a55..0fa2e564 100644 --- a/kstars/kstars/tools/argwaitforkey.ui +++ b/kstars/kstars/tools/argwaitforkey.ui @@ -18,7 +18,7 @@ - tqlayout18 + layout18 diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui index 20e6f2a0..9eff8db5 100644 --- a/kstars/kstars/tools/argzoom.ui +++ b/kstars/kstars/tools/argzoom.ui @@ -18,7 +18,7 @@ - tqlayout2 + layout2 diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index 027172a3..b309233e 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -69,9 +69,9 @@ void LCGenerator::createGUI() StarInfoBox = new TQGroupBox( page, "StarInfoBox" ); StarInfoBox->setColumnLayout(0, Qt::Vertical ); - StarInfoBox->tqlayout()->setSpacing( 6 ); - StarInfoBox->tqlayout()->setMargin( 11 ); - StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->tqlayout() ); + StarInfoBox->layout()->setSpacing( 6 ); + StarInfoBox->layout()->setMargin( 11 ); + StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->layout() ); StarInfoBoxLayout->setAlignment( TQt::AlignTop ); DesignHLayout = new TQHBoxLayout( 0, 0, 6, "DesignHLayout"); @@ -125,9 +125,9 @@ void LCGenerator::createGUI() DataSelectBox = new TQGroupBox( page, "DataSelectBox" ); DataSelectBox->setColumnLayout(0, Qt::Vertical ); - DataSelectBox->tqlayout()->setSpacing( 6 ); - DataSelectBox->tqlayout()->setMargin( 11 ); - DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->tqlayout() ); + DataSelectBox->layout()->setSpacing( 6 ); + DataSelectBox->layout()->setMargin( 11 ); + DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->layout() ); DataSelectBoxLayout->setAlignment( TQt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 589490b3..3f4659a5 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -36,7 +36,7 @@ - tqlayout8 + layout8 @@ -160,7 +160,7 @@ - tqlayout7 + layout7 @@ -525,7 +525,7 @@ - tqlayout14 + layout14 diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index ae08f3a5..5a59fa1d 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -39,7 +39,7 @@ - tqlayout11 + layout11 @@ -192,7 +192,7 @@ - tqlayout3 + layout3 @@ -297,7 +297,7 @@ - tqlayout12 + layout12 @@ -625,7 +625,7 @@ - tqlayout14 + layout14 diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index 5b2dc953..ad8e076a 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -50,7 +50,7 @@ - tqlayout20 + layout20 @@ -114,7 +114,7 @@ - tqlayout11 + layout11 @@ -258,7 +258,7 @@ - tqlayout21 + layout21 @@ -801,7 +801,7 @@ - tqlayout14 + layout14 diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index cb14f3d5..82aa6c12 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -38,7 +38,7 @@ - tqlayout37 + layout37 @@ -158,7 +158,7 @@ - tqlayout3 + layout3 @@ -246,7 +246,7 @@ - tqlayout10 + layout10 @@ -393,7 +393,7 @@ - tqlayout20 + layout20 diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index ac400e73..98830fb3 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -125,7 +125,7 @@ - tqlayout2 + layout2 @@ -202,7 +202,7 @@ - tqlayout9 + layout9 @@ -338,7 +338,7 @@ - tqlayout5 + layout5 @@ -726,7 +726,7 @@ - tqlayout22_3 + layout22_3 diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index 91d918ab..b62875ee 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -144,7 +144,7 @@ - tqlayout2 + layout2 @@ -430,7 +430,7 @@ - tqlayout22 + layout22 diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index 76c1c91a..3b296fe0 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -125,7 +125,7 @@ - tqlayout2 + layout2 @@ -202,7 +202,7 @@ - tqlayout22 + layout22 @@ -338,7 +338,7 @@ - tqlayout5 + layout5 @@ -709,7 +709,7 @@ - tqlayout22_3 + layout22_3 diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index 7e31adde..03b9aeff 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -39,7 +39,7 @@ - tqlayout31 + layout31 @@ -58,7 +58,7 @@ - tqlayout1 + layout1 @@ -112,7 +112,7 @@ - tqlayout2 + layout2 @@ -189,7 +189,7 @@ - tqlayout32 + layout32 @@ -584,7 +584,7 @@ - tqlayout22 + layout22 diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index 66839f81..b5c1c5b8 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -40,7 +40,7 @@ - tqlayout9 + layout9 @@ -100,7 +100,7 @@ - tqlayout37 + layout37 @@ -284,7 +284,7 @@ - tqlayout7 + layout7 diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 0f781ad1..638a1fbd 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -47,7 +47,7 @@ - tqlayout13 + layout13 @@ -159,7 +159,7 @@ - tqlayout14 + layout14 @@ -167,7 +167,7 @@ - tqlayout20 + layout20 @@ -243,7 +243,7 @@ - tqlayout11 + layout11 @@ -318,7 +318,7 @@ - tqlayout13 + layout13 @@ -337,7 +337,7 @@ - tqlayout11 + layout11 @@ -415,7 +415,7 @@ - tqlayout12 + layout12 @@ -495,7 +495,7 @@ - tqlayout8 + layout8 @@ -590,7 +590,7 @@ - tqlayout9 + layout9 @@ -687,7 +687,7 @@ - tqlayout1 + layout1 @@ -1143,7 +1143,7 @@ - tqlayout14_2 + layout14_2 diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index 57f720ba..d0f7af15 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -64,7 +64,7 @@ - tqlayout25 + layout25 @@ -151,7 +151,7 @@ - tqlayout2 + layout2 @@ -273,7 +273,7 @@ - tqlayout26 + layout26 @@ -551,7 +551,7 @@ - tqlayout14_2 + layout14_2 diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui index 37c5e7cd..e7203887 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -39,7 +39,7 @@ - tqlayout47 + layout47 @@ -141,7 +141,7 @@ - tqlayout3 + layout3 @@ -218,7 +218,7 @@ - tqlayout47 + layout47 @@ -406,7 +406,7 @@ - tqlayout30 + layout30 @@ -483,7 +483,7 @@ - tqlayout32 + layout32 @@ -647,7 +647,7 @@ - tqlayout22_3 + layout22_3 diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index ce0a1693..0c177d99 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -47,7 +47,7 @@ - tqlayout7 + layout7 @@ -145,7 +145,7 @@ - tqlayout8 + layout8 @@ -223,7 +223,7 @@ - tqlayout14 + layout14 @@ -354,7 +354,7 @@ - tqlayout15 + layout15 @@ -937,7 +937,7 @@ - tqlayout14 + layout14 diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index f8ef28e1..4a664c0c 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -21,7 +21,7 @@ - tqlayout68 + layout68 @@ -218,7 +218,7 @@ - tqlayout4 + layout4 diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index 77753b53..e7891bed 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -21,7 +21,7 @@ - tqlayout79 + layout79 @@ -29,7 +29,7 @@ - tqlayout55 + layout55 @@ -117,7 +117,7 @@ - tqlayout12 + layout12 @@ -164,7 +164,7 @@ - tqlayout13 + layout13 @@ -225,7 +225,7 @@ - tqlayout12 + layout12 @@ -342,7 +342,7 @@ - tqlayout48 + layout48 @@ -529,7 +529,7 @@ - tqlayout9 + layout9 @@ -659,7 +659,7 @@ - tqlayout6 + layout6 @@ -697,7 +697,7 @@ - tqlayout4 + layout4 @@ -736,7 +736,7 @@ - tqlayout5_2 + layout5_2 @@ -829,7 +829,7 @@ - tqlayout36 + layout36 diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui index 5e4e66b2..775b2270 100644 --- a/kstars/kstars/tools/optionstreeview.ui +++ b/kstars/kstars/tools/optionstreeview.ui @@ -62,7 +62,7 @@ - tqlayout3 + layout3 diff --git a/kstars/kstars/tools/planetviewerui.ui b/kstars/kstars/tools/planetviewerui.ui index acd5a81c..77b8db5a 100644 --- a/kstars/kstars/tools/planetviewerui.ui +++ b/kstars/kstars/tools/planetviewerui.ui @@ -26,7 +26,7 @@ - tqlayout2 + layout2 diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index aecbe3e9..e34e6dcb 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -21,7 +21,7 @@ - tqlayout5 + layout5 @@ -240,7 +240,7 @@ - tqlayout6 + layout6 @@ -267,7 +267,7 @@ - tqlayout5 + layout5 @@ -554,7 +554,7 @@ - tqlayout11 + layout11 @@ -562,7 +562,7 @@ - tqlayout10 + layout10 diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui index c19007a9..108a8b95 100644 --- a/kstars/kstars/tools/scriptnamedialog.ui +++ b/kstars/kstars/tools/scriptnamedialog.ui @@ -24,7 +24,7 @@ - tqlayout3 + layout3 @@ -75,7 +75,7 @@ - tqlayout2 + layout2 diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui index 0968486f..b80697da 100644 --- a/kstars/kstars/tools/wutdialogui.ui +++ b/kstars/kstars/tools/wutdialogui.ui @@ -21,7 +21,7 @@ - tqlayout25 + layout25 @@ -29,7 +29,7 @@ - tqlayout24 + layout24 @@ -37,7 +37,7 @@ - tqlayout23 + layout23 @@ -125,7 +125,7 @@ - tqlayout13 + layout13 @@ -162,7 +162,7 @@ - tqlayout9 + layout9 @@ -361,7 +361,7 @@ - tqlayout10 + layout10 diff --git a/ktouch/ChangeLog b/ktouch/ChangeLog index 58ac84b8..2a918ddc 100644 --- a/ktouch/ChangeLog +++ b/ktouch/ChangeLog @@ -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 tqlayout for switzerland-german keyboards + * Added: new keyboard layout for switzerland-german keyboards 2004-11-02 Andreas Nicolai * Added: checks in the quick-select menues diff --git a/ktouch/keyboards/be.keyboard b/ktouch/keyboards/be.keyboard index 6de3fa0c..3995e5fd 100644 --- a/ktouch/keyboards/be.keyboard +++ b/ktouch/keyboards/be.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 tqunicode number tells the program +# but the key. The FingerKey unicode 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 tqunicode and then also -# the tqunicode for the base character on the key to be pressed. +# Define the character via its unicode and then also +# the unicode 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 57c0f657..87a71a62 100644 --- a/ktouch/keyboards/bg.keyboard +++ b/ktouch/keyboards/bg.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 10d7ac7e..170fe821 100644 --- a/ktouch/keyboards/de.keyboard +++ b/ktouch/keyboards/de.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for german keybord tqlayout +# Keybord layout file for german keybord layout # 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 6fce086a..9f2c883e 100644 --- a/ktouch/keyboards/de.neo.keyboard +++ b/ktouch/keyboards/de.neo.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 d02d2826..95c494db 100644 --- a/ktouch/keyboards/de.swiss.keyboard +++ b/ktouch/keyboards/de.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for german kaybord tqlayout +# Keybord layout file for german kaybord layout # 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 23f7128e..7b781aa8 100644 --- a/ktouch/keyboards/dk.keyboard +++ b/ktouch/keyboards/dk.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Danish kaybord +# Keybord layout 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 f80bdffe..6b90ed3e 100644 --- a/ktouch/keyboards/dvorak_fr.keyboard +++ b/ktouch/keyboards/dvorak_fr.keyboard @@ -1,7 +1,7 @@ # -*- coding: utf-8; -*- #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # Matthieu MOY, December 7th 2004 diff --git a/ktouch/keyboards/ee.keyboard b/ktouch/keyboards/ee.keyboard index 7e79a353..bd2a880e 100644 --- a/ktouch/keyboards/ee.keyboard +++ b/ktouch/keyboards/ee.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/en.dvorak.keyboard b/ktouch/keyboards/en.dvorak.keyboard index 295d4f43..d191f544 100644 --- a/ktouch/keyboards/en.dvorak.keyboard +++ b/ktouch/keyboards/en.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 84a3f31b..c0e9f2d1 100644 --- a/ktouch/keyboards/en.keyboard +++ b/ktouch/keyboards/en.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 tqunicode number tells the program +# but the key. The FingerKey unicode 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 tqunicode and then also -# the tqunicode for the base character on the key to be pressed. +# Define the character via its unicode and then also +# the unicode 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 56da935b..2dd84046 100644 --- a/ktouch/keyboards/es.dvorak.keyboard +++ b/ktouch/keyboards/es.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/es.keyboard b/ktouch/keyboards/es.keyboard index cae885f8..5211488e 100644 --- a/ktouch/keyboards/es.keyboard +++ b/ktouch/keyboards/es.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fi.keyboard b/ktouch/keyboards/fi.keyboard index 10775703..9edcd996 100644 --- a/ktouch/keyboards/fi.keyboard +++ b/ktouch/keyboards/fi.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fr.a.keyboard b/ktouch/keyboards/fr.a.keyboard index 0916da15..d18e4cfb 100644 --- a/ktouch/keyboards/fr.a.keyboard +++ b/ktouch/keyboards/fr.a.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fr.keyboard b/ktouch/keyboards/fr.keyboard index 81f54847..edfcf537 100644 --- a/ktouch/keyboards/fr.keyboard +++ b/ktouch/keyboards/fr.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fr.swiss.keyboard b/ktouch/keyboards/fr.swiss.keyboard index e56f6bf6..ba89c072 100644 --- a/ktouch/keyboards/fr.swiss.keyboard +++ b/ktouch/keyboards/fr.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for swiss french keybord tqlayout +# Keybord layout file for swiss french keybord layout #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/he.keyboard b/ktouch/keyboards/he.keyboard index f09db772..e03f5bd1 100644 --- a/ktouch/keyboards/he.keyboard +++ b/ktouch/keyboards/he.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Hebrew +# Keybord layout file for Hebrew #################################################### # # diff --git a/ktouch/keyboards/hu.keyboard b/ktouch/keyboards/hu.keyboard index bdf90711..afd77ef1 100644 --- a/ktouch/keyboards/hu.keyboard +++ b/ktouch/keyboards/hu.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Hungarian keybord tqlayout file +# Hungarian keybord layout file # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/it.keyboard b/ktouch/keyboards/it.keyboard index 1d99b944..3f9c5828 100644 --- a/ktouch/keyboards/it.keyboard +++ b/ktouch/keyboards/it.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/la.keyboard b/ktouch/keyboards/la.keyboard index 0094f924..55d6c6cd 100644 --- a/ktouch/keyboards/la.keyboard +++ b/ktouch/keyboards/la.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Latin keyboard +# Keybord layout file for Latin keyboard #################################################### # # diff --git a/ktouch/keyboards/nb.keyboard b/ktouch/keyboards/nb.keyboard index 13448d50..ca4f503d 100644 --- a/ktouch/keyboards/nb.keyboard +++ b/ktouch/keyboards/nb.keyboard @@ -1,11 +1,11 @@ #################################################### # KTouch -# Keybord tqlayout file for Norwegian keyboard +# Keybord layout 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/tqunicode/ +# over html codes -- see http://www.fileformat.info/info/unicode/ # # Refer to file en.keyboard for details. #################################################### diff --git a/ktouch/keyboards/nn.keyboard b/ktouch/keyboards/nn.keyboard index c6592195..79e9675b 100644 --- a/ktouch/keyboards/nn.keyboard +++ b/ktouch/keyboards/nn.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Norwegian kaybord +# Keybord layout file for Norwegian kaybord #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/pl.keyboard b/ktouch/keyboards/pl.keyboard index fbb3961a..8c5c3590 100644 --- a/ktouch/keyboards/pl.keyboard +++ b/ktouch/keyboards/pl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Polish (utf-8) +# Keybord layout 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 fe0e7bd9..be9af86f 100644 --- a/ktouch/keyboards/pt.br.keyboard +++ b/ktouch/keyboards/pt.br.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for brazilian keyboard +# Keybord layout file for brazilian keyboard #################################################### # # diff --git a/ktouch/keyboards/pt.keyboard b/ktouch/keyboards/pt.keyboard index 0309d97f..287c431d 100644 --- a/ktouch/keyboards/pt.keyboard +++ b/ktouch/keyboards/pt.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for portuguese keyboard +# Keybord layout file for portuguese keyboard #################################################### # # diff --git a/ktouch/keyboards/ru.2.keyboard b/ktouch/keyboards/ru.2.keyboard index c2645a1a..a3cf2039 100644 --- a/ktouch/keyboards/ru.2.keyboard +++ b/ktouch/keyboards/ru.2.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/ru.3.keyboard b/ktouch/keyboards/ru.3.keyboard index af32a33a..24d925a1 100644 --- a/ktouch/keyboards/ru.3.keyboard +++ b/ktouch/keyboards/ru.3.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Russian +# Keybord layout 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 15fa4ce8..df3cfb77 100644 --- a/ktouch/keyboards/ru.basic.keyboard +++ b/ktouch/keyboards/ru.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian basic keyboard tqlayout file for KTouch. +# Russian basic keyboard layout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/ru.keyboard b/ktouch/keyboards/ru.keyboard index f249ad83..651addf8 100644 --- a/ktouch/keyboards/ru.keyboard +++ b/ktouch/keyboards/ru.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian Windows keyboard tqlayout file for KTouch. +# Russian Windows keyboard layout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/ru.typewriter.keyboard b/ktouch/keyboards/ru.typewriter.keyboard index c57e17ac..67f16032 100644 --- a/ktouch/keyboards/ru.typewriter.keyboard +++ b/ktouch/keyboards/ru.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian typewriter keyboard tqlayout file for KTouch. +# Russian typewriter keyboard layout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/ru.winkeys.keyboard b/ktouch/keyboards/ru.winkeys.keyboard index 024d1c2c..5d412f99 100644 --- a/ktouch/keyboards/ru.winkeys.keyboard +++ b/ktouch/keyboards/ru.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian winkeys keyboard tqlayout file for KTouch. +# Russian winkeys keyboard layout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/sl.keyboard b/ktouch/keyboards/sl.keyboard index 6918a8ae..2f482f39 100644 --- a/ktouch/keyboards/sl.keyboard +++ b/ktouch/keyboards/sl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for slovenian keybord tqlayout +# Keybord layout file for slovenian keybord layout # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/sv.dvorak.keyboard b/ktouch/keyboards/sv.dvorak.keyboard index e81e1c0b..acb0acab 100644 --- a/ktouch/keyboards/sv.dvorak.keyboard +++ b/ktouch/keyboards/sv.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Swedish Dvorak Keybord tqlayout file +# Swedish Dvorak Keybord layout file #################################################### # # Ascii KeyText x y diff --git a/ktouch/keyboards/sv.keyboard b/ktouch/keyboards/sv.keyboard index 9e9ba96c..597a315d 100644 --- a/ktouch/keyboards/sv.keyboard +++ b/ktouch/keyboards/sv.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for swedish keybord tqlayout +# Keybord layout file for swedish keybord layout # 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 1953e9d4..92c08944 100644 --- a/ktouch/keyboards/tr.f.keyboard +++ b/ktouch/keyboards/tr.f.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Turkish F Keybord tqlayout file +# Turkish F Keybord layout 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 cfdac334..2fb7e1c2 100644 --- a/ktouch/keyboards/tr.q.keyboard +++ b/ktouch/keyboards/tr.q.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/uk.basic.keyboard b/ktouch/keyboards/uk.basic.keyboard index c1807e27..6ea507c4 100644 --- a/ktouch/keyboards/uk.basic.keyboard +++ b/ktouch/keyboards/uk.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian basic keyboard tqlayout file for KTouch. +# Ukrainian basic keyboard layout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/uk.typewriter.keyboard b/ktouch/keyboards/uk.typewriter.keyboard index 08c88015..129ac807 100644 --- a/ktouch/keyboards/uk.typewriter.keyboard +++ b/ktouch/keyboards/uk.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian typewriter keyboard tqlayout file for KTouch. +# Ukrainian typewriter keyboard layout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/keyboards/uk.winkeys.keyboard b/ktouch/keyboards/uk.winkeys.keyboard index 47d09711..d378df30 100644 --- a/ktouch/keyboards/uk.winkeys.keyboard +++ b/ktouch/keyboards/uk.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian winkeys keyboard tqlayout file for KTouch. +# Ukrainian winkeys keyboard layout file for KTouch. # # Created by Alexander Pravdin . # diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 85900c15..6c9a78c8 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -179,10 +179,10 @@ void KTouch::keyPressEvent(TQKeyEvent *keyEvent) { if (keyEvent->text().length() > 1) { kdDebug() << "[KTouch::keyPressEvent] text = '" << TQString(keyEvent->text()).ascii() << "'" << endl; } - TQChar key = keyEvent->text().at(0); // get first tqunicode character + TQChar key = keyEvent->text().at(0); // get first unicode character // HACK : manually filter out known dead keys // bool has_dead_key = true; - switch (key.tqunicode()) { + switch (key.unicode()) { case 94 : m_lastDeadKey = TQChar(uint(94)); break; case 176 : m_lastDeadKey = TQChar(uint(176)); break; case 180 : m_lastDeadKey = TQChar(uint(180)); break; @@ -468,9 +468,9 @@ void KTouch::changeStatusbarStats(unsigned int level_correct, unsigned int level void KTouch::changeKeyboard(int num) { if (static_cast(num)>=m_keyboardFiles.count()) return; Prefs::setCurrentKeyboardFile( m_keyboardFiles[num] ); -// kdDebug() << "[KTouch::changeKeyboard] new keyboard tqlayout = " << Prefs::currentKeyboardFile() << endl; +// kdDebug() << "[KTouch::changeKeyboard] new keyboard layout = " << Prefs::currentKeyboardFile() << endl; m_keyboardLayoutAction->setCurrentItem(num); - // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen tqlayout file is corrupt + // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen layout file is corrupt m_keyboardWidget->applyPreferences(this, false); } // ---------------------------------------------------------------------------- @@ -620,8 +620,8 @@ void KTouch::init() { */ } - // if keyboard tqlayout (loaded by Prefs is not available (e.g. the - // tqlayout file has been deleted) switch to default keyboard + // 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) { TQString default_keyboard; // determine locale @@ -652,7 +652,7 @@ void KTouch::init() { } // ---------------------------------------------------------------------------- -// Creates the tqlayout and GUI setup for a practice session +// Creates the layout and GUI setup for a practice session void KTouch::initTrainingSession() { //kdDebug() << "[KTouch::initTrainingSession] setting up layouts and widgets for new training session..." << endl; // Build the training area. The status widget has a fixed vertical size, the slide line and the @@ -753,7 +753,7 @@ void KTouch::updateFileLists() { // TODO : search in i18n() directories m_keyboardFiles = dirs->findAllResources("data","ktouch/*.keyboard"); - // remove the number tqlayout, since this is the necessary default tqlayout and will be + // remove the number layout, since this is the necessary default layout and will be // added anyway TQStringList::iterator it = m_keyboardFiles.find("number.keyboard"); if (it!=m_keyboardFiles.end()) m_keyboardFiles.remove(it); diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h index 620dfb49..ceec8abc 100644 --- a/ktouch/src/ktouch.h +++ b/ktouch/src/ktouch.h @@ -101,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 tqlayout (called from menu). + /// Quick-changes the keyboard layout (called from menu). void changeKeyboard(int num); /// Quick-changes the colour scheme used on the keyboard (called from menu). void changeColor(int num); @@ -111,7 +111,7 @@ class KTouch : public KMainWindow { protected: /// Reimplementated to save preferences and bool queryExit(); - /// Some tqlayout fixes here... + /// Some layout fixes here... void resizeEvent(TQResizeEvent *); /// Accepts a typed char. void keyPressEvent(TQKeyEvent *keyEvent); @@ -128,7 +128,7 @@ class KTouch : public KMainWindow { /// Initialises the program during a normal startup void init(); - /// Creates the tqlayout and GUI setup for a practice session + /// Creates the layout and GUI setup for a practice session void initTrainingSession(); /// Creates the (standard) actions and entries in the menu. void setupActions(); @@ -171,8 +171,8 @@ 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 tqlayout files. - TQStringList m_keyboardTitles; ///< A list of the titles of all default keyboard tqlayout 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. KTouchStatisticsData m_stats; ///< All user statistics are kept here. diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui index 2e13f7d0..38245a56 100644 --- a/ktouch/src/ktouchcoloreditor_dlg.ui +++ b/ktouch/src/ktouchcoloreditor_dlg.ui @@ -129,7 +129,7 @@ - tqlayout18 + layout18 @@ -179,7 +179,7 @@ - tqlayout14 + layout14 @@ -255,7 +255,7 @@ - tqlayout10 + layout10 @@ -367,7 +367,7 @@ - tqlayout24 + layout24 @@ -426,7 +426,7 @@ - tqlayout22 + layout22 @@ -525,7 +525,7 @@ - tqlayout20 + layout20 @@ -617,7 +617,7 @@ - tqlayout28 + layout28 diff --git a/ktouch/src/ktouchdefaults.h b/ktouch/src/ktouchdefaults.h index 8f6631db..d66a1663 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 tqlayout. +extern const int KEYBOARD_MARGIN; ///< The margin around the keybaord layout. extern const int LCD_UPDATE_INTERVAL; ///< Update interval for LCD display and statistics. diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index a8c6d83a..476a8502 100644 --- a/ktouch/src/ktouchkeyboard.cpp +++ b/ktouch/src/ktouchkeyboard.cpp @@ -34,7 +34,7 @@ void KTouchKeyboard::clear() { } // ---------------------------------------------------------------------------- -// Loads a keyboard tqlayout (old format) from file (returns true if successful). +// Loads a keyboard layout (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 @@ -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 tqlayout" << endl; + kdDebug() << "Reading new keyboard layout" << endl; m_keys.clear(); m_connectors.clear(); 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 tqlayout"); + else m_title = i18n("untitled keyboard layout"); 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 tqlayout") ); + if (m_title.isEmpty()) titleText = doc.createTextNode( i18n("untitled keyboard layout") ); 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 tqlayout. + // First let's create the visible layout. // 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,7 +327,7 @@ void KTouchKeyboard::createDefault() { m_connectors.push_back( KTouchKeyConnector('.', '.', '6', 0) ); m_title = "Number keypad"; - m_comment = "Predefined keyboard tqlayout"; + m_comment = "Predefined keyboard layout"; m_language = TQString(); // language does not apply to numbers... that's one of the nice things with math :-) m_fontSuggestions = "Monospace"; @@ -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 tqlayout file '%1'. ").arg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").arg(url.url()); + *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(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 tqlayout file for KTouch # \n"; + out << "# Keyboard layout 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.tqunicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.unicode() << '\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 tqlayout has changed + // let's check whether the keyboard layout has changed if (KTouchConfig().m_currentKeyboardFile!=m_currentLayout) { - // if the tqlayout is the number tqlayout just create it and we're done + // if the layout is the number layout just create it and we're done if (KTouchConfig().m_currentKeyboardFile=="number.keyboard") { createDefaultKeyboard(); resizeEvent(NULL); return; } - // ok, let's load this tqlayout + // ok, let's load this layout 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 tqlayout; the default number keypad will " - "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), + 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."), errorMsg); createDefaultKeyboard(); } diff --git a/ktouch/src/ktouchkeyboard.h b/ktouch/src/ktouchkeyboard.h index 0e2ebfd6..fa88bed5 100644 --- a/ktouch/src/ktouchkeyboard.h +++ b/ktouch/src/ktouchkeyboard.h @@ -24,7 +24,7 @@ class KURL; -/// This class stores the keyboard tqlayout and the connectivity between characters +/// This class stores the keyboard layout 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 tqlayout (old format) from file (returns true if successful). + /// Loads a keyboard layout (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); @@ -47,7 +47,7 @@ class KTouchKeyboard { TQValueVector m_connectors; ///< Vector with connectivity data. 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_comment; ///< Comments about the creator of the keyboard layout. TQString m_language; ///< Language ID of keyboard TQString m_fontSuggestions; ///< Suggestions of fonts to be used on the keys. diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp index 3e3abf62..40944155 100644 --- a/ktouch/src/ktouchkeyboardeditor.cpp +++ b/ktouch/src/ktouchkeyboardeditor.cpp @@ -133,7 +133,7 @@ void KTouchKeyboardEditor::paintEvent(TQPaintEvent *) { void KTouchKeyboardEditor::transfer_to_dialog() { if (m_currentURL.isEmpty()) { - titleEdit->setText( i18n("untitled keyboard tqlayout") ); + titleEdit->setText( i18n("untitled keyboard layout") ); keyboardCommentEdit->setText(""); } else { @@ -173,7 +173,7 @@ void KTouchKeyboardEditor::transfer_to_dialog() { void KTouchKeyboardEditor::transfer_from_dialog() { m_keyboard.m_title = titleEdit->text(); - if (m_keyboard.m_title.isEmpty()) m_keyboard.m_title = i18n("untitled keyboard tqlayout"); + if (m_keyboard.m_title.isEmpty()) m_keyboard.m_title = i18n("untitled keyboard layout"); m_keyboard.m_comment = keyboardCommentEdit->text(); m_keyboard.m_language = languageEdit->text(); } diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui index 23c88168..6f945dd2 100644 --- a/ktouch/src/ktouchkeyboardeditor_dlg.ui +++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui @@ -21,7 +21,7 @@ - tqlayout3 + layout3 @@ -169,7 +169,7 @@ - tqlayout3 + layout3 diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index 3e476f65..99cc63cc 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -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 tqlayout file '%1'. ").arg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").arg(url.url()); + *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(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 tqlayout file for KTouch # \n"; + out << "# Keyboard layout 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.tqunicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.unicode() << '\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 tqlayout has changed + // let's check whether the keyboard layout has changed if (Prefs::currentKeyboardFile() != m_currentLayout) { - // if the tqlayout is the number tqlayout just create it and we're done + // if the layout is the number layout 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 tqlayout + // ok, let's load this layout 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 tqlayout; the default number keypad will " - "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), + 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."), errorMsg); createDefaultKeyboard(); } @@ -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 : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : F : unicode = " << 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 : tqunicode = " << keyAscII << " char = " << keyText << endl; +// kdDebug() << "read : C : unicode = " << keyAscII << " char = " << keyText << endl; } else if (keyType=="NormalKey") { int fingerCharCode; @@ -412,12 +412,12 @@ 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 : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : N : unicode = " << 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 : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; +// kdDebug() << "read : H : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; } else { @@ -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 tqunicode numbers in this file" << endl; +// kdDebug() << "showing all unicode 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.tqunicode() << ") " - << "target = " << targetChar << "(" << targetChar.tqunicode() << ") " - << "finger = " << fingerChar << "(" << fingerChar.tqunicode() << ")" << endl; +/* kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.unicode() << ") " + << "target = " << targetChar << "(" << targetChar.unicode() << ") " + << "finger = " << fingerChar << "(" << fingerChar.unicode() << ")" << endl; */ m_keyCharMap[ch] = -1; diff --git a/ktouch/src/ktouchkeyboardwidget.h b/ktouch/src/ktouchkeyboardwidget.h index d49d58e6..dfada1fa 100644 --- a/ktouch/src/ktouchkeyboardwidget.h +++ b/ktouch/src/ktouchkeyboardwidget.h @@ -30,7 +30,7 @@ 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 tqlayout from/into a file.

+ * a keyboard layout 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.

@@ -45,14 +45,14 @@ class KTouchKeyboardWidget : public TQWidget { public: /// Constructor KTouchKeyboardWidget(TQWidget *parent); - /// Reads a keyboard tqlayout from the given URL. + /// Reads a keyboard layout 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 tqlayout to the URL. + /// Saves the keyboard layout to the URL. void saveKeyboard(TQWidget * window, const KURL& url); - /// Applies preferences to the keyboard tqlayout and the keys. - /// This means that the tqlayout is basically recreated and if the tqlayout type/language + /// Applies preferences to the keyboard layout and the keys. + /// This means that the layout is basically recreated and if the layout type/language /// changed it will be reloaded. void applyPreferences(TQWidget * window, bool silent); @@ -90,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 tqlayout. + TQString m_currentLayout; ///< The name of the currently used layout. 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.h b/ktouch/src/ktouchkeys.h index d0e97d60..68ffa959 100644 --- a/ktouch/src/ktouchkeys.h +++ b/ktouch/src/ktouchkeys.h @@ -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 tqlayout). + KeyType m_type; ///< Stores the type of the key (convenience for saving of the keyboard layout). }; // --------------------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui index bbe6cc8d..e12e3158 100644 --- a/ktouch/src/ktouchlectureeditor_dlg.ui +++ b/ktouch/src/ktouchlectureeditor_dlg.ui @@ -32,7 +32,7 @@ - tqlayout7 + layout7 @@ -109,7 +109,7 @@ - tqlayout9 + layout9 @@ -144,7 +144,7 @@ - tqlayout8 + layout8 @@ -155,7 +155,7 @@ - tqlayout7 + layout7 @@ -286,7 +286,7 @@ - tqlayout9 + layout9 @@ -334,7 +334,7 @@ - tqlayout8 + layout8 @@ -486,7 +486,7 @@ - tqlayout35 + layout35 diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui index d224bce3..4da33c33 100644 --- a/ktouch/src/ktouchopenrequest_dlg.ui +++ b/ktouch/src/ktouchopenrequest_dlg.ui @@ -115,7 +115,7 @@ - tqlayout3 + layout3 @@ -165,7 +165,7 @@ - tqlayout1 + layout1 diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui index 2d519808..6fd8eeea 100644 --- a/ktouch/src/ktouchprefcolorslayout.ui +++ b/ktouch/src/ktouchprefcolorslayout.ui @@ -35,7 +35,7 @@ - tqlayout3 + layout3 @@ -120,7 +120,7 @@ - tqlayout9 + layout9 @@ -353,7 +353,7 @@ - tqlayout4 + layout4 diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui index ff4959f6..f205c1ab 100644 --- a/ktouch/src/ktouchprefgenerallayout.ui +++ b/ktouch/src/ktouchprefgenerallayout.ui @@ -82,7 +82,7 @@ - tqlayout2 + layout2 @@ -193,7 +193,7 @@ - tqlayout3 + layout3 @@ -247,7 +247,7 @@ - tqlayout2 + layout2 diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui index c9a2d75b..3105d19c 100644 --- a/ktouch/src/ktouchprefkeyboardlayout.ui +++ b/ktouch/src/ktouchprefkeyboardlayout.ui @@ -74,7 +74,7 @@ - tqlayout1 + layout1 @@ -88,10 +88,10 @@ Override keyboard fonts - If checked you can specify your own keyboard font instead of the predefined one of the keyboard tqlayout. + If checked you can specify your own keyboard font instead of the predefined one of the keyboard layout. - 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. + 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. diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui index 7f68f36a..3c6a1c8d 100644 --- a/ktouch/src/ktouchpreftraininglayout.ui +++ b/ktouch/src/ktouchpreftraininglayout.ui @@ -60,7 +60,7 @@ - tqlayout1 + layout1 @@ -174,7 +174,7 @@ - tqlayout2 + layout2 diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui index d54fd2b1..a254c9af 100644 --- a/ktouch/src/ktouchstatistics_dlg.ui +++ b/ktouch/src/ktouchstatistics_dlg.ui @@ -69,7 +69,7 @@ - tqlayout7 + layout7 @@ -127,7 +127,7 @@ - tqlayout28 + layout28 @@ -515,7 +515,7 @@ - tqlayout8 + layout8 @@ -573,7 +573,7 @@ - tqlayout28_2 + layout28_2 @@ -940,7 +940,7 @@ - tqlayout6 + layout6 @@ -1205,7 +1205,7 @@ - tqlayout6 + layout6 diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index 17e095da..80c92bef 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.tqunicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); + return (out << ch.m_char.unicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); } // ---------------------------------------------------------------------------- @@ -135,9 +135,9 @@ 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-tqunicode and the counters + // we append for each missed char the char-unicode 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.tqunicode()) + char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode()) .arg(it->m_correctCount).arg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); @@ -302,9 +302,9 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const { session.appendChild(e); // add char data TQString char_data; - // we append for each missed char the char-tqunicode and the counters + // we append for each missed char the char-unicode 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.tqunicode()) + char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode()) .arg(it->m_correctCount).arg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui index 7d93f545..b2625d23 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -40,7 +40,7 @@ - tqlayout2 + layout2 @@ -85,7 +85,7 @@ - tqlayout2 + layout2 diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp index ac275842..fcc6322d 100644 --- a/kturtle/src/dialogs.cpp +++ b/kturtle/src/dialogs.cpp @@ -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 tqlayout + // Create the top level page and its layout 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 *vtqlayout = new TQVBoxLayout(BaseWidget); + TQVBoxLayout *vlayout = new TQVBoxLayout(BaseWidget); - vtqlayout->addSpacing(5); // spacing on top + vlayout->addSpacing(5); // spacing on top // the palette and value selector go into a H-box - TQHBoxLayout *h1tqlayout = new TQHBoxLayout(BaseWidget); - vtqlayout->addLayout(h1tqlayout); + TQHBoxLayout *h1layout = new TQHBoxLayout(BaseWidget); + vlayout->addLayout(h1layout); - h1tqlayout->addSpacing(10); // space on the left border + h1layout->addSpacing(10); // space on the left border hsSelector = new KHSSelector(BaseWidget); // the color (SH) selector hsSelector->setMinimumSize(300, 150); - h1tqlayout->addWidget(hsSelector); + h1layout->addWidget(hsSelector); connect( hsSelector, TQT_SIGNAL( valueChanged(int, int) ), TQT_SLOT( slotSelectorChanged(int, int) ) ); - h1tqlayout->addSpacing(5); // space in between + h1layout->addSpacing(5); // space in between valuePal = new KValueSelector(BaseWidget); // the darkness (V) pal valuePal->setFixedWidth(30); - h1tqlayout->addWidget(valuePal); + h1layout->addWidget(valuePal); connect( valuePal, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotPalChanged(int) ) ); - vtqlayout->addSpacing(15); // space in between the top and the bottom widgets + vlayout->addSpacing(15); // space in between the top and the bottom widgets // the patch and the codegenerator also go into a H-box - TQHBoxLayout *h2tqlayout = new TQHBoxLayout(BaseWidget); - vtqlayout->addLayout(h2tqlayout); + TQHBoxLayout *h2layout = new TQHBoxLayout(BaseWidget); + vlayout->addLayout(h2layout); - h2tqlayout->addSpacing(10); // space on the left border + h2layout->addSpacing(10); // space on the left border patch = new KColorPatch(BaseWidget); // the patch (color previewer) patch->setFixedSize(50, 50); - h2tqlayout->addWidget(patch); + h2layout->addWidget(patch); - h2tqlayout->addSpacing(10); // space in between + h2layout->addSpacing(10); // space in between // the label and the codegenerator go in a V-box - TQVBoxLayout *v2tqlayout = new TQVBoxLayout(BaseWidget); - h2tqlayout->addLayout(v2tqlayout); + TQVBoxLayout *v2layout = new TQVBoxLayout(BaseWidget); + h2layout->addLayout(v2layout); copyable = new TQLabel(i18n("Color code:"), BaseWidget); // tha label - v2tqlayout->addWidget(copyable); + v2layout->addWidget(copyable); colorcode = new TQLineEdit(BaseWidget); // the code generator colorcode->setReadOnly(true); - v2tqlayout->addWidget(colorcode); + v2layout->addWidget(colorcode); connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) ); - h2tqlayout->addSpacing(5); // spacing on the right border + h2layout->addSpacing(5); // spacing on the right border - vtqlayout->addSpacing(10); // spacing on the bottom + vlayout->addSpacing(10); // spacing on the bottom h = g = b = 0; // start with red s = v = r = 255; diff --git a/kturtle/src/dialogs.h b/kturtle/src/dialogs.h index 4cd69d1a..7dbd041b 100644 --- a/kturtle/src/dialogs.h +++ b/kturtle/src/dialogs.h @@ -119,9 +119,9 @@ class ColorPicker : public KDialogBase TQWidget *BaseWidget; KHSSelector *hsSelector; KValueSelector *valuePal; - TQVBoxLayout *vtqlayout; - TQHBoxLayout *h1tqlayout; - TQHBoxLayout *h2tqlayout; + TQVBoxLayout *vlayout; + TQHBoxLayout *h1layout; + TQHBoxLayout *h2layout; KColorPatch *patch; TQLabel *copyable; TQLineEdit *colorcode; diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index 7e0b773e..da6a9a28 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -247,7 +247,7 @@ void MainWindow::setupCanvas() void MainWindow::slotStatusBar(TQString text, int id) { - text = " " + text + " "; // help the tqlayout + text = " " + text + " "; // help the layout statusBar()->changeItem(text, id); } @@ -877,35 +877,35 @@ 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->tqlayout()->setSpacing( 6 ); - WidthHeightBox->tqlayout()->setMargin( 11 ); - TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->tqlayout() ); + WidthHeightBox->layout()->setSpacing( 6 ); + WidthHeightBox->layout()->setMargin( 11 ); + TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->layout() ); WidthHeightBoxLayout->setAlignment( TQt::AlignTop ); - TQHBoxLayout *tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); - TQVBoxLayout *tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); + TQHBoxLayout *layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); + TQVBoxLayout *layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1"); + TQVBoxLayout *layout1 = new TQVBoxLayout( 0, 0, 6, "layout1"); kcfg_CanvasWidth = new KIntNumInput( WidthHeightBox, "kcfg_CanvasWidth" ); kcfg_CanvasWidth->setValue( 400 ); kcfg_CanvasWidth->setMinValue( 1 ); kcfg_CanvasWidth->setReferencePoint( 1 ); - tqlayout1->addWidget( kcfg_CanvasWidth ); + layout1->addWidget( kcfg_CanvasWidth ); kcfg_CanvasHeight = new KIntNumInput( WidthHeightBox, "kcfg_CanvasHeight" ); kcfg_CanvasHeight->setValue( 300 ); kcfg_CanvasHeight->setMinValue( 1 ); kcfg_CanvasHeight->setReferencePoint( 1 ); - tqlayout1->addWidget( kcfg_CanvasHeight ); + layout1->addWidget( kcfg_CanvasHeight ); WidthLabel = new TQLabel( kcfg_CanvasWidth, i18n("Canvas &width:"), WidthHeightBox ); - tqlayout2->addWidget( WidthLabel ); + layout2->addWidget( WidthLabel ); HeightLabel = new TQLabel( kcfg_CanvasHeight, i18n("Ca&nvas height:"), WidthHeightBox ); - tqlayout2->addWidget( HeightLabel ); - tqlayout3->addLayout( tqlayout2 ); + layout2->addWidget( HeightLabel ); + layout3->addLayout( layout2 ); - tqlayout3->addLayout( tqlayout1 ); - WidthHeightBoxLayout->addLayout( tqlayout3 ); + layout3->addLayout( layout1 ); + WidthHeightBoxLayout->addLayout( layout3 ); TQLabel* WidthHeightLabel = new TQLabel(i18n("You need to restart before these settings have effect"), WidthHeightBox); WidthHeightBoxLayout->addWidget( WidthHeightLabel ); generalLayout->addWidget( WidthHeightBox, 0, 0 ); @@ -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->tqlayout()->setSpacing( 6 ); - groupBox1->tqlayout()->setMargin( 11 ); - TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->tqlayout() ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); + TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->layout() ); groupBox1Layout->setAlignment( TQt::AlignTop ); - TQVBoxLayout *tqlayout4 = new TQVBoxLayout( 0, 0, 6, "tqlayout4"); + TQVBoxLayout *layout4 = new TQVBoxLayout( 0, 0, 6, "layout4"); kcfg_LanguageComboBox = new KComboBox(groupBox1, "kcfg_LanguageComboBox"); kcfg_LanguageComboBox->setEditable(false); @@ -935,11 +935,11 @@ void MainWindow::slotSettings() kcfg_LanguageComboBox->insertStringList(LogoLanguageList); LanguageLabel = new TQLabel(kcfg_LanguageComboBox, i18n("&Select the language for the Logo commands:"), groupBox1); - tqlayout4->addWidget( LanguageLabel ); - tqlayout4->addWidget( kcfg_LanguageComboBox ); + layout4->addWidget( LanguageLabel ); + layout4->addWidget( kcfg_LanguageComboBox ); LanguageLabel->setBuddy( kcfg_LanguageComboBox ); - groupBox1Layout->addLayout( tqlayout4, 0, 0 ); + groupBox1Layout->addLayout( layout4, 0, 0 ); languageLayout->addWidget( groupBox1, 0, 0 ); language->resize( TQSize(373, 80).expandedTo(minimumSizeHint()) ); diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui index 98a2cfff..e19951b2 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui @@ -32,7 +32,7 @@ - tqlayout1 + layout1 diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index 2eb3a124..f3568543 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -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_kbtqlayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); + connect(d_kblayout, 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_kbtqlayout->isEnabled()) + if (d_shortName->count() != 0 && d_kblayout->isEnabled()) { - for (int i = 0; i < d_kbtqlayout->count(); i++) + for (int i = 0; i < d_kblayout->count(); i++) { - if (d_kbtqlayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) + if (d_kblayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) { - d_kbtqlayout->setCurrentItem(i); + d_kblayout->setCurrentItem(i); break; } } @@ -782,9 +782,9 @@ void LanguageOptions::slotDeleteClicked() } -void LanguageOptions::slotKeyboardLayoutChanged(const TQString& tqlayout) +void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout) { - m_langSet.setKeyboardLayout(tqlayout, d_shortName->currentItem()); + m_langSet.setKeyboardLayout(layout, d_shortName->currentItem()); emit widgetModified(); m_hasChanged = true; } @@ -818,16 +818,16 @@ void LanguageOptions::enableLangWidgets() TQDataStream stream(replyData, IO_ReadOnly); stream >> layouts; layouts.prepend(TQString()); - d_kbtqlayout->clear(); - d_kbtqlayout->insertStringList(layouts); + d_kblayout->clear(); + d_kblayout->insertStringList(layouts); } } } else { //kdDebug() << "kxkb not enabled" << endl; - d_kbtqlayout->clear(); - d_kbtqlayout->setEnabled(false); + d_kblayout->clear(); + d_kblayout->setEnabled(false); } } @@ -898,22 +898,22 @@ void LanguageOptions::slotShortActivated(const TQString& _id) else b_langPixmap->setText (i18n("No Picture Selected")); - TQString tqlayout = m_langSet.keyboardLayout(d_shortName->currentItem()); + TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem()); - //kdDebug() << "tqlayout to select " << tqlayout << endl; + //kdDebug() << "layout to select " << layout << endl; - for (int i = 0; i < d_kbtqlayout->count(); i++) + for (int i = 0; i < d_kblayout->count(); i++) { - if (d_kbtqlayout->text(i) == tqlayout) + if (d_kblayout->text(i) == layout) { - d_kbtqlayout->setCurrentItem(i); + d_kblayout->setCurrentItem(i); break; } } // not found - if (d_kbtqlayout->currentText() != tqlayout) + if (d_kblayout->currentText() != layout) { - d_kbtqlayout->setCurrentItem(0); + d_kblayout->setCurrentItem(0); } } } diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui index 724f4700..23057407 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -93,7 +93,7 @@ - d_kbtqlayout + d_kblayout Select a language or use the Add New Language Code to add one. @@ -205,7 +205,7 @@ - label_kbtqlayout + label_kblayout @@ -216,10 +216,10 @@ - Keyboard tqlayout: + Keyboard layout: - d_kbtqlayout + d_kblayout You can assign a language to each column @@ -337,7 +337,7 @@ e_shortName2 e_langLong b_langPixmap - d_kbtqlayout + d_kblayout b_langDel e_newName b_langNew diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui index 6eee844b..73da961e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui @@ -390,7 +390,7 @@ - tqlayout3 + layout3 diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui index 1997b61b..f653d9e1 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui @@ -145,7 +145,7 @@ - tqlayout8 + layout8 diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index 05d33f86..78554297 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 *tqunicodename; + const char *unicodename; const char *audible; }; -KV_Unicode_Ref kv_tqunicode_ref[] = { +KV_Unicode_Ref kv_unicode_ref[] = { {0x00E6, "LATIN SMALL LETTER AE", I18N_NOOP_maybe("")}, {0x00E7, "LATIN SMALL LETTER C WITH CEDILLA", I18N_NOOP_maybe("")}, @@ -171,18 +171,18 @@ KV_Unicode_Ref kv_tqunicode_ref[] = { void PhoneticButton::slotClicked() { if (text().length() != 0) - emit page->charSelected(text()[0].tqunicode()); + emit page->charSelected(text()[0].unicode()); } 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) { - int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]); + int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_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_tqunicode_ref; + KV_Unicode_Ref *uni_ref = kv_unicode_ref; int vert = 0; int horiz = 0; while (uni_ref->code != 0) { @@ -191,7 +191,7 @@ 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->tqunicodename); + tip += TQString::fromLatin1(uni_ref->unicodename); tip += "\n"; tip += i18n("Describing the sound of the character", "Sound: "); tip += i18n(uni_ref->audible); @@ -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].tqunicode()); + emit charSelected(s[i].unicode()); } e->accept(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui index 6da8f42a..c3ea92a6 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui @@ -44,7 +44,7 @@ - tqlayout3 + layout3 @@ -307,7 +307,7 @@ - tqlayout5 + layout5 diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp index 9d272a4e..d441cc2e 100644 --- a/kvoctrain/kvoctrain/kva_clip.cpp +++ b/kvoctrain/kvoctrain/kva_clip.cpp @@ -38,7 +38,7 @@ using namespace std; void kvoctrainApp::slotSmartSearchClip() { TQString s; - TQString entries = TQApplication::tqclipboard()->text(); + TQString entries = TQApplication::clipboard()->text(); if (!entries.isEmpty()) { int pos = entries.find ('\n'); // search for a line end @@ -148,11 +148,11 @@ void kvoctrainApp::slotEditCopy() } if (!exp.isEmpty()) { #if defined(_WS_X11_) -// disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),this,0); +// disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0); #endif - TQApplication::tqclipboard()->setText(exp); + TQApplication::clipboard()->setText(exp); #if defined(_WS_X11_) -// connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); +// connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); #endif } @@ -167,7 +167,7 @@ void kvoctrainApp::slotEditPaste() TQApplication::setOverrideCursor( waitCursor ); TQString s; - TQString entries = TQApplication::tqclipboard()->text(); + TQString entries = TQApplication::clipboard()->text(); vector csv_order = getCsvOrder(doc); diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index e5259f31..e8fad704 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -424,7 +424,7 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c } TQPen pen( p->pen() ); - int gridColor = tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, this ); + int gridColor = style().styleHint( TQStyle::SH_Table_GridLineColor, this ); if (gridColor != -1) { const TQPalette &pal = palette(); if (cg != colorGroup() diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index 0db70701..6684b834 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp @@ -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].tqunicode(); + ushort trigger = s[i].unicode(); if (trigger >= 0x80) { int remain = s.length() - i; if ((trigger & 0xE0) == 0xC0){ // 110x xxxx if ( (remain > 1) - && (s[i+1].tqunicode() & 0xC0) == 0x80) + && (s[i+1].unicode() & 0xC0) == 0x80) utf8_mode = true; } else if ((trigger & 0xF0) == 0xE0) { // 1110 xxxx if ( remain > 2 - && s[i+1].tqunicode() & 0xC0 == 0x80 - && s[i+2].tqunicode() & 0xC0 == 0x80) + && s[i+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xF8) == 0xF0) { // 1111 0xxx if ( remain > 3 - && s[i+1].tqunicode() & 0xC0 == 0x80 - && s[i+2].tqunicode() & 0xC0 == 0x80 - && s[i+3].tqunicode() & 0xC0 == 0x80) + && s[i+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80 + && s[i+3].unicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFC) == 0xF8) { // 1111 10xx if ( remain > 4 - && 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+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80 + && s[i+3].unicode() & 0xC0 == 0x80 + && s[i+4].unicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFE) == 0xFC) { // 1111 110x if ( remain > 5 - && 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) + && 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) utf8_mode = true; } } diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h index c427b4f2..d5ab8f91 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h @@ -32,8 +32,8 @@ class KOXML_OSTREAM; * * xml.startTag ("head"); // writes <head> * - * // write <tqlayout format="a4" orientation="landscape"> - * xml.startTag ("tqlayout", false); + * // write <layout format="a4" orientation="landscape"> + * xml.startTag ("layout", false); * xml.addAttribute ("format", "a4"); * xml.addAttribute ("orientation", "landscape"); * xml.closeTag (true); diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp index a9ed5dcb..77d03fb0 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.cpp +++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp @@ -212,9 +212,9 @@ void LangSet::setPixMapFile (const TQString & s, int index) langs[index].PixMapFile = s; } -void LangSet::setKeyboardLayout(const TQString& tqlayout, int index) +void LangSet::setKeyboardLayout(const TQString& layout, int index) { if (index < (int) langs.size()) { - langs[index].keyboardLayout = tqlayout; + langs[index].keyboardLayout = layout; } } diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h index cfcc7f3b..ac4e8ace 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.h +++ b/kvoctrain/kvoctrain/kvt-core/langset.h @@ -70,7 +70,7 @@ class LangSet 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 & tqlayout, int index); + void setKeyboardLayout(const TQString & layout, int index); TQString findShortId (const TQString & longId) const; TQString findLongId (const TQString & shortId) const; diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui index 2bcb18e5..d6197ea0 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui @@ -131,7 +131,7 @@ - tqlayout7 + layout7 @@ -158,7 +158,7 @@ - tqlayout6 + layout6 diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui index 42653ef9..def5f384 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui @@ -120,7 +120,7 @@ - tqlayout10 + layout10 @@ -229,7 +229,7 @@ - tqlayout9 + layout9 diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui index 0398580c..4a46ac77 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui @@ -221,7 +221,7 @@ - tqlayout14 + layout14 @@ -229,7 +229,7 @@ - tqlayout12 + layout12 diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui index b28cc0b6..7b35a6c2 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui @@ -199,7 +199,7 @@ - tqlayout4 + layout4 @@ -229,7 +229,7 @@ - tqlayout3 + layout3 diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui index 6185f2ba..c20cd142 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui @@ -29,7 +29,7 @@ - tqlayout5 + layout5 @@ -115,7 +115,7 @@ - tqlayout17 + layout17 @@ -240,7 +240,7 @@ - tqlayout16 + layout16 diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui index 4c0832cc..7e28115d 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui @@ -21,7 +21,7 @@ - tqlayout20 + layout20 @@ -65,7 +65,7 @@ - tqlayout30 + layout30 @@ -73,7 +73,7 @@ - tqlayout29 + layout29 @@ -163,7 +163,7 @@ - tqlayout27 + layout27 @@ -269,7 +269,7 @@ - tqlayout19 + layout19 @@ -309,7 +309,7 @@ - tqlayout32 + layout32 @@ -317,7 +317,7 @@ - tqlayout31 + layout31 diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui index 04682cce..38edf095 100644 --- a/kwordquiz/src/dlglanguagebase.ui +++ b/kwordquiz/src/dlglanguagebase.ui @@ -35,7 +35,7 @@ - tqlayout2 + layout2 @@ -138,7 +138,7 @@ - tqlayout2_2 + layout2_2 diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui index f16c8e56..3fec70fd 100644 --- a/kwordquiz/src/dlgrcbase.ui +++ b/kwordquiz/src/dlgrcbase.ui @@ -27,7 +27,7 @@ - tqlayout4 + layout4 @@ -77,7 +77,7 @@ - tqlayout5 + layout5 @@ -124,7 +124,7 @@ - tqlayout3 + layout3 diff --git a/kwordquiz/src/dlgsortbase.ui b/kwordquiz/src/dlgsortbase.ui index 28275fe8..59342257 100644 --- a/kwordquiz/src/dlgsortbase.ui +++ b/kwordquiz/src/dlgsortbase.ui @@ -35,7 +35,7 @@ - tqlayout6 + layout6 diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp index 26e9e5cb..79dd2da0 100644 --- a/kwordquiz/src/dlgspecchar.cpp +++ b/kwordquiz/src/dlgspecchar.cpp @@ -38,7 +38,7 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_ grid = new TQGridLayout( page, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - int t = (_chr.tqunicode()/256); + int t = (_chr.unicode()/256); charSelect = new KCharSelect( page, "", _font, _chr, t); connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); diff --git a/kwordquiz/src/flashviewbase.ui b/kwordquiz/src/flashviewbase.ui index 11a499e4..c0ce8e61 100644 --- a/kwordquiz/src/flashviewbase.ui +++ b/kwordquiz/src/flashviewbase.ui @@ -234,7 +234,7 @@ - tqlayout13 + layout13 @@ -259,7 +259,7 @@ - tqlayout12 + layout12 diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index fd7328de..654c21e0 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -801,7 +801,7 @@ void KWordQuizApp::slotVocabFont() void KWordQuizApp::slotVocabKeyboard() { - slotStatusMsg(i18n("Changing the keyboard tqlayout...")); + slotStatusMsg(i18n("Changing the keyboard layout...")); KMessageBox::sorry(0, i18n("Not implemented yet")); slotStatusMsg(i18n("Ready")); } @@ -1081,7 +1081,7 @@ void KWordQuizApp::updateSpecialCharIcons( ) TQString KWordQuizApp::charIcon(const TQChar & c) { ///Create a name and path for the icon - TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); ///No need to redraw if it already exists if (KStandardDirs::exists(s)) diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui index 045d2137..3d848b83 100644 --- a/kwordquiz/src/multipleviewbase.ui +++ b/kwordquiz/src/multipleviewbase.ui @@ -32,7 +32,7 @@ - tqlayout58 + layout58 @@ -137,7 +137,7 @@ - tqlayout60 + layout60 @@ -242,7 +242,7 @@ - tqlayout13 + layout13 @@ -267,7 +267,7 @@ - tqlayout12 + layout12 @@ -551,7 +551,7 @@ - tqlayout61 + layout61 @@ -656,7 +656,7 @@ - tqlayout63 + layout63 @@ -814,7 +814,7 @@ - tqlayout59 + layout59 diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui index 8301e2b7..da54220a 100644 --- a/kwordquiz/src/prefcharacterbase.ui +++ b/kwordquiz/src/prefcharacterbase.ui @@ -308,7 +308,7 @@ - tqlayout9 + layout9 diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index fd8b7b5b..fcb743a4 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -32,7 +32,7 @@ - tqlayout23 + layout23 @@ -282,7 +282,7 @@ - tqlayout51 + layout51 @@ -387,7 +387,7 @@ - tqlayout52 + layout52 @@ -492,7 +492,7 @@ - tqlayout53 + layout53 @@ -597,7 +597,7 @@ - tqlayout54 + layout54 @@ -738,7 +738,7 @@ - tqlayout57 + layout57 diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp index bedfc51c..997da802 100644 --- a/kwordquiz/src/wqprintdialogpage.cpp +++ b/kwordquiz/src/wqprintdialogpage.cpp @@ -34,9 +34,9 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) g = new TQButtonGroup(i18n("Select Type of Printout"), this ); g->setColumnLayout(0, Qt::Vertical ); - g->tqlayout()->setSpacing( 6 ); - g->tqlayout()->setMargin( 11 ); - TQGridLayout * v = new TQGridLayout( g->tqlayout() ); + g->layout()->setSpacing( 6 ); + g->layout()->setMargin( 11 ); + TQGridLayout * v = new TQGridLayout( g->layout() ); v->setAlignment( TQt::AlignTop ); rb0 = new TQRadioButton(i18n("Vocabulary &list"), g ); diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp index 5557b8fd..7d167a98 100644 --- a/libtdeedu/extdate/extdatepicker.cpp +++ b/libtdeedu/extdate/extdatepicker.cpp @@ -490,7 +490,7 @@ ExtDatePicker::setFontSize(int s) maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); } - TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, + TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); selectMonth->setMinimumSize(metricBound); diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp index b2468107..bc64c6ed 100644 --- a/libtdeedu/extdate/extdatetimeedit.cpp +++ b/libtdeedu/extdate/extdatetimeedit.cpp @@ -436,7 +436,7 @@ void ExtDateTimeEditor::paintEvent( TQPaintEvent * ) colorGroup().brush( isEnabled() ? TQColorGroup::Base : TQColorGroup::Background ); buffer.painter()->fillRect( 0, 0, width(), height(), bg ); d->paint( txt, hasFocus(), *buffer.painter(), colorGroup(), rect(), - tqstyle() ); + style() ); buffer.end(); } @@ -974,7 +974,7 @@ TQSize ExtDateEdit::sizeHint() const { constPolish(); TQFontMetrics fm( font() ); - int fw = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); + int fw = style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); int h = TQMAX( fm.lineSpacing(), 14 ) + 2; int w = 2 + fm.width( '9' ) * 8 + fm.width( d->ed->separator() ) * 2 + d->controls->upRect().width() + fw * 4; @@ -2434,7 +2434,7 @@ public: // { // constPolish(); // TQFontMetrics fm( font() ); -// int fw = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); +// int fw = style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); // int h = fm.lineSpacing() + 2; // int w = 2 + fm.width( '9' ) * 6 + fm.width( d->ed->separator() ) * 2 + // d->controls->upRect().width() + fw * 4; diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp index 041b0d76..bd0163d3 100644 --- a/libtdeedu/extdate/extdatewidget.cpp +++ b/libtdeedu/extdate/extdatewidget.cpp @@ -74,8 +74,8 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, // { // d = new ExtDateWidgetPrivate; // KLocale *locale = KGlobal::locale(); -// TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); -// tqlayout->setAutoAdd(true); +// TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); +// layout->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 *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + layout->setAutoAdd(true); d->m_day = new ExtDateWidgetSpinBox(1, 1, this); d->m_month = new TQComboBox(false, this); for (int i = 1; ; ++i) diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h index e5d29ba0..629466d4 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.h +++ b/libtdeedu/tdeeduui/tdeeduglossary.h @@ -148,7 +148,7 @@ class Glossary TQString m_picturepath; /** - * Load the tqlayout from an XML file. + * Load the layout from an XML file. * * @param doc The TQDomDocument which will contain the read XML * contents.