diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
| commit | 96698e12d1d6ba8072e9365334277438c3cf0e4a (patch) | |
| tree | 81e81a49226aab2570d5fe8464576a6c960f1782 | |
| parent | dcb06497ea70d050554422eec10b0756d926a5c0 (diff) | |
| download | tdeedu-96698e12d1d6ba8072e9365334277438c3cf0e4a.tar.gz tdeedu-96698e12d1d6ba8072e9365334277438c3cf0e4a.zip | |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
351 files changed, 1594 insertions, 1594 deletions
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp index 72fb8200..011aecb6 100644 --- a/kalzium/src/kalzium.cpp +++ b/kalzium/src/kalzium.cpp @@ -77,7 +77,7 @@ Kalzium::Kalzium() connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( openInformationDialog( int ) )); connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotStatusbar( int ) )); - // tqlayouting + // layouting setCentralWidget( centralWidget ); centralWidget->show(); diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp index f25cbfc4..a759fee2 100644 --- a/kalzium/src/kalziumdataobject.cpp +++ b/kalzium/src/kalziumdataobject.cpp @@ -46,29 +46,29 @@ KalziumDataObject::KalziumDataObject() KURL url; url.setPath( locate("data", "kalzium/data/")); url.setFileName( "data.xml" ); - TQFile tqlayoutFile( url.path() ); + TQFile layoutFile( url.path() ); - if (!tqlayoutFile.exists()) + if (!layoutFile.exists()) { kdDebug() << "data.xml not found, exiting" << endl; kapp->exit(0); return; } - if (!tqlayoutFile.open(IO_ReadOnly)) + if (!layoutFile.open(IO_ReadOnly)) { kdDebug() << "data.xml IO-error" << endl; return; } // Check if the document is well-formed - if (!doc.setContent(&tqlayoutFile)) + if (!doc.setContent(&layoutFile)) { kdDebug() << "wrong xml" << endl; - tqlayoutFile.close(); + layoutFile.close(); return; } - tqlayoutFile.close(); + layoutFile.close(); ElementList = readData( doc ); m_numOfElements = ElementList.count(); diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp index 794c9f25..e0e05388 100644 --- a/kalzium/src/kalziumtip.cpp +++ b/kalzium/src/kalziumtip.cpp @@ -139,7 +139,7 @@ void KalziumTip::display() m_richText->setWidth(400); - m_tqmaskEffect = isVisible() ? Plain : Dissolve; + m_maskEffect = isVisible() ? Plain : Dissolve; m_dissolveSize = 24; m_dissolveDelta = -1; @@ -178,7 +178,7 @@ void KalziumTip::displayInternal() resize(width, height); // create and set transparency tqmask - switch(m_tqmaskEffect) + switch(m_maskEffect) { case Plain: plainMask(); @@ -218,20 +218,20 @@ void KalziumTip::displayInternal() void KalziumTip::dissolveMask() { - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_tqmask); m_tqmask.fill(TQt::black); - tqmaskPainter.setBrush(TQt::white); - tqmaskPainter.setPen(TQt::white); - tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), + maskPainter.setBrush(TQt::white); + maskPainter.setPen(TQt::white); + maskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height()); m_dissolveSize += m_dissolveDelta; if (m_dissolveSize > 0) { - tqmaskPainter.setRasterOp(TQt::EraseROP); + maskPainter.setRasterOp(TQt::EraseROP); int x, y, s; const int size = 16; @@ -247,7 +247,7 @@ void KalziumTip::dissolveMask() { s = 0; } - tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); + maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); } } } @@ -269,13 +269,13 @@ void KalziumTip::hide() void KalziumTip::plainMask() { - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_tqmask); m_tqmask.fill(TQt::black); - tqmaskPainter.setBrush(TQt::white); - tqmaskPainter.setPen(TQt::white); - tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), + maskPainter.setBrush(TQt::white); + maskPainter.setPen(TQt::white); + maskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height()); setMask(m_tqmask); m_frameTimer.stop(); diff --git a/kalzium/src/kalziumtip.h b/kalzium/src/kalziumtip.h index 8c7b063a..761b6c86 100644 --- a/kalzium/src/kalziumtip.h +++ b/kalzium/src/kalziumtip.h @@ -73,7 +73,7 @@ class KalziumTip : public TQWidget TQPixmap m_icon; //icon shown on the tip TQPixmap m_noElemIcon; //icon for element wich have no image - MaskEffect m_tqmaskEffect; //inidicates to show tqmask effect or plain + MaskEffect m_maskEffect; //inidicates to show tqmask effect or plain TQSimpleRichText* m_richText; int m_dissolveSize; diff --git a/kalzium/src/molcalcwidgetbase.ui b/kalzium/src/molcalcwidgetbase.ui index 63be9624..04760f0d 100644 --- a/kalzium/src/molcalcwidgetbase.ui +++ b/kalzium/src/molcalcwidgetbase.ui @@ -127,7 +127,7 @@ <Q_SLOTS> <slot access="protected">slotCalcButtonClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kalzium/src/moleculeparser.cpp b/kalzium/src/moleculeparser.cpp index b3d19120..6780e65e 100644 --- a/kalzium/src/moleculeparser.cpp +++ b/kalzium/src/moleculeparser.cpp @@ -172,7 +172,7 @@ MoleculeParser::parseSubmolecule(double *_resultMass, // Parse a term within the molecule, i.e. a single atom or a -// submolecule within tqparenthesis followed by an optional number. +// submolecule within parenthesis followed by an optional number. // Examples: Bk, Mn2, (COOH)2 // // Return true if correct, otherwise return false. diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp index 0e810aff..cb4282d4 100644 --- a/kalzium/src/periodictableview.cpp +++ b/kalzium/src/periodictableview.cpp @@ -741,7 +741,7 @@ void PerodicTableView::mouseMoveEvent( TQMouseEvent * /*mouse*/ ) //JH: only update() if we were showing a tooltip if ( m_tooltipElementNumber || m_showLegendTooltip ) { - //this tqinvalidates the number. If the mouse + //this invalidates the number. If the mouse //is moved, the number is invalid. m_tooltipElementNumber = 0; m_showLegendTooltip = false; diff --git a/kalzium/src/plotsetupwidget.ui b/kalzium/src/plotsetupwidget.ui index 3fc89428..06ef3fa5 100644 --- a/kalzium/src/plotsetupwidget.ui +++ b/kalzium/src/plotsetupwidget.ui @@ -248,7 +248,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kalzium/src/settings_colors.ui b/kalzium/src/settings_colors.ui index da606dc2..1e025f4f 100644 --- a/kalzium/src/settings_colors.ui +++ b/kalzium/src/settings_colors.ui @@ -901,7 +901,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kalzium/src/settings_misc.ui b/kalzium/src/settings_misc.ui index e5480d1a..0e88167d 100644 --- a/kalzium/src/settings_misc.ui +++ b/kalzium/src/settings_misc.ui @@ -67,5 +67,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kalzium/src/settings_units.ui b/kalzium/src/settings_units.ui index e93bd9ca..4bf4031c 100644 --- a/kalzium/src/settings_units.ui +++ b/kalzium/src/settings_units.ui @@ -163,5 +163,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kalzium/src/somwidget.ui b/kalzium/src/somwidget.ui index bdf953a5..057dc235 100644 --- a/kalzium/src/somwidget.ui +++ b/kalzium/src/somwidget.ui @@ -178,7 +178,7 @@ the state of matter</string> </customwidgets> <connections> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kalzium/src/spectrum.h b/kalzium/src/spectrum.h index 4d71837f..dcde91cb 100644 --- a/kalzium/src/spectrum.h +++ b/kalzium/src/spectrum.h @@ -145,7 +145,7 @@ class Spectrum /** * @return the tqparent element of this spectrum */ - Element* tqparentElement() + Element* parentElement() { return m_parentElement; } private: diff --git a/kalzium/src/spectrumview.ui b/kalzium/src/spectrumview.ui index 39dd7f18..89204944 100644 --- a/kalzium/src/spectrumview.ui +++ b/kalzium/src/spectrumview.ui @@ -216,7 +216,7 @@ <Q_SLOTS> <slot access="protected">slotExportAsImage()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>spectrumwidget.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp index 2431b407..4f487e64 100644 --- a/kalzium/src/spectrumwidget.cpp +++ b/kalzium/src/spectrumwidget.cpp @@ -415,9 +415,9 @@ TQPixmap SpectrumWidget::pixmap() TQString text; if( m_type == EmissionSpectrum ) - text = i18n( "Emission spectrum of %1" ).tqarg( m_spectrum->tqparentElement()->elname() ); + text = i18n( "Emission spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() ); else - text = i18n( "Absorption spectrum of %1" ).tqarg( m_spectrum->tqparentElement()->elname() ); + text = i18n( "Absorption spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() ); TQPainter p( &tmp ); p.setPen( TQt::black ); diff --git a/kalzium/src/timewidget.ui b/kalzium/src/timewidget.ui index b810b101..28ddf7a5 100644 --- a/kalzium/src/timewidget.ui +++ b/kalzium/src/timewidget.ui @@ -194,7 +194,7 @@ of the elements</string> <slot>setValue(int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui index cc7a5053..b8d29ccb 100644 --- a/kanagram/src/mainsettingswidget.ui +++ b/kanagram/src/mainsettingswidget.ui @@ -178,5 +178,5 @@ <tabstop>kcfg_hintHideTime</tabstop> <tabstop>kcfg_useSounds</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kanagram/src/newstuffwidget.ui b/kanagram/src/newstuffwidget.ui index 1ec4d88c..55163cdd 100644 --- a/kanagram/src/newstuffwidget.ui +++ b/kanagram/src/newstuffwidget.ui @@ -58,5 +58,5 @@ the button to get new vocabulary files.</string> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp index 2315faa4..7457265b 100644 --- a/kanagram/src/vocabedit.cpp +++ b/kanagram/src/vocabedit.cpp @@ -102,7 +102,7 @@ void VocabEdit::slotSave() } doc->saveAs(TQT_TQOBJECT(this), KURL(fileName), KEduVocDocument::automatic, "kanagram"); - VocabSettings *settings = (VocabSettings*)this->tqparentWidget(); + VocabSettings *settings = (VocabSettings*)this->parentWidget(); settings->refreshView(); if(m_textChanged) diff --git a/kanagram/src/vocabeditwidget.ui b/kanagram/src/vocabeditwidget.ui index 8fbc00ba..8f9d6023 100644 --- a/kanagram/src/vocabeditwidget.ui +++ b/kanagram/src/vocabeditwidget.ui @@ -224,5 +224,5 @@ <tabstop>btnClose</tabstop> <tabstop>lboxWords</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui index f9832a71..71d754d8 100644 --- a/kanagram/src/vocabsettingswidget.ui +++ b/kanagram/src/vocabsettingswidget.ui @@ -113,5 +113,5 @@ <Q_SLOTS> <slot>createNew()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui index 860ffbfd..8938ac96 100644 --- a/kbruch/src/taskvieweroptionsbase.ui +++ b/kbruch/src/taskvieweroptionsbase.ui @@ -214,7 +214,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontdialog.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/keduca/keduca/configdialogbase.ui b/keduca/keduca/configdialogbase.ui index 53872ecb..7eff82a8 100644 --- a/keduca/keduca/configdialogbase.ui +++ b/keduca/keduca/configdialogbase.ui @@ -96,5 +96,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index 6b0e17aa..7a0f4326 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -34,14 +34,14 @@ typedef KParts::GenericFactory<KEducaPart> KEducaPartFactory; K_EXPORT_COMPONENT_FACTORY( libkeducapart, KEducaPartFactory ) -KEducaPart::KEducaPart( TQWidget *tqparentWidget, const char *widgetName, +KEducaPart::KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) : KParts::ReadOnlyPart( tqparent, name ) { setInstance( KEducaPartFactory::instance() ); - m_view = new KEducaView( tqparentWidget, widgetName ); + m_view = new KEducaView( parentWidget, widgetName ); m_view->show(); setWidget( m_view ); diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h index d19d597c..442ebbcd 100644 --- a/keduca/keduca/keduca_part.h +++ b/keduca/keduca/keduca_part.h @@ -41,7 +41,7 @@ class KEducaPart : public KParts::ReadOnlyPart /* * Constructor. */ - KEducaPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, + KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &args ); /* diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui index d2e74f68..c702ce3b 100644 --- a/keduca/keducabuilder/kcontroladdeditbase.ui +++ b/keduca/keducabuilder/kcontroladdeditbase.ui @@ -860,7 +860,7 @@ <slot access="private" specifier="pure virtual">slotDataChanged()</slot> <slot access="private" specifier="pure virtual">slotAnswerSelected(TQListViewItem *)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui index 2cf47b6e..24dbbf09 100644 --- a/keduca/keducabuilder/kcontrolheaderbase.ui +++ b/keduca/keducabuilder/kcontrolheaderbase.ui @@ -459,7 +459,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/keduca/keducabuilder/keducaeditorstartdialogbase.ui b/keduca/keducabuilder/keducaeditorstartdialogbase.ui index 57679cb3..c873a844 100644 --- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui +++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui @@ -312,7 +312,7 @@ <tabstop>openDocumentRB</tabstop> <tabstop>openRecentDocumentRB</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui index b300cc2a..9a11d8b4 100644 --- a/keduca/libkeduca/kgallerydialogbase.ui +++ b/keduca/libkeduca/kgallerydialogbase.ui @@ -366,5 +366,5 @@ <slot>slotButtonAdd()</slot> <slot>slotServerSelected(TQListViewItem*)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgeography/Changelog b/kgeography/Changelog index c4c23b7d..f54c280c 100644 --- a/kgeography/Changelog +++ b/kgeography/Changelog @@ -88,7 +88,7 @@ * RightWidget is really LeftWidget ¬.¬ * There is no need to store p_rightWidget as a class member * Bump version to 0.2.1 - * Improve tqlayouting of mapasker + * Improve layouting of mapasker * Make the scrollbar work also when clicking on the arrows (sliderMoved -> valueChanged) * Fix resizing bug in mapWidget that showed a inexistant part of the diff --git a/khangman/khangman/advanced.ui b/khangman/khangman/advanced.ui index 0e0948eb..7910fab7 100644 --- a/khangman/khangman/advanced.ui +++ b/khangman/khangman/advanced.ui @@ -91,5 +91,5 @@ For example, in Catalan, if this is unchecked and you type "o", the o and ò wil </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/khangman/khangman/normal.ui b/khangman/khangman/normal.ui index 57921bd9..b7d3df2e 100644 --- a/khangman/khangman/normal.ui +++ b/khangman/khangman/normal.ui @@ -90,5 +90,5 @@ Default is no sound.</string> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/khangman/khangman/timerdlg.ui b/khangman/khangman/timerdlg.ui index 9f51d442..dbd09dd7 100644 --- a/khangman/khangman/timerdlg.ui +++ b/khangman/khangman/timerdlg.ui @@ -221,7 +221,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/kig/ChangeLog b/kig/ChangeLog index 8c60c89f..3cbd6c2f 100644 --- a/kig/ChangeLog +++ b/kig/ChangeLog @@ -1142,7 +1142,7 @@ * Fix the moving system again, it now only redraws exactly those objects that need to be redrawn. E.g. when a constrained point - was moved, before it was assumed that all of its tqparents, and + was moved, before it was assumed that all of its parents, and their tqchildren would move, whereas in reality, a constrained point does not move the curve it is constrained to. This is now taken into account for. This much optimizes the case where we move the @@ -1200,7 +1200,7 @@ could not open.. I'm backporting this into Kig 0.6.0 and informing the packager.. - * clean up: Objects now store their tqparents in order, so that no + * clean up: Objects now store their parents in order, so that no parsing has to be done in the calc() function.. Also some more modifications making that function a bit simpler are included. Specifically, ArgsParser now does the checking of the arguments, @@ -1218,7 +1218,7 @@ 2003-09-01 Dominique Devriese <devriese@kde.org> - * only move an object if its tqparents are not yet moving.. This + * only move an object if its parents are not yet moving.. This fixes bug #63250. * remove the defective operator| and operator& implementations for @@ -19,7 +19,7 @@ An ObjectImp represents the current state of an object in Kig. It keeps information about what type of object it is ( e.g. a line, a point, a circle etc. ), and its exact data ( e.g. the center and radius of the circle ). It is *not* in any way aware of how the -object was calculated from its tqparents (e.g. is this a line that is +object was calculated from its parents (e.g. is this a line that is constructed as the parallel of another line, or as the line going through two given points ? ) or how it is drawn on the window ( e.g. the thickness of the line, its color etc. ). @@ -50,21 +50,21 @@ calculating an ObjectImp from other ObjectImp's. It is also a node in the dependency graph of a certain document. E.g. a LineImp can be calculated from the two PointImp's it has to go through; every time either of them moves, this calculation is redone. In this case, there -would be an ObjectCalcer that keeps a reference to its two tqparents ( +would be an ObjectCalcer that keeps a reference to its two parents ( the ObjectCalcer's representing the points ), and that will calculate its ObjectImp value every time it is asked to do so ( i.e. every time -one of its tqparents moves.. ). +one of its parents moves.. ). Because of the complex relations that ObjectCalcer's hold to other ObjectCalcer's and to other classes, they have been made reference-counted. This means that they keep a count internally of how much times a pointer to them is held. If this count reaches 0, this means that nobody needs them anymore, and they delete themselves. -E.g. an ObjectCalcer always keeps a reference to its tqparents, to +E.g. an ObjectCalcer always keeps a reference to its parents, to ensure that those aren't deleted before it is deleted. In the inheritance graph of a document, the lowermost objects keep -references to their tqparents and those keep reference to their tqparents, +references to their parents and those keep reference to their parents, so that all of the top of the graph is kept alive. Of course, someone needs to keep a reference to the bottommost objects in the graph, because otherwise, the entire graph would be deleted. As we will see @@ -76,7 +76,7 @@ At the end of the program, this reference is released, and all the objects are deleted. A special case of an ObjectCalcer is the ObjectConstCalcer. This is -an ObjectCalcer that has no tqparents, and only holds some data. The +an ObjectCalcer that has no parents, and only holds some data. The data is held as an ObjectImp of some type, and it will remain constant, and no calculation needs to be done to get it, it is just returned every time it is needed. @@ -159,9 +159,9 @@ Most of this is handled by the TextType class. 2.1.2 TextType The TextType class is an implementation of an ObjectType. It tqcontains -code specifying how to calculate a TextImp from its tqparents, and for +code specifying how to calculate a TextImp from its parents, and for how it behaves on user input. A text object has at least three -tqparents, and can handle any number of optional arguments. The three +parents, and can handle any number of optional arguments. The three mandatory arguments are an int, which is set to 1 or 0 depending on whether the label needs a surrounding box, a PointImp, containing the location of the text label, and a string containing the text of the @@ -170,7 +170,7 @@ additional argument is used to replace the lowest-numbered of those tokens, with its string representation. The function ObjectImp::fillInNextEscape is used for this. -For example, if a TextType has the following tqparents: +For example, if a TextType has the following parents: a IntImp with value 0 a PointImp with value (0,0) a String with value "This segment is %1 units long." @@ -197,7 +197,7 @@ proud of this design. In the implementation of this, we use the concept of constrained points. This is a point that is attached to a certain curve. It is implemented in Kig by the ConstrainedPointType, which takes a CurveImp -and a DoubleImp as tqparents and calculates a Point from these by using +and a DoubleImp as parents and calculates a Point from these by using the CurveImp::getPoint function. 2.2.2 The Implementation @@ -213,7 +213,7 @@ smallest part of the hierarchy that contains all paths from the first point to the second point. We then determine all objects that are not *on* one of those paths ( meaning that they are not calculated from the first point, or another object that is on one of those paths ), -but that are tqparents of one or more objects that are on those paths. +but that are parents of one or more objects that are on those paths. I call this set of objects the "side of the path" sometimes in the code. The function that finds them is called sideOfTreePath. @@ -260,7 +260,7 @@ does by definition not change. Also, if the constrained point is redefined so that it is no longer constrained to any curve, this is a major problem, because it would tqinvalidate the locus. Another point is that in practice, the locus depends on more objects than its -tqparents alone. This is not a good thing, because it makes it +parents alone. This is not a good thing, because it makes it impossible to optimise drawing of the objects, using the information about which objects depend on which others, because this information is invalid. @@ -102,8 +102,8 @@ - extend ObjectFactory::sensiblePointCalcer to also construct intersection points of stuff... (pino: done for lines) -- when moving an object that wants to move its tqparents, try to check if - it is itself not an indirect child of one of the tqparents it is +- when moving an object that wants to move its parents, try to check if + it is itself not an indirect child of one of the parents it is trying to move, and forbid the move in that case, as it will lead to chaotic behaviour. I am not sure if this is really well possible, but I have to look at it. diff --git a/kig/examples/figure_angle.fgeo b/kig/examples/figure_angle.fgeo index 47076564..6265e7e4 100644 --- a/kig/examples/figure_angle.fgeo +++ b/kig/examples/figure_angle.fgeo @@ -1,27 +1,27 @@ <?xml version="1.0"?> <drgenius> <drgeo name="Figure 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"> - <point id="827A5C0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="827A5C0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-5.833333</x> <y>2.950000</y> </point> - <point id="8248660" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8248660" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-4.666666</x> <y>-0.783334</y> </point> - <point id="822A6B0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="822A6B0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>2.333334</x> <y>-0.216667</y> </point> - <line id="822BC80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <line id="822BC80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="827A5C0"/> <tqparent ref="8248660"/> </line> - <line id="8249A48" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <line id="8249A48" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="822A6B0"/> <tqparent ref="8248660"/> </line> - <angle id="82B86D8" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <angle id="82B86D8" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="822A6B0"/> <tqparent ref="8248660"/> <tqparent ref="827A5C0"/> diff --git a/kig/examples/figure_manyobjects.fgeo b/kig/examples/figure_manyobjects.fgeo index c89c976f..1e50da51 100644 --- a/kig/examples/figure_manyobjects.fgeo +++ b/kig/examples/figure_manyobjects.fgeo @@ -1,69 +1,69 @@ <?xml version="1.0"?> <drgenius> <drgeo name="Figure 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"> - <point id="82257B8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82257B8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-6.700000</x> <y>2.250000</y> </point> - <point id="8250458" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8250458" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>0.266667</x> <y>2.083333</y> </point> - <point id="8250D30" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8250D30" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-0.800000</x> <y>-2.516667</y> </point> - <point id="8255158" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8255158" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-2.766667</x> <y>1.883333</y> </point> - <point id="8226648" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8226648" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <tqparent ref="82257B8"/> <tqparent ref="8255158"/> </point> - <halfLine id="8225B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <halfLine id="8225B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="8250D30"/> <tqparent ref="8250458"/> </halfLine> - <point id="82043A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82043A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-2.833333</x> <y>-0.983334</y> </point> - <point id="8115668" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8115668" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>1.500000</x> <y>1.883333</y> </point> - <point id="82AED28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82AED28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-0.566667</x> <y>3.983333</y> </point> - <segment id="82B0888" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <segment id="82B0888" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="82257B8"/> <tqparent ref="82AED28"/> </segment> - <line id="82B1B80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <line id="82B1B80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="82043A0"/> <tqparent ref="8115668"/> </line> - <point id="82B26F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82B26F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-5.533333</x> <y>-0.383333</y> </point> - <vector id="82A3948" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <vector id="82A3948" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <Ox>-2.800000</Ox> <Oy>1.883333</Oy> <tqparent ref="8255158"/> <tqparent ref="82B26F0"/> </vector> - <point id="82B4358" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82B4358" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>3.166667</x> <y>-0.683333</y> </point> - <circle id="82B5918" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <circle id="82B5918" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="82B4358"/> <tqparent ref="8115668"/> </circle> - <arcCircle id="82B5D30" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <arcCircle id="82B5D30" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="82257B8"/> <tqparent ref="82B26F0"/> <tqparent ref="8250D30"/> diff --git a/kig/examples/session_alotofthings.fgeo b/kig/examples/session_alotofthings.fgeo index dc8bb729..b47c31d9 100644 --- a/kig/examples/session_alotofthings.fgeo +++ b/kig/examples/session_alotofthings.fgeo @@ -1,64 +1,64 @@ <?xml version="1.0"?> <drgenius> <drgeo name="Figure 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"> - <point id="82076B0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82076B0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>0.766667</x> <y>2.450000</y> </point> - <point id="8281F08" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8281F08" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-3.300000</x> <y>2.650000</y> </point> - <point id="82535F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82535F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-7.900000</x> <y>-2.583333</y> </point> - <point id="822F448" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="822F448" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-7.800000</x> <y>0.116667</y> </point> - <point id="8208228" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8208228" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-4.533333</x> <y>1.216667</y> </point> - <point id="822FB88" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="822FB88" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-8.566667</x> <y>3.116667</y> </point> - <point id="82B08A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82B08A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-7.066667</x> <y>1.783334</y> </point> - <line id="82C3C40" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <line id="82C3C40" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="8281F08"/> <tqparent ref="82076B0"/> </line> - <arcCircle id="82C2F40" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <arcCircle id="82C2F40" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="8208228"/> <tqparent ref="822F448"/> <tqparent ref="82535F0"/> </arcCircle> - <halfLine id="82A86B8" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <halfLine id="82A86B8" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="822FB88"/> <tqparent ref="82B08A0"/> </halfLine> - <point id="82C8738" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82C8738" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-1.066667</x> <y>-0.416667</y> </point> - <point id="82C4DC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="" extra="0"> + <point id="82C4DC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0"> <tqparent ref="82A86B8"/> <tqparent ref="82C2F40"/> </point> - <point id="82C5230" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="" extra="1"> + <point id="82C5230" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="1"> <tqparent ref="82A86B8"/> <tqparent ref="82C2F40"/> </point> - <line id="82BF640" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <line id="82BF640" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="82C8738"/> <tqparent ref="82C3C40"/> </line> - <point id="83030E0" type="Reflexion" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="83030E0" type="Reflexion" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <tqparent ref="82C4DC8"/> <tqparent ref="82BF640"/> </point> @@ -86,75 +86,75 @@ Figure 3 tqcontains: - a moved circle; </text> <drgeo name="Figure 2" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"> - <point id="831A340" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="831A340" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-5.200000</x> <y>0.216667</y> </point> - <point id="82D1958" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82D1958" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>1.200000</x> <y>3.116667</y> </point> - <point id="82EB588" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82EB588" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-7.666667</x> <y>1.650000</y> </point> - <line id="8337158" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <line id="8337158" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="82EB588"/> <tqparent ref="831A340"/> </line> - <point id="8339778" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8339778" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <tqparent ref="831A340"/> <tqparent ref="82D1958"/> </point> - <line id="8322C38" type="parallel" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <line id="8322C38" type="parallel" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="8339778"/> <tqparent ref="8337158"/> </line> - <point id="8322E28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="8322E28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-6.200000</x> <y>-1.483334</y> </point> - <line id="831E530" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <line id="831E530" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="8322E28"/> <tqparent ref="82D1958"/> </line> - <point id="8356028" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="" extra="0"> + <point id="8356028" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0"> <tqparent ref="831E530"/> <tqparent ref="8337158"/> </point> - <point id="8320CC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="" extra="0"> + <point id="8320CC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0"> <tqparent ref="8322C38"/> <tqparent ref="831E530"/> </point> </drgeo> <drgeo name="Figure 3" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"> - <point id="837C5E0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="837C5E0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-6.433334</x> <y>2.050000</y> </point> - <point id="83380E8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="83380E8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-1.400000</x> <y>2.583333</y> </point> - <point id="83565C8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="83565C8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-1.300000</x> <y>-0.350000</y> </point> - <point id="82FBCC8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name=""> + <point id="82FBCC8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-3.433333</x> <y>-0.883333</y> </point> - <vector id="8108B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <vector id="8108B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <Ox>-6.433334</Ox> <Oy>2.050000</Oy> <tqparent ref="837C5E0"/> <tqparent ref="83380E8"/> </vector> - <circle id="83A2B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <circle id="83A2B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="82FBCC8"/> <tqparent ref="83565C8"/> </circle> - <circle id="83D6820" type="Translation" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""> + <circle id="83D6820" type="Translation" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <tqparent ref="83A2B10"/> <tqparent ref="8108B10"/> </circle> diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc index 55ecf939..2348af86 100644 --- a/kig/filters/cabri-filter.cc +++ b/kig/filters/cabri-filter.cc @@ -56,7 +56,7 @@ * * Nr: Simple sequential numbering of the objects in a file. * Type: seen so far: Pt, Axes, Line, Cir - * NumberOfParents: The number of tqparents that will be specified in + * NumberOfParents: The number of parents that will be specified in * Parents * Color: * R -> red @@ -96,7 +96,7 @@ * Visible: * V means visible, I means invisible * Fixed: - * St means fix this object ( if you move one of its tqparents, it + * St means fix this object ( if you move one of its parents, it * won't move ), nSt ( the default ) means don't fix this object. * Parents: * The numbers of the objects this object depends on @@ -118,7 +118,7 @@ struct CabriObject int specialAppearanceSwitch; bool visible; bool fixed; - std::vector<int> tqparents; + std::vector<int> parents; std::vector<double> data; }; @@ -246,14 +246,14 @@ bool KigFilterCabri::readObject( TQFile& f, CabriObject& myobj ) KIG_FILTER_PARSE_ERROR; tmp = thirdlinere.cap( 2 ); - TQStringList tqparentsids = TQStringList::split( ' ', tmp ); - for ( TQStringList::iterator i = tqparentsids.begin(); - i != tqparentsids.end(); ++i ) + TQStringList parentsids = TQStringList::split( ' ', tmp ); + for ( TQStringList::iterator i = parentsids.begin(); + i != parentsids.end(); ++i ) { - myobj.tqparents.push_back( ( *i ).toInt( &ok ) ); + myobj.parents.push_back( ( *i ).toInt( &ok ) ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; } - if ( myobj.tqparents.size() != myobj.numberOfParents ) + if ( myobj.parents.size() != myobj.numberOfParents ) KIG_FILTER_PARSE_ERROR; tmp = thirdlinere.cap( 4 ); @@ -277,8 +277,8 @@ bool KigFilterCabri::readObject( TQFile& f, CabriObject& myobj ) // << "specialAppearanceSwitch = " << myobj.specialAppearanceSwitch << endl // << "visible = " << visible << endl // << "fixed = " << myobj.fixed << endl -// << "tqparents =" << endl; -// for ( std::vector<int>::iterator i = myobj.tqparents.begin(); i != myobj.tqparents.end(); ++i ) +// << "parents =" << endl; +// for ( std::vector<int>::iterator i = myobj.parents.begin(); i != myobj.parents.end(); ++i ) // kdDebug() << " " << *i << endl; // kdDebug() << "vals = " << endl; // for ( std::vector<double>::iterator i = myobj.data.begin(); i != myobj.data.end(); ++i ) @@ -352,8 +352,8 @@ KigDocument* KigFilterCabri::load( const TQString& file ) int ps = 0; args.clear(); - for ( std::vector<int>::iterator i = obj.tqparents.begin(); - i != obj.tqparents.end(); ++i ) + for ( std::vector<int>::iterator i = obj.parents.begin(); + i != obj.parents.end(); ++i ) args.push_back( calcers[*i-3] ); // two fake objects at the start ( origin and axes.. ) diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui index b58e3dc1..1a9589b2 100644 --- a/kig/filters/drgeo-filter-chooserbase.ui +++ b/kig/filters/drgeo-filter-chooserbase.ui @@ -131,7 +131,7 @@ Please select which to import:</string> </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc index 3f213146..856d995c 100644 --- a/kig/filters/drgeo-filter.cc +++ b/kig/filters/drgeo-filter.cc @@ -62,7 +62,7 @@ struct DrGeoHierarchyElement { TQString id; - std::vector<TQString> tqparents; + std::vector<TQString> parents; }; KigFilterDrgeo::KigFilterDrgeo() @@ -202,7 +202,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co TQDomElement ce = c.toElement(); if ( ce.isNull() ) continue; else if ( ce.tagName() == "tqparent" ) - elem.tqparents.push_back( ce.attribute( "ref" ) ); + elem.parents.push_back( ce.attribute( "ref" ) ); } TQString curid = domelem.attribute( "id" ); elem.id = !curid.isNull() ? curid : TQString::number( withoutid++ ) ; @@ -216,9 +216,9 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co for ( uint i = 0; i < elems.size(); ++i ) { x = ""; - for ( uint j = 0; j < elems[i].tqparents.size(); ++j ) + for ( uint j = 0; j < elems[i].parents.size(); ++j ) { - x += elems[i].tqparents[j] + "_"; + x += elems[i].parents[j] + "_"; } kdDebug() << " --> " << i << " - " << elems[i].id << " - " << x << endl; } @@ -241,25 +241,25 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co kdDebug() << "+++ id: " << curid << endl; #endif const DrGeoHierarchyElement& el = elems[curid]; - std::vector<ObjectCalcer*> tqparents; - for ( uint j = 0; j < el.tqparents.size(); ++j ) + std::vector<ObjectCalcer*> parents; + for ( uint j = 0; j < el.parents.size(); ++j ) { - int tqparentid = convertDrgeoIndex( elems, el.tqparents[j] ); - if ( tqparentid == -1 ) + int parentid = convertDrgeoIndex( elems, el.parents[j] ); + if ( parentid == -1 ) KIG_FILTER_PARSE_ERROR; - tqparents.push_back( holders[tqparentid-nignored]->calcer() ); + parents.push_back( holders[parentid-nignored]->calcer() ); }; TQDomElement domelem = a.toElement(); #ifdef DRGEO_DEBUG - if ( tqparents.size() > 0 ) - for ( uint j = 0; j < tqparents.size(); ++j ) + if ( parents.size() > 0 ) + for ( uint j = 0; j < parents.size(); ++j ) { - kdDebug() << "+++++++++ tqparent[" << j << "]: " << tqparents[j] << " - " - << tqparents[j]->imp()->type()->internalName() << endl; + kdDebug() << "+++++++++ tqparent[" << j << "]: " << parents[j] << " - " + << parents[j]->imp()->type()->internalName() << endl; } else - kdDebug() << "+++++++++ tqparents: NO" << endl; + kdDebug() << "+++++++++ parents: NO" << endl; kdDebug() << "+++++++++ " << domelem.tagName() << " - " << domelem.attribute("type") << endl; #endif @@ -291,15 +291,15 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = fact->fixedPointCalcer( Coordinate( x, y ) ); } else if ( domelem.attribute( "type" ) == "Middle_2pts" ) - oc = new ObjectTypeCalcer( MidPointType::instance(), tqparents ); + oc = new ObjectTypeCalcer( MidPointType::instance(), parents ); else if ( domelem.attribute( "type" ) == "Middle_segment" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - if ( !tqparents[0]->imp()->inherits( SegmentImp::stype() ) ) + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + if ( !parents[0]->imp()->inherits( SegmentImp::stype() ) ) KIG_FILTER_PARSE_ERROR; - ObjectPropertyCalcer* o1 = fact->propertyObjectCalcer( tqparents[0], "end-point-A" ); + ObjectPropertyCalcer* o1 = fact->propertyObjectCalcer( parents[0], "end-point-A" ); o1->calc( *ret ); - ObjectPropertyCalcer* o2 = fact->propertyObjectCalcer( tqparents[0], "end-point-B" ); + ObjectPropertyCalcer* o2 = fact->propertyObjectCalcer( parents[0], "end-point-B" ); o2->calc( *ret ); std::vector<ObjectCalcer*> args; args.push_back( o1 ); @@ -312,26 +312,26 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co double value = values.toDouble( &ok3 ); if ( ! ok3 ) KIG_FILTER_PARSE_ERROR; - if ( ( tqparents[0]->imp()->inherits( CircleImp::stype() ) ) || - ( tqparents[0]->imp()->inherits( SegmentImp::stype() ) ) ) - oc = fact->constrainedPointCalcer( tqparents[0], value ); - else if ( tqparents[0]->imp()->inherits( LineImp::stype() ) ) + if ( ( parents[0]->imp()->inherits( CircleImp::stype() ) ) || + ( parents[0]->imp()->inherits( SegmentImp::stype() ) ) ) + oc = fact->constrainedPointCalcer( parents[0], value ); + else if ( parents[0]->imp()->inherits( LineImp::stype() ) ) { - const LineData l = static_cast<const LineImp*>( tqparents[0]->imp() )->data(); + const LineData l = static_cast<const LineImp*>( parents[0]->imp() )->data(); const Coordinate p = convertDrgeoLineParam( value, l ); - oc = fact->constrainedPointCalcer( tqparents[0], p, *ret ); + oc = fact->constrainedPointCalcer( parents[0], p, *ret ); } - else if ( tqparents[0]->imp()->inherits( RayImp::stype() ) ) + else if ( parents[0]->imp()->inherits( RayImp::stype() ) ) { - const LineData l = static_cast<const RayImp*>( tqparents[0]->imp() )->data(); + const LineData l = static_cast<const RayImp*>( parents[0]->imp() )->data(); const Coordinate p = convertDrgeoHalflineParam( value, l ); - oc = fact->constrainedPointCalcer( tqparents[0], p, *ret ); + oc = fact->constrainedPointCalcer( parents[0], p, *ret ); } - else if ( tqparents[0]->imp()->inherits( ArcImp::stype() ) ) - oc = fact->constrainedPointCalcer( tqparents[0], 1 - value ); + else if ( parents[0]->imp()->inherits( ArcImp::stype() ) ) + oc = fact->constrainedPointCalcer( parents[0], 1 - value ); else { -// oc = fact->constrainedPointCalcer( tqparents[0], value ); +// oc = fact->constrainedPointCalcer( parents[0], value ); notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); @@ -340,9 +340,9 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else if ( domelem.attribute( "type" ) == "Intersection" ) { - if ( ( tqparents[0]->imp()->inherits( AbstractLineImp::stype() ) ) && - ( tqparents[1]->imp()->inherits( AbstractLineImp::stype() ) ) ) - oc = new ObjectTypeCalcer( LineLineIntersectionType::instance(), tqparents ); + if ( ( parents[0]->imp()->inherits( AbstractLineImp::stype() ) ) && + ( parents[1]->imp()->inherits( AbstractLineImp::stype() ) ) ) + oc = new ObjectTypeCalcer( LineLineIntersectionType::instance(), parents ); else { bool ok; @@ -351,21 +351,21 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co if ( which == 1 ) which = -1; else if ( which == 0 ) which = 1; else KIG_FILTER_PARSE_ERROR; - std::vector<ObjectCalcer*> args = tqparents; + std::vector<ObjectCalcer*> args = parents; const ObjectType* type = 0; args.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); - if ( ( tqparents[0]->imp()->inherits( CircleImp::stype() ) ) && - ( tqparents[1]->imp()->inherits( CircleImp::stype() ) ) ) + if ( ( parents[0]->imp()->inherits( CircleImp::stype() ) ) && + ( parents[1]->imp()->inherits( CircleImp::stype() ) ) ) type = CircleCircleIntersectionType::instance(); - else if ( ( tqparents[0]->imp()->inherits( CircleImp::stype() ) && - tqparents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || - ( tqparents[1]->imp()->inherits( CircleImp::stype() ) && - tqparents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) + else if ( ( parents[0]->imp()->inherits( CircleImp::stype() ) && + parents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || + ( parents[1]->imp()->inherits( CircleImp::stype() ) && + parents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) type = ConicLineIntersectionType::instance(); - else if ( ( tqparents[0]->imp()->inherits( ArcImp::stype() ) && - tqparents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || - ( tqparents[1]->imp()->inherits( ArcImp::stype() ) && - tqparents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) + else if ( ( parents[0]->imp()->inherits( ArcImp::stype() ) && + parents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || + ( parents[1]->imp()->inherits( ArcImp::stype() ) && + parents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) type = ArcLineIntersectionType::instance(); else { @@ -377,13 +377,13 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } } else if ( domelem.attribute( "type" ) == "Reflexion" ) - oc = new ObjectTypeCalcer( LineReflectionType::instance(), tqparents ); + oc = new ObjectTypeCalcer( LineReflectionType::instance(), parents ); else if ( domelem.attribute( "type" ) == "Symmetry" ) - oc = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents ); + oc = new ObjectTypeCalcer( PointReflectionType::instance(), parents ); else if ( domelem.attribute( "type" ) == "Translation" ) - oc = new ObjectTypeCalcer( TranslatedType::instance(), tqparents ); + oc = new ObjectTypeCalcer( TranslatedType::instance(), parents ); else if ( domelem.attribute( "type" ) == "Rotation" ) - oc = new ObjectTypeCalcer( RotationType::instance(), tqparents ); + oc = new ObjectTypeCalcer( RotationType::instance(), parents ); else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " @@ -423,7 +423,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, tqparents ); + oc = new ObjectTypeCalcer( type, parents ); } else if( domelem.attribute( "type" ) == "3pts" ) { @@ -436,19 +436,19 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, tqparents ); + oc = new ObjectTypeCalcer( type, parents ); } else if( domelem.attribute( "type" ) == "segment" ) { if( domelem.tagName() == "circle" ) { type = CircleBPRType::instance(); - ObjectPropertyCalcer* o = fact->propertyObjectCalcer( tqparents[1], "length" ); + ObjectPropertyCalcer* o = fact->propertyObjectCalcer( parents[1], "length" ); o->calc( *ret ); - ObjectCalcer* a = tqparents[0]; - tqparents.clear(); - tqparents.push_back( a ); - tqparents.push_back( o ); + ObjectCalcer* a = parents[0]; + parents.clear(); + parents.push_back( a ); + parents.push_back( o ); } else { @@ -457,13 +457,13 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, tqparents ); + oc = new ObjectTypeCalcer( type, parents ); } else if( domelem.attribute( "type" ) == "npts" ) { if( domelem.tagName() == "polygon" ) { - if ( tqparents.size() < 3 ) KIG_FILTER_PARSE_ERROR; + if ( parents.size() < 3 ) KIG_FILTER_PARSE_ERROR; type = PolygonBNPType::instance(); } else @@ -473,20 +473,20 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, tqparents ); + oc = new ObjectTypeCalcer( type, parents ); } else if ( domelem.attribute( "type" ) == "perpendicular" ) - oc = new ObjectTypeCalcer( LinePerpendLPType::instance(), tqparents ); + oc = new ObjectTypeCalcer( LinePerpendLPType::instance(), parents ); else if ( domelem.attribute( "type" ) == "parallel" ) - oc = new ObjectTypeCalcer( LineParallelLPType::instance(), tqparents ); + oc = new ObjectTypeCalcer( LineParallelLPType::instance(), parents ); else if ( domelem.attribute( "type" ) == "Reflexion" ) - oc = new ObjectTypeCalcer( LineReflectionType::instance(), tqparents ); + oc = new ObjectTypeCalcer( LineReflectionType::instance(), parents ); else if ( domelem.attribute( "type" ) == "Symmetry" ) - oc = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents ); + oc = new ObjectTypeCalcer( PointReflectionType::instance(), parents ); else if ( domelem.attribute( "type" ) == "Translation" ) - oc = new ObjectTypeCalcer( TranslatedType::instance(), tqparents ); + oc = new ObjectTypeCalcer( TranslatedType::instance(), parents ); else if ( domelem.attribute( "type" ) == "Rotation" ) - oc = new ObjectTypeCalcer( RotationType::instance(), tqparents ); + oc = new ObjectTypeCalcer( RotationType::instance(), parents ); else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " @@ -534,71 +534,71 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else if ( domelem.attribute( "type" ) == "pt_abscissa" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "coordinate-x", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "coordinate-x", *ret, false ); } else if ( domelem.attribute( "type" ) == "pt_ordinate" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "coordinate-y", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "coordinate-y", *ret, false ); } else if ( domelem.attribute( "type" ) == "segment_length" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "length", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "length", *ret, false ); } else if ( domelem.attribute( "type" ) == "circle_perimeter" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "circumference", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "circumference", *ret, false ); } else if ( domelem.attribute( "type" ) == "arc_length" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "arc-length", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "arc-length", *ret, false ); } else if ( domelem.attribute( "type" ) == "distance_2pts" ) { - if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; - ObjectTypeCalcer* so = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); + if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + ObjectTypeCalcer* so = new ObjectTypeCalcer( SegmentABType::instance(), parents ); so->calc( *ret ); oc = filtersConstructTextObject( m, so, "length", *ret, false ); } else if ( domelem.attribute( "type" ) == "vector_norm" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "length", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "length", *ret, false ); } else if ( domelem.attribute( "type" ) == "vector_abscissa" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "length-x", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "length-x", *ret, false ); } else if ( domelem.attribute( "type" ) == "vector_ordinate" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "length-y", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "length-y", *ret, false ); } else if ( domelem.attribute( "type" ) == "slope" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "slope", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "slope", *ret, false ); } else if ( domelem.attribute( "type" ) == "distance_pt_line" ) { - if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; std::vector<ObjectCalcer*> args; - args.push_back( tqparents[1] ); - args.push_back( tqparents[0] ); + args.push_back( parents[1] ); + args.push_back( parents[0] ); ObjectTypeCalcer* po = new ObjectTypeCalcer( LinePerpendLPType::instance(), args ); po->calc( *ret ); args.clear(); - args.push_back( tqparents[1] ); + args.push_back( parents[1] ); args.push_back( po ); ObjectTypeCalcer* io = new ObjectTypeCalcer( LineLineIntersectionType::instance(), args ); io->calc( *ret ); args.clear(); - args.push_back( tqparents[0] ); + args.push_back( parents[0] ); args.push_back( io ); ObjectTypeCalcer* so = new ObjectTypeCalcer( SegmentABType::instance(), args ); so->calc( *ret ); @@ -607,13 +607,13 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co // types of 'equation' else if ( domelem.attribute( "type" ) == "line" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "equation", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "equation", *ret, false ); } else if ( domelem.attribute( "type" ) == "circle" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, tqparents[0], "simply-cartesian-equation", *ret, false ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, parents[0], "simply-cartesian-equation", *ret, false ); } else { @@ -630,8 +630,8 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co { if ( domelem.attribute( "type" ) == "3pts" ) { - if ( tqparents.size() != 3 ) KIG_FILTER_PARSE_ERROR; - oc = new ObjectTypeCalcer( HalfAngleType::instance(), tqparents ); + if ( parents.size() != 3 ) KIG_FILTER_PARSE_ERROR; + oc = new ObjectTypeCalcer( HalfAngleType::instance(), parents ); } else { @@ -669,7 +669,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co // since Kig doesn't support Guile scripts, it will write script's text // in a label, so the user can freely see the code and make whatever // he/she wants - // possible idea: construct a new script object with the tqparents of Guile + // possible idea: construct a new script object with the parents of Guile // one and the Guile code inserted commented... depends on a better // handling of arguments in scripts? if ( domelem.attribute( "type" ) == "nitems" ) @@ -685,7 +685,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else if ( domelem.tagName() == "locus" ) { if ( domelem.attribute( "type" ) == "None" ) - oc = fact->locusCalcer( tqparents[0], tqparents[1] ); + oc = fact->locusCalcer( parents[0], parents[1] ); else { notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " @@ -747,8 +747,8 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co TQString ps = domelem.attribute( "style" ); int pointstyle = ObjectDrawer::pointStyleFromString( ps ); // show this object? - bool show = ( ( domelem.attribute( "tqmasked" ) != "True" ) && - ( domelem.attribute( "tqmasked" ) != "Alway" ) ); + bool show = ( ( domelem.attribute( "masked" ) != "True" ) && + ( domelem.attribute( "masked" ) != "Alway" ) ); // costructing the ObjectDrawer* ObjectDrawer* d = new ObjectDrawer( co, w, show, s, pointstyle ); // reading object name @@ -779,7 +779,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else if ( domelem.tagName() == "angle" ) { oc2 = filtersConstructTextObject( - static_cast<const PointImp*>( holders[curid-1-nignored]->calcer()->tqparents()[1]->imp() )->coordinate(), + static_cast<const PointImp*>( holders[curid-1-nignored]->calcer()->parents()[1]->imp() )->coordinate(), holders[curid-1-nignored]->calcer(), "angle-degrees", *ret, false ); } diff --git a/kig/filters/imageexporteroptionsbase.ui b/kig/filters/imageexporteroptionsbase.ui index 5b2fbb67..2a9156bf 100644 --- a/kig/filters/imageexporteroptionsbase.ui +++ b/kig/filters/imageexporteroptionsbase.ui @@ -144,7 +144,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc index 379af11d..2405e46b 100644 --- a/kig/filters/kgeo-filter.cc +++ b/kig/filters/kgeo-filter.cc @@ -74,7 +74,7 @@ void KigFilterKGeo::loadMetrics(KSimpleConfig* c ) struct KGeoHierarchyElement { int id; - std::vector<int> tqparents; + std::vector<int> parents; }; static void visitElem( std::vector<KGeoHierarchyElement>& ret, @@ -84,8 +84,8 @@ static void visitElem( std::vector<KGeoHierarchyElement>& ret, { if ( !seen[i] ) { - for ( uint j = 0; j < elems[i].tqparents.size(); ++j ) - visitElem( ret, elems, seen, elems[i].tqparents[j] ); + for ( uint j = 0; j < elems[i].parents.size(); ++j ) + visitElem( ret, elems, seen, elems[i].parents[j] ); ret.push_back( elems[i] ); seen[i] = true; }; @@ -113,7 +113,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c // first we determine the tqparent relationships, and sort the // elements in an order that we can be sure all of an object's - // tqparents will have been handled before it is handled itself.. + // parents will have been handled before it is handled itself.. // ( aka topological sort of the tqparent relations graph.. std::vector<KGeoHierarchyElement> elems; elems.reserve( number ); @@ -125,15 +125,15 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c group.setNum( i + 1 ); group.prepend( "Object " ); c->setGroup( group ); - TQStrList tqparents; - c->readListEntry( "Parents", tqparents ); + TQStrList parents; + c->readListEntry( "Parents", parents ); elems.push_back( elem ); - for ( const char* tqparent = tqparents.first(); tqparent; tqparent = tqparents.next() ) + for ( const char* tqparent = parents.first(); tqparent; tqparent = parents.next() ) { - int tqparentIndex = TQString::tqfromLatin1( tqparent ).toInt( &ok ); + int parentIndex = TQString::tqfromLatin1( tqparent ).toInt( &ok ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; - if ( tqparentIndex != 0 ) - elems[i].tqparents.push_back( tqparentIndex - 1 ); + if ( parentIndex != 0 ) + elems[i].parents.push_back( parentIndex - 1 ); }; }; @@ -153,11 +153,11 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c c->setGroup( group ); int objID = c->readNumEntry( "Geo" ); - std::vector<ObjectCalcer*> tqparents; - for ( uint j = 0; j < e.tqparents.size(); ++j ) + std::vector<ObjectCalcer*> parents; + for ( uint j = 0; j < e.parents.size(); ++j ) { - int tqparentid = e.tqparents[j]; - tqparents.push_back( os[tqparentid]->calcer() ); + int parentid = e.parents[j]; + parents.push_back( os[parentid]->calcer() ); }; ObjectCalcer* o = 0; @@ -173,77 +173,77 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c double y = strY.toDouble(&ok); if (!ok) KIG_FILTER_PARSE_ERROR; Coordinate m( x, y ); - uint ntqparents = tqparents.size(); - if ( ntqparents == 0 ) + uint nparents = parents.size(); + if ( nparents == 0 ) o = factory->fixedPointCalcer( m ); - else if ( ntqparents == 1 ) - o = factory->constrainedPointCalcer( tqparents[0], m, *ret ); + else if ( nparents == 1 ) + o = factory->constrainedPointCalcer( parents[0], m, *ret ); else KIG_FILTER_PARSE_ERROR; break; } case ID_segment: { - o = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); + o = new ObjectTypeCalcer( SegmentABType::instance(), parents ); break; } case ID_circle: { - o = new ObjectTypeCalcer( CircleBCPType::instance(), tqparents ); + o = new ObjectTypeCalcer( CircleBCPType::instance(), parents ); break; } case ID_line: { - o = new ObjectTypeCalcer( LineABType::instance(), tqparents ); + o = new ObjectTypeCalcer( LineABType::instance(), parents ); break; } case ID_bisection: { // if this is the bisection of two points, first build a segment // between them.. - if ( tqparents.size() == 2 ) + if ( parents.size() == 2 ) { - ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); - tqparents.clear(); - tqparents.push_back( seg ); + ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), parents ); + parents.clear(); + parents.push_back( seg ); } - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - o = factory->propertyObjectCalcer( tqparents[0], "mid-point" ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + o = factory->propertyObjectCalcer( parents[0], "mid-point" ); break; }; case ID_perpendicular: { - o = new ObjectTypeCalcer( LinePerpendLPType::instance(), tqparents ); + o = new ObjectTypeCalcer( LinePerpendLPType::instance(), parents ); break; } case ID_parallel: { - o = new ObjectTypeCalcer( LineParallelLPType::instance(), tqparents ); + o = new ObjectTypeCalcer( LineParallelLPType::instance(), parents ); break; } case ID_vector: { - o = new ObjectTypeCalcer( VectorType::instance(), tqparents ); + o = new ObjectTypeCalcer( VectorType::instance(), parents ); break; } case ID_ray: { - o = new ObjectTypeCalcer( RayABType::instance(), tqparents ); + o = new ObjectTypeCalcer( RayABType::instance(), parents ); break; } case ID_move: { - o = new ObjectTypeCalcer( TranslatedType::instance(), tqparents ); + o = new ObjectTypeCalcer( TranslatedType::instance(), parents ); break; } case ID_mirrorPoint: { - o = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents ); + o = new ObjectTypeCalcer( PointReflectionType::instance(), parents ); break; } case ID_pointOfConc: { - o = new ObjectTypeCalcer( LineLineIntersectionType::instance(), tqparents ); + o = new ObjectTypeCalcer( LineLineIntersectionType::instance(), parents ); break; } case ID_text: @@ -264,79 +264,79 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c case ID_fixedCircle: { double r = c->readDoubleNumEntry( "Radius" ); - tqparents.push_back( new ObjectConstCalcer( new DoubleImp( r ) ) ); - o = new ObjectTypeCalcer( CircleBPRType::instance(), tqparents ); + parents.push_back( new ObjectConstCalcer( new DoubleImp( r ) ) ); + o = new ObjectTypeCalcer( CircleBPRType::instance(), parents ); break; } case ID_angle: { - if ( tqparents.size() == 3 ) + if ( parents.size() == 3 ) { - ObjectTypeCalcer* ao = new ObjectTypeCalcer( AngleType::instance(), tqparents ); + ObjectTypeCalcer* ao = new ObjectTypeCalcer( AngleType::instance(), parents ); ao->calc( *ret ); - tqparents.clear(); - tqparents.push_back( ao ); + parents.clear(); + parents.push_back( ao ); }; - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* angle = tqparents[0]; - tqparents.clear(); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + ObjectCalcer* angle = parents[0]; + parents.clear(); const Coordinate c = - static_cast<const PointImp*>( angle->tqparents()[1]->imp() )->coordinate(); + static_cast<const PointImp*>( angle->parents()[1]->imp() )->coordinate(); o = filtersConstructTextObject( c, angle, "angle-degrees", *ret, true ); break; } case ID_distance: { - if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; - ObjectTypeCalcer* segment = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); + if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + ObjectTypeCalcer* segment = new ObjectTypeCalcer( SegmentABType::instance(), parents ); segment->calc( *ret ); - Coordinate m = ( static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate() + - static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate() ) / 2; + Coordinate m = ( static_cast<const PointImp*>( parents[0]->imp() )->coordinate() + + static_cast<const PointImp*>( parents[1]->imp() )->coordinate() ) / 2; o = filtersConstructTextObject( m, segment, "length", *ret, true ); break; } case ID_arc: { - o = new ObjectTypeCalcer( AngleType::instance(), tqparents ); + o = new ObjectTypeCalcer( AngleType::instance(), parents ); break; } case ID_area: { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - const CircleImp* circle = static_cast<const CircleImp*>( tqparents[0]->imp() ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + const CircleImp* circle = static_cast<const CircleImp*>( parents[0]->imp() ); const Coordinate c = circle->center() + Coordinate( circle->radius(), 0 ); - o = filtersConstructTextObject( c, tqparents[0], "surface", *ret, true ); + o = filtersConstructTextObject( c, parents[0], "surface", *ret, true ); break; } case ID_slope: { - // if tqparents contains a segment, line, vector or whatever, we - // take its tqparents cause we want points.. - if ( tqparents.size() == 1 ) tqparents = tqparents[0]->tqparents(); - if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + // if parents contains a segment, line, vector or whatever, we + // take its parents cause we want points.. + if ( parents.size() == 1 ) parents = parents[0]->parents(); + if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; const Coordinate c = ( - static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate() + - static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate() ) / 2; - ObjectTypeCalcer* line = new ObjectTypeCalcer( LineABType::instance(), tqparents ); + static_cast<const PointImp*>( parents[0]->imp() )->coordinate() + + static_cast<const PointImp*>( parents[1]->imp() )->coordinate() ) / 2; + ObjectTypeCalcer* line = new ObjectTypeCalcer( LineABType::instance(), parents ); line->calc( *ret ); o = filtersConstructTextObject( c, line, "slope", *ret, true ); break; } case ID_circumference: { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - const CircleImp* c = static_cast<const CircleImp*>( tqparents[0]->imp() ); + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + const CircleImp* c = static_cast<const CircleImp*>( parents[0]->imp() ); const Coordinate m = c->center() + Coordinate( c->radius(), 0 ); - o = filtersConstructTextObject( m, tqparents[0], "circumference", *ret, true ); + o = filtersConstructTextObject( m, parents[0], "circumference", *ret, true ); break; } case ID_rotation: { // in kig, the rotated object should be last.. - ObjectCalcer* t = tqparents[2]; - tqparents[2] = tqparents[0]; - tqparents[0] = t; - o = new ObjectTypeCalcer( RotationType::instance(), tqparents ); + ObjectCalcer* t = parents[2]; + parents[2] = parents[0]; + parents[0] = t; + o = new ObjectTypeCalcer( RotationType::instance(), parents ); break; } default: diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc index 6f784759..27edc762 100644 --- a/kig/filters/kseg-filter.cc +++ b/kig/filters/kseg-filter.cc @@ -93,50 +93,50 @@ static Coordinate readKSegCoordinate( TQDataStream& stream ) return t + Coordinate( -7, -7 ); } -static ObjectTypeCalcer* intersectionPoint( const std::vector<ObjectCalcer*>& tqparents, int which ) +static ObjectTypeCalcer* intersectionPoint( const std::vector<ObjectCalcer*>& parents, int which ) { - if ( tqparents.size() != 2 ) return 0; + if ( parents.size() != 2 ) return 0; int nlines = 0; int nconics = 0; int narcs = 0; for ( int i = 0; i < 2; ++i ) { - if ( tqparents[i]->imp()->inherits( AbstractLineImp::stype() ) ) ++nlines; - else if ( tqparents[i]->imp()->inherits( ConicImp::stype() ) ) ++nconics; - else if ( tqparents[i]->imp()->inherits( ArcImp::stype() ) ) ++narcs; + if ( parents[i]->imp()->inherits( AbstractLineImp::stype() ) ) ++nlines; + else if ( parents[i]->imp()->inherits( ConicImp::stype() ) ) ++nconics; + else if ( parents[i]->imp()->inherits( ArcImp::stype() ) ) ++narcs; else return 0; }; if ( nlines == 2 ) - return which == -1 ? new ObjectTypeCalcer( LineLineIntersectionType::instance(), tqparents ) : 0; + return which == -1 ? new ObjectTypeCalcer( LineLineIntersectionType::instance(), parents ) : 0; else if ( nlines == 1 && nconics == 1 ) { - std::vector<ObjectCalcer*> inttqparents( tqparents ); - inttqparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); - return new ObjectTypeCalcer( ConicLineIntersectionType::instance(), inttqparents ); + std::vector<ObjectCalcer*> intparents( parents ); + intparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); + return new ObjectTypeCalcer( ConicLineIntersectionType::instance(), intparents ); } else if ( nlines == 0 && nconics == 2 ) { - std::vector<ObjectCalcer*> rtqparents( tqparents ); - rtqparents.push_back( new ObjectConstCalcer( new IntImp( 1 ) ) ); - rtqparents.push_back( new ObjectConstCalcer( new IntImp( 1 ) ) ); - rtqparents.push_back( new ObjectTypeCalcer( ConicRadicalType::instance(), rtqparents ) ); - std::vector<ObjectCalcer*> itqparents; - itqparents.push_back( tqparents[0] ); - itqparents.push_back( rtqparents.back() ); - itqparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); - return new ObjectTypeCalcer( ConicLineIntersectionType::instance(), itqparents ); + std::vector<ObjectCalcer*> rparents( parents ); + rparents.push_back( new ObjectConstCalcer( new IntImp( 1 ) ) ); + rparents.push_back( new ObjectConstCalcer( new IntImp( 1 ) ) ); + rparents.push_back( new ObjectTypeCalcer( ConicRadicalType::instance(), rparents ) ); + std::vector<ObjectCalcer*> iparents; + iparents.push_back( parents[0] ); + iparents.push_back( rparents.back() ); + iparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); + return new ObjectTypeCalcer( ConicLineIntersectionType::instance(), iparents ); } else if ( nlines == 1 && narcs == 1 ) { - std::vector<ObjectCalcer*> inttqparents( tqparents ); - inttqparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); - return new ObjectTypeCalcer( ArcLineIntersectionType::instance(), inttqparents ); + std::vector<ObjectCalcer*> intparents( parents ); + intparents.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); + return new ObjectTypeCalcer( ArcLineIntersectionType::instance(), intparents ); } else return 0; } ObjectCalcer* KigFilterKSeg::transformObject( const TQString& file, KigDocument& kigdoc, - std::vector<ObjectCalcer*>& tqparents, + std::vector<ObjectCalcer*>& parents, int subtype, bool& ok ) { ok = true; @@ -145,34 +145,34 @@ ObjectCalcer* KigFilterKSeg::transformObject( const TQString& file, KigDocument& { case G_TRANSLATED: { - std::vector<ObjectCalcer*> vectortqparents( tqparents.begin() + 1, tqparents.end() ); - ObjectTypeCalcer* vector = new ObjectTypeCalcer( VectorType::instance(), vectortqparents ); + std::vector<ObjectCalcer*> vectorparents( parents.begin() + 1, parents.end() ); + ObjectTypeCalcer* vector = new ObjectTypeCalcer( VectorType::instance(), vectorparents ); vector->calc( kigdoc ); std::vector<ObjectCalcer*> transparents; - transparents.push_back( tqparents[0] ); + transparents.push_back( parents[0] ); transparents.push_back( vector ); retobj = new ObjectTypeCalcer( TranslatedType::instance(), transparents ); break; } case G_ROTATED: { - std::vector<ObjectCalcer*> angletqparents( tqparents.begin() + 2, tqparents.end() ); - ObjectTypeCalcer* angle = new ObjectTypeCalcer( AngleType::instance(), angletqparents ); + std::vector<ObjectCalcer*> angleparents( parents.begin() + 2, parents.end() ); + ObjectTypeCalcer* angle = new ObjectTypeCalcer( AngleType::instance(), angleparents ); angle->calc( kigdoc ); - std::vector<ObjectCalcer*> rottqparents; - rottqparents.push_back( tqparents[0] ); - rottqparents.push_back( tqparents[1] ); - rottqparents.push_back( angle ); - retobj = new ObjectTypeCalcer( RotationType::instance(), rottqparents ); + std::vector<ObjectCalcer*> rotparents; + rotparents.push_back( parents[0] ); + rotparents.push_back( parents[1] ); + rotparents.push_back( angle ); + retobj = new ObjectTypeCalcer( RotationType::instance(), rotparents ); break; } case G_SCALED: { - if ( tqparents.size() == 4 ) + if ( parents.size() == 4 ) { - retobj = new ObjectTypeCalcer( ScalingOverCenter2Type::instance(), tqparents ); + retobj = new ObjectTypeCalcer( ScalingOverCenter2Type::instance(), parents ); } else { @@ -187,8 +187,8 @@ ObjectCalcer* KigFilterKSeg::transformObject( const TQString& file, KigDocument& } case G_REFLECTED: { - std::vector<ObjectCalcer*> mirtqparents( tqparents.begin(), tqparents.end() ); - retobj = new ObjectTypeCalcer( LineReflectionType::instance(), mirtqparents ); + std::vector<ObjectCalcer*> mirparents( parents.begin(), parents.end() ); + retobj = new ObjectTypeCalcer( LineReflectionType::instance(), mirparents ); break; } } @@ -250,14 +250,14 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) { short styleid; stream >> styleid; - short ntqparents; - stream >> ntqparents; - std::vector<ObjectCalcer*> tqparents( ntqparents, 0 ); - for ( short j = 0; j < ntqparents; ++j ) + short nparents; + stream >> nparents; + std::vector<ObjectCalcer*> parents( nparents, 0 ); + for ( short j = 0; j < nparents; ++j ) { int tqparent; stream >> tqparent; - tqparents[j] = ret[tqparent]->calcer(); + parents[j] = ret[tqparent]->calcer(); }; // read the object.. @@ -318,13 +318,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, tqparents, descendtype, ok ); + o = transformObject( file, *retdoc, parents, descendtype, ok ); break; } case G_FREE_POINT: { // fixed point - if ( ntqparents != 0 ) KIG_FILTER_PARSE_ERROR; + if ( nparents != 0 ) KIG_FILTER_PARSE_ERROR; Coordinate c = readKSegCoordinate( stream ); o = fact->fixedPointCalcer( c ); break; @@ -334,8 +334,8 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) // constrained point double p; stream >> p; - if ( ntqparents != 1 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = tqparents[0]; + if ( nparents != 1 ) KIG_FILTER_PARSE_ERROR; + ObjectCalcer* tqparent = parents[0]; assert( tqparent ); o = fact->constrainedPointCalcer( tqparent, p ); break; @@ -344,27 +344,27 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) { // KSeg has somewhat weird intersection objects.. // for all objects G_INTERSECTION_POINT gets the - // first intersection of its tqparents, G_INTERSECTION2_POINT + // first intersection of its parents, G_INTERSECTION2_POINT // represents the second, if present. - o = intersectionPoint( tqparents, -1 ); + o = intersectionPoint( parents, -1 ); if ( ! o ) KIG_FILTER_PARSE_ERROR; break; } case G_INTERSECTION2_POINT: { - o = intersectionPoint( tqparents, 1 ); + o = intersectionPoint( parents, 1 ); if ( ! o ) KIG_FILTER_PARSE_ERROR; break; } case G_MID_POINT: { // midpoint of a segment.. - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - if ( !tqparents[0]->imp()->inherits( SegmentImp::stype() ) ) + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + if ( !parents[0]->imp()->inherits( SegmentImp::stype() ) ) KIG_FILTER_PARSE_ERROR; - int index = tqparents[0]->imp()->propertiesInternalNames().tqfindIndex( "mid-point" ); + int index = parents[0]->imp()->propertiesInternalNames().tqfindIndex( "mid-point" ); assert( index != -1 ); - o = new ObjectPropertyCalcer( tqparents[0], index ); + o = new ObjectPropertyCalcer( parents[0], index ); break; } default: @@ -383,13 +383,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, tqparents, descendtype, ok ); + o = transformObject( file, *retdoc, parents, descendtype, ok ); break; } case G_ENDPOINTS_SEGMENT: { - if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); + if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( SegmentABType::instance(), parents ); break; } default: @@ -406,18 +406,18 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, tqparents, descendtype, ok ); + o = transformObject( file, *retdoc, parents, descendtype, ok ); break; } case G_TWOPOINTS_RAY: { - if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( RayABType::instance(), tqparents ); + if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( RayABType::instance(), parents ); break; } case G_BISECTOR_RAY: { - ObjectTypeCalcer* angle = new ObjectTypeCalcer( HalfAngleType::instance(), tqparents ); + ObjectTypeCalcer* angle = new ObjectTypeCalcer( HalfAngleType::instance(), parents ); angle->calc( *retdoc ); o = fact->propertyObjectCalcer( angle, "angle-bisector" ); break; @@ -436,25 +436,25 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, tqparents, descendtype, ok ); + o = transformObject( file, *retdoc, parents, descendtype, ok ); break; } case G_TWOPOINTS_LINE: { - if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( LineABType::instance(), tqparents ); + if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( LineABType::instance(), parents ); break; } case G_PARALLEL_LINE: { - if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( LineParallelLPType::instance(), tqparents ); + if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( LineParallelLPType::instance(), parents ); break; } case G_PERPENDICULAR_LINE: { - if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( LinePerpendLPType::instance(), tqparents ); + if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( LinePerpendLPType::instance(), parents ); break; } default: @@ -471,37 +471,37 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, tqparents, descendtype, ok ); + o = transformObject( file, *retdoc, parents, descendtype, ok ); break; } case G_CENTERPOINT_CIRCLE: { - if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( CircleBCPType::instance(), tqparents ); + if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( CircleBCPType::instance(), parents ); break; } case G_CENTERRADIUS_CIRCLE: { ObjectCalcer* point; ObjectCalcer* segment; - if ( tqparents[0]->imp()->inherits( PointImp::stype() ) ) + if ( parents[0]->imp()->inherits( PointImp::stype() ) ) { - point = tqparents[0]; - segment = tqparents[1]; + point = parents[0]; + segment = parents[1]; } else { - point = tqparents[1]; - segment = tqparents[0]; + point = parents[1]; + segment = parents[0]; }; int index = segment->imp()->propertiesInternalNames().tqfindIndex( "length" ); if ( index == -1 ) KIG_FILTER_PARSE_ERROR; ObjectPropertyCalcer* length = new ObjectPropertyCalcer( segment, index ); length->calc( *retdoc ); - std::vector<ObjectCalcer*> ctqparents; - ctqparents.push_back( point ); - ctqparents.push_back( length ); - o = new ObjectTypeCalcer( CircleBPRType::instance(), ctqparents ); + std::vector<ObjectCalcer*> cparents; + cparents.push_back( point ); + cparents.push_back( length ); + o = new ObjectTypeCalcer( CircleBPRType::instance(), cparents ); break; } default: @@ -518,13 +518,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, tqparents, descendtype, ok ); + o = transformObject( file, *retdoc, parents, descendtype, ok ); break; } case G_THREEPOINTS_ARC: { - if ( ntqparents != 3 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( ArcBTPType::instance(), tqparents ); + if ( nparents != 3 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( ArcBTPType::instance(), parents ); break; } default: @@ -541,13 +541,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, tqparents, descendtype, ok ); + o = transformObject( file, *retdoc, parents, descendtype, ok ); break; } default: { - if ( ntqparents < 3 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectTypeCalcer( PolygonBNPType::instance(), tqparents ); + if ( nparents < 3 ) KIG_FILTER_PARSE_ERROR; + o = new ObjectTypeCalcer( PolygonBNPType::instance(), parents ); } } // default: @@ -581,13 +581,13 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) case G_SCALED: case G_REFLECTED: { - o = transformObject( file, *retdoc, tqparents, descendtype, ok ); + o = transformObject( file, *retdoc, parents, descendtype, ok ); break; } case G_OBJECT_LOCUS: { - if ( ntqparents != 2 ) KIG_FILTER_PARSE_ERROR; - o = fact->locusCalcer( tqparents[0], tqparents[1] ); + if ( nparents != 2 ) KIG_FILTER_PARSE_ERROR; + o = fact->locusCalcer( parents[0], parents[1] ); break; } default: diff --git a/kig/filters/kseg-filter.h b/kig/filters/kseg-filter.h index d8909282..03d03958 100644 --- a/kig/filters/kseg-filter.h +++ b/kig/filters/kseg-filter.h @@ -29,7 +29,7 @@ class KigFilterKSeg ~KigFilterKSeg(); ObjectCalcer* transformObject( const TQString& file, KigDocument& kigdoc, - std::vector<ObjectCalcer*>& tqparents, + std::vector<ObjectCalcer*>& parents, int subtype, bool& ok ); public: diff --git a/kig/filters/latexexporteroptions.ui b/kig/filters/latexexporteroptions.ui index 2e9354bc..6db39ed9 100644 --- a/kig/filters/latexexporteroptions.ui +++ b/kig/filters/latexexporteroptions.ui @@ -63,7 +63,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> </includehints> </UI> diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc index 4a3d0a04..9e92130d 100644 --- a/kig/filters/native-filter.cc +++ b/kig/filters/native-filter.cc @@ -51,7 +51,7 @@ struct HierElem { int id; - std::vector<int> tqparents; + std::vector<int> parents; TQDomElement el; }; @@ -73,8 +73,8 @@ static void visitElem( std::vector<HierElem>& ret, { if ( !seen[i] ) { - for ( uint j = 0; j < elems[i].tqparents.size(); ++j ) - visitElem( ret, elems, seen, elems[i].tqparents[j] - 1); + for ( uint j = 0; j < elems[i].parents.size(); ++j ) + visitElem( ret, elems, seen, elems[i].parents[j] - 1); ret.push_back( elems[i] ); seen[i] = true; }; @@ -273,7 +273,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement& if ( ! ok ) KIG_FILTER_PARSE_ERROR; extendVect( elems, id ); - elems[id-1].tqparents.push_back( pid ); + elems[id-1].parents.push_back( pid ); } } }; @@ -315,8 +315,8 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement& propname = ec.text().latin1(); }; - if ( i->tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = retcalcers[i->tqparents[0] -1]; + if ( i->parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + ObjectCalcer* tqparent = retcalcers[i->parents[0] -1]; QCStringList propnames = tqparent->imp()->propertiesInternalNames(); int propid = propnames.tqfindIndex( propname ); if ( propid == -1 ) @@ -342,12 +342,12 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement& return false; }; - std::vector<ObjectCalcer*> tqparents; - for ( std::vector<int>::iterator j = i->tqparents.begin(); - j != i->tqparents.end(); ++j ) - tqparents.push_back( retcalcers[*j - 1] ); + std::vector<ObjectCalcer*> parents; + for ( std::vector<int>::iterator j = i->parents.begin(); + j != i->parents.end(); ++j ) + parents.push_back( retcalcers[*j - 1] ); - o = new ObjectTypeCalcer( type, tqparents ); + o = new ObjectTypeCalcer( type, parents ); } else continue; @@ -434,25 +434,25 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& uint id = tmp.toInt( &ok ); if ( id <= 0 ) KIG_FILTER_PARSE_ERROR; - std::vector<ObjectCalcer*> tqparents; - for ( TQDomElement tqparentel = e.firstChild().toElement(); ! tqparentel.isNull(); - tqparentel = tqparentel.nextSibling().toElement() ) + std::vector<ObjectCalcer*> parents; + for ( TQDomElement parentel = e.firstChild().toElement(); ! parentel.isNull(); + parentel = parentel.nextSibling().toElement() ) { - if ( tqparentel.tagName() != "Parent" ) continue; - TQString tmp = tqparentel.attribute( "id" ); - uint tqparentid = tmp.toInt( &ok ); + if ( parentel.tagName() != "Parent" ) continue; + TQString tmp = parentel.attribute( "id" ); + uint parentid = tmp.toInt( &ok ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; - if ( tqparentid == 0 || tqparentid > calcers.size() ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = calcers[tqparentid - 1].get(); + if ( parentid == 0 || parentid > calcers.size() ) KIG_FILTER_PARSE_ERROR; + ObjectCalcer* tqparent = calcers[parentid - 1].get(); if ( ! tqparent ) KIG_FILTER_PARSE_ERROR; - tqparents.push_back( tqparent ); + parents.push_back( tqparent ); } ObjectCalcer* o = 0; if ( e.tagName() == "Data" ) { - if ( !tqparents.empty() ) KIG_FILTER_PARSE_ERROR; + if ( !parents.empty() ) KIG_FILTER_PARSE_ERROR; TQString tmp = e.attribute( "type" ); TQString error; ObjectImp* imp = ObjectImpFactory::instance()->deserialize( tmp, e, error ); @@ -465,10 +465,10 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& } else if ( e.tagName() == "Property" ) { - if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; TQCString propname = e.attribute( "which" ).latin1(); - ObjectCalcer* tqparent = tqparents[0]; + ObjectCalcer* tqparent = parents[0]; int propid = tqparent->imp()->propertiesInternalNames().tqfindIndex( propname ); if ( propid == -1 ) KIG_FILTER_PARSE_ERROR; @@ -490,17 +490,17 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& } // mp: (I take the responsibility for this!) explanation: the usual ObjectTypeCalcer - // constructor also "sortArgs" the tqparents. I believe that this *must not* be done + // constructor also "sortArgs" the parents. I believe that this *must not* be done // when loading from a saved kig file for the following reasons: // 1. the arguments should already be in their intended order, since the file was // saved from a working hierarchy; furthermore we actually want to restore the original // hierarchy, not really to also fix possible problems with the original hierarchy; // 2. calling sortArgs could have undesirable side effects in particular situations, // since kig actually allow an ObjectType to produce different type of ObjectImp's - // it may happen that the tqparents of an object do not satisfy the requirements + // it may happen that the parents of an object do not satisfy the requirements // enforced by sortArgs (while moving around the free objects) but still be // perfectly valid - o = new ObjectTypeCalcer( type, tqparents, false ); + o = new ObjectTypeCalcer( type, parents, false ); } else KIG_FILTER_PARSE_ERROR; @@ -615,8 +615,8 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream ) } else assert( false ); - const std::vector<ObjectCalcer*> tqparents = ( *i )->tqparents(); - for ( std::vector<ObjectCalcer*>::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) + const std::vector<ObjectCalcer*> parents = ( *i )->parents(); + for ( std::vector<ObjectCalcer*>::const_iterator i = parents.begin(); i != parents.end(); ++i ) { std::map<const ObjectCalcer*,int>::const_iterator idp = idmap.find( *i ); assert( idp != idmap.end() ); diff --git a/kig/filters/svgexporteroptions.ui b/kig/filters/svgexporteroptions.ui index feca8ca1..2677650d 100644 --- a/kig/filters/svgexporteroptions.ui +++ b/kig/filters/svgexporteroptions.ui @@ -55,7 +55,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> </includehints> </UI> diff --git a/kig/filters/tests/locus.fgeo b/kig/filters/tests/locus.fgeo index 4ad79bbd..55fa562f 100644 --- a/kig/filters/tests/locus.fgeo +++ b/kig/filters/tests/locus.fgeo @@ -1,2 +1,2 @@ <?xml version="1.0"?> -<drgenius><drgeo name="Figuur 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"><point id="8293DE0" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" tqmasked="False" name=""><x>-1.666666</x><y>3.216667</y></point><point id="8306C70" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" tqmasked="False" name=""><x>-2.766667</x><y>0.550000</y></point><circle id="8307268" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""><tqparent ref="8293DE0"/><tqparent ref="8306C70"/></circle><point id="8309098" type="On_curve" color="Red" thickness="Dashed" style="Cross" filled="False" tqmasked="False" name=""><value>0.080691</value><tqparent ref="8307268"/></point><point id="830A920" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" tqmasked="False" name=""><x>3.000000</x><y>3.016667</y></point><line id="8172970" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""><tqparent ref="8309098"/><tqparent ref="830A920"/></line><point id="8339730" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" tqmasked="False" name=""><x>2.866667</x><y>-0.750000</y></point><line id="833AD18" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""><tqparent ref="8309098"/><tqparent ref="8339730"/></line><point id="8338A50" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" tqmasked="False" name=""><x>2.600000</x><y>3.816667</y></point><line id="833BBB8" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name=""><tqparent ref="8338A50"/><tqparent ref="833AD18"/></line><point id="8342478" type="Intersection" color="Red" thickness="Dashed" style="Cross" filled="False" tqmasked="False" name="" extra="0"><tqparent ref="8172970"/><tqparent ref="833BBB8"/></point><locus id="8345D60" type="None" color="Black" thickness="Dashed" style="Cross" filled="False" tqmasked="False" name=""><tqparent ref="8309098"/><tqparent ref="8342478"/></locus></drgeo></drgenius> +<drgenius><drgeo name="Figuur 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"><point id="8293DE0" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-1.666666</x><y>3.216667</y></point><point id="8306C70" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-2.766667</x><y>0.550000</y></point><circle id="8307268" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8293DE0"/><tqparent ref="8306C70"/></circle><point id="8309098" type="On_curve" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><value>0.080691</value><tqparent ref="8307268"/></point><point id="830A920" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>3.000000</x><y>3.016667</y></point><line id="8172970" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="830A920"/></line><point id="8339730" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.866667</x><y>-0.750000</y></point><line id="833AD18" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="8339730"/></line><point id="8338A50" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.600000</x><y>3.816667</y></point><line id="833BBB8" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8338A50"/><tqparent ref="833AD18"/></line><point id="8342478" type="Intersection" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name="" extra="0"><tqparent ref="8172970"/><tqparent ref="833BBB8"/></point><locus id="8345D60" type="None" color="Black" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="8342478"/></locus></drgeo></drgenius> diff --git a/kig/kig/kig_commands.cpp b/kig/kig/kig_commands.cpp index d6b79805..bcf26969 100644 --- a/kig/kig/kig_commands.cpp +++ b/kig/kig/kig_commands.cpp @@ -274,7 +274,7 @@ class ChangeParentsAndTypeTask::Private { public: ObjectTypeCalcer* o; - std::vector<ObjectCalcer::shared_ptr> newtqparents; + std::vector<ObjectCalcer::shared_ptr> newparents; const ObjectType* newtype; }; @@ -284,13 +284,13 @@ ChangeParentsAndTypeTask::~ChangeParentsAndTypeTask() } ChangeParentsAndTypeTask::ChangeParentsAndTypeTask( - ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newtqparents, + ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newparents, const ObjectType* newtype ) : KigCommandTask(), d( new Private ) { d->o = o; - std::copy( newtqparents.begin(), newtqparents.end(), - std::back_inserter( d->newtqparents ) ); + std::copy( newparents.begin(), newparents.end(), + std::back_inserter( d->newparents ) ); d->newtype = newtype; } @@ -300,17 +300,17 @@ void ChangeParentsAndTypeTask::execute( KigPart& doc ) d->o->setType( d->newtype ); d->newtype = oldtype; - std::vector<ObjectCalcer*> oldtqparentso = d->o->tqparents(); - std::vector<ObjectCalcer::shared_ptr> oldtqparents( - oldtqparentso.begin(), oldtqparentso.end() ); - std::vector<ObjectCalcer*> newtqparents; - for ( std::vector<ObjectCalcer::shared_ptr>::iterator i = d->newtqparents.begin(); - i != d->newtqparents.end(); ++i ) - newtqparents.push_back( i->get() ); - d->o->setParents( newtqparents ); - d->newtqparents = oldtqparents; - - for ( std::vector<ObjectCalcer*>::iterator i = newtqparents.begin(); i != newtqparents.end(); ++i ) + std::vector<ObjectCalcer*> oldparentso = d->o->parents(); + std::vector<ObjectCalcer::shared_ptr> oldparents( + oldparentso.begin(), oldparentso.end() ); + std::vector<ObjectCalcer*> newparents; + for ( std::vector<ObjectCalcer::shared_ptr>::iterator i = d->newparents.begin(); + i != d->newparents.end(); ++i ) + newparents.push_back( i->get() ); + d->o->setParents( newparents ); + d->newparents = oldparents; + + for ( std::vector<ObjectCalcer*>::iterator i = newparents.begin(); i != newparents.end(); ++i ) ( *i )->calc( doc.document() ); d->o->calc( doc.document() ); std::set<ObjectCalcer*> alltqchildren = getAllChildren( d->o ); diff --git a/kig/kig/kig_commands.h b/kig/kig/kig_commands.h index e9df77c1..5bd3ae29 100644 --- a/kig/kig/kig_commands.h +++ b/kig/kig/kig_commands.h @@ -59,7 +59,7 @@ public: static KigCommand* addCommand( KigPart& doc, ObjectHolder* os ); /** * make sure that when you delete something, you are also deleting - * its tqparents. This class assumes you've done that. + * its parents. This class assumes you've done that. * \ref KigDocument::delObjects() takes care of this for you. */ static KigCommand* removeCommand( KigPart& doc, const std::vector<ObjectHolder*>& os ); @@ -124,7 +124,7 @@ protected: * this class monitors a set of DataObjects for changes and returns an * appropriate ChangeObjectImpsCommand if necessary.. * E.g. MovingMode wants to move certain objects, so it monitors all - * the tqparents of the explicitly moving objects: + * the parents of the explicitly moving objects: * \code * MonitorDataObjects mon( getAllParents( emo ) ); * \endcode @@ -181,7 +181,7 @@ class ChangeParentsAndTypeTask class Private; Private* d; public: - ChangeParentsAndTypeTask( ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newtqparents, + ChangeParentsAndTypeTask( ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newparents, const ObjectType* newtype ); ~ChangeParentsAndTypeTask(); diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 137d0096..f59559d1 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -165,7 +165,7 @@ bool KigPrintDialogPage::isValid( TQString& ) return true; } -KigPart::KigPart( TQWidget *tqparentWidget, const char *, +KigPart::KigPart( TQWidget *parentWidget, const char *, TQObject *tqparent, const char *name, const TQStringList& ) : KParts::ReadWritePart( tqparent, name ), @@ -177,7 +177,7 @@ KigPart::KigPart( TQWidget *tqparentWidget, const char *, mMode = new NormalMode( *this ); // we need a widget, to actually show the document - m_widget = new KigView(this, false, tqparentWidget, "kig_view"); + m_widget = new KigView(this, false, parentWidget, "kig_view"); // notify the part that this is our internal widget setWidget( m_widget ); diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h index 187f559e..677c9037 100644 --- a/kig/kig/kig_part.h +++ b/kig/kig/kig_part.h @@ -66,7 +66,7 @@ public: /** * Default constructor */ - KigPart( TQWidget* tqparentWidget, const char* widgetName, + KigPart( TQWidget* parentWidget, const char* widgetName, TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h index 4c167d7a..9d3ebab2 100644 --- a/kig/kig/kig_view.h +++ b/kig/kig/kig_view.h @@ -235,7 +235,7 @@ class KigView TQScrollBar* mbottomscroll; /** - * aptqparently, TQScrollBar also emits its signals when you update it + * apparently, TQScrollBar also emits its signals when you update it * manually, so we ignore them while we're in \ref updateScrollBars()... */ bool mupdatingscrollbars; diff --git a/kig/misc/argsparser.cpp b/kig/misc/argsparser.cpp index 9d722752..c2387970 100644 --- a/kig/misc/argsparser.cpp +++ b/kig/misc/argsparser.cpp @@ -152,15 +152,15 @@ ArgsParser ArgsParser::without( const ObjectImpType* type ) const return ArgsParser( ret ); } -ArgsParser::spec ArgsParser::findSpec( const ObjectImp* obj, const Args& tqparents ) const +ArgsParser::spec ArgsParser::findSpec( const ObjectImp* obj, const Args& parents ) const { spec ret; ret.type = 0; std::vector<bool> found( margs.size(), false ); - for ( Args::const_iterator o = tqparents.begin(); - o != tqparents.end(); ++o ) + for ( Args::const_iterator o = parents.begin(); + o != parents.end(); ++o ) { for ( uint i = 0; i < margs.size(); ++i ) { @@ -183,9 +183,9 @@ ArgsParser::spec ArgsParser::findSpec( const ObjectImp* obj, const Args& tqparen } const ObjectImpType* ArgsParser::impRequirement( - const ObjectImp* o, const Args& tqparents ) const + const ObjectImp* o, const Args& parents ) const { - spec s = findSpec( o, tqparents ); + spec s = findSpec( o, parents ); return s.type; } @@ -233,9 +233,9 @@ ArgsParser::~ArgsParser() { } -bool ArgsParser::isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const +bool ArgsParser::isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const { - spec s = findSpec( o, tqparents ); + spec s = findSpec( o, parents ); return s.onOrThrough; } diff --git a/kig/misc/argsparser.h b/kig/misc/argsparser.h index a3aff562..001d9359 100644 --- a/kig/misc/argsparser.h +++ b/kig/misc/argsparser.h @@ -26,7 +26,7 @@ class ObjectImpType; /** * This class is meant to take care of checking the types of the - * tqparents to ObjectCalcer's, and to put them in the correct order. + * parents to ObjectCalcer's, and to put them in the correct order. * An ObjectType should construct an ArgsParser with a specification * of the arguments it wants. This specification is given as an array * of ArgsParser::spec structs. This struct contains a pointer to an @@ -117,7 +117,7 @@ private: */ std::vector<spec> margs; - spec findSpec( const ObjectImp* o, const Args& tqparents ) const; + spec findSpec( const ObjectImp* o, const Args& parents ) const; public: ArgsParser( const struct spec* args, int n ); ArgsParser( const std::vector<spec>& args ); @@ -137,7 +137,7 @@ public: int check( const std::vector<ObjectCalcer*>& os ) const; /** * returns the usetext for the argument that o would be used for, - * if sel were used as tqparents.. + * if sel were used as parents.. * \p o should be in \p sel ... */ std::string usetext( const ObjectImp* o, const Args& sel ) const; @@ -155,16 +155,16 @@ public: /** * returns the minimal ObjectImp ID that \p o needs to inherit in order - * to be useful.. \p o should be part of \p tqparents . + * to be useful.. \p o should be part of \p parents . */ - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; /** - * Supposing that \p tqparents would be given as tqparents, this function + * Supposing that \p parents would be given as parents, this function * returns whether the returned ObjectImp will be, by construction, * on \p o ( if \p o is a curve ), or through \p o ( if \p o is a point ). */ - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; // Checks the args according to this args specification. If the // objects should never have occurred, then an assertion failure diff --git a/kig/misc/calcpaths.cc b/kig/misc/calcpaths.cc index 55787518..15dd9d98 100644 --- a/kig/misc/calcpaths.cc +++ b/kig/misc/calcpaths.cc @@ -124,7 +124,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os ) }; // now we know that if all objects appear at least once after all of - // their tqparents. So, we take all, and of every object, we remove + // their parents. So, we take all, and of every object, we remove // every reference except the last one... std::vector<ObjectCalcer*> ret; ret.reserve( os.size() ); @@ -182,9 +182,9 @@ static void addNonCache( ObjectCalcer* o, std::vector<ObjectCalcer*>& ret ) ret.push_back( o ); else { - std::vector<ObjectCalcer*> tqparents = o->tqparents(); - for ( uint i = 0; i < tqparents.size(); ++i ) - addNonCache( tqparents[i], ret ); + std::vector<ObjectCalcer*> parents = o->parents(); + for ( uint i = 0; i < parents.size(); ++i ) + addNonCache( parents[i], ret ); }; } @@ -196,13 +196,13 @@ static bool visit( const ObjectCalcer* o, const std::vector<ObjectCalcer*>& from // but their direct tqchildren do ), then we add them to ret. if ( std::find( from.begin(), from.end(), o ) != from.end() ) return true; - std::vector<bool> deps( o->tqparents().size(), false ); + std::vector<bool> deps( o->parents().size(), false ); bool somedepend = false; bool alldepend = true; - std::vector<ObjectCalcer*> tqparents = o->tqparents(); - for ( uint i = 0; i < tqparents.size(); ++i ) + std::vector<ObjectCalcer*> parents = o->parents(); + for ( uint i = 0; i < parents.size(); ++i ) { - bool v = visit( tqparents[i], from, ret ); + bool v = visit( parents[i], from, ret ); somedepend |= v; alldepend &= v; deps[i] = v; @@ -211,7 +211,7 @@ static bool visit( const ObjectCalcer* o, const std::vector<ObjectCalcer*>& from { for ( uint i = 0; i < deps.size(); ++i ) if ( ! deps[i] ) - addNonCache( tqparents[i], ret ); + addNonCache( parents[i], ret ); }; return somedepend; @@ -234,8 +234,8 @@ std::vector<ObjectCalcer*> getAllParents( const std::vector<ObjectCalcer*>& objs std::set<ObjectCalcer*> next; for ( std::set<ObjectCalcer*>::const_iterator i = cur.begin(); i != cur.end(); ++i ) { - std::vector<ObjectCalcer*> tqparents = (*i)->tqparents(); - next.insert( tqparents.begin(), tqparents.end() ); + std::vector<ObjectCalcer*> parents = (*i)->parents(); + next.insert( parents.begin(), parents.end() ); }; ret.insert( next.begin(), next.end() ); @@ -253,16 +253,16 @@ std::vector<ObjectCalcer*> getAllParents( ObjectCalcer* obj ) bool isChild( const ObjectCalcer* o, const std::vector<ObjectCalcer*>& os ) { - std::vector<ObjectCalcer*> tqparents = o->tqparents(); - std::set<ObjectCalcer*> cur( tqparents.begin(), tqparents.end() ); + std::vector<ObjectCalcer*> parents = o->parents(); + std::set<ObjectCalcer*> cur( parents.begin(), parents.end() ); while ( ! cur.empty() ) { std::set<ObjectCalcer*> next; for ( std::set<ObjectCalcer*>::const_iterator i = cur.begin(); i != cur.end(); ++i ) { if ( std::find( os.begin(), os.end(), *i ) != os.end() ) return true; - std::vector<ObjectCalcer*> tqparents = (*i)->tqparents(); - next.insert( tqparents.begin(), tqparents.end() ); + std::vector<ObjectCalcer*> parents = (*i)->parents(); + next.insert( parents.begin(), parents.end() ); }; cur = next; }; diff --git a/kig/misc/calcpaths.h b/kig/misc/calcpaths.h index 3abf19a6..f81ddc09 100644 --- a/kig/misc/calcpaths.h +++ b/kig/misc/calcpaths.h @@ -23,7 +23,7 @@ /** * This function sorts \p os such that they're in the right order for * calc()-ing. This means that child objects must appear after their - * tqparents ( for you graph people, this is just a topological sort.. ) + * parents ( for you graph people, this is just a topological sort.. ) */ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os ); diff --git a/kig/misc/cubic-common.cc b/kig/misc/cubic-common.cc index 6bdf3aca..029f1194 100644 --- a/kig/misc/cubic-common.cc +++ b/kig/misc/cubic-common.cc @@ -486,7 +486,7 @@ const CubicCartesianData calcCubicTransformation ( // assert (fabs(b[0][1][2] - b[1][2][0]) < 1e-8); // test a couple of cases // assert (fabs(b[0][1][1] - b[1][1][0]) < 1e-8); - // aptqparently, the above assertions are wrong ( due to rounding + // apparently, the above assertions are wrong ( due to rounding // errors, Maurizio and I hope :) ), so since the symmetry is not // present, we just take the sum of the parts of the matrix elements // that should be symmetric, instead of taking one of them, and diff --git a/kig/misc/object_constructor.cc b/kig/misc/object_constructor.cc index a5802d45..5522a598 100644 --- a/kig/misc/object_constructor.cc +++ b/kig/misc/object_constructor.cc @@ -124,12 +124,12 @@ SimpleObjectTypeConstructor::~SimpleObjectTypeConstructor() { } -void SimpleObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, +void SimpleObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { Args args; using namespace std; - transform( tqparents.begin(), tqparents.end(), + transform( parents.begin(), parents.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); @@ -178,12 +178,12 @@ MultiObjectTypeConstructor::~MultiObjectTypeConstructor() { } -void MultiObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, +void MultiObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { Args args; using namespace std; - transform( tqparents.begin(), tqparents.end(), + transform( parents.begin(), parents.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); for ( vector<int>::const_iterator i = mparams.begin(); i != mparams.end(); ++i ) @@ -551,26 +551,26 @@ PropertyObjectConstructor::~PropertyObjectConstructor() } void PropertyObjectConstructor::drawprelim( - const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, + const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& d ) const { - int index = tqparents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname ); + int index = parents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname ); assert ( index != -1 ); - ObjectImp* imp = tqparents[0]->imp()->property( index, d ); + ObjectImp* imp = parents[0]->imp()->property( index, d ); drawer.draw( *imp, p, true ); delete imp; } std::vector<ObjectHolder*> PropertyObjectConstructor::build( - const std::vector<ObjectCalcer*>& tqparents, KigDocument&, + const std::vector<ObjectCalcer*>& parents, KigDocument&, KigWidget& ) const { - int index = tqparents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname ); + int index = parents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname ); assert( index != -1 ); std::vector<ObjectHolder*> ret; ret.push_back( new ObjectHolder( - new ObjectPropertyCalcer( tqparents[0], index ) ) ); + new ObjectPropertyCalcer( parents[0], index ) ) ); return ret; } diff --git a/kig/misc/object_constructor.h b/kig/misc/object_constructor.h index 9233426f..9b03ece0 100644 --- a/kig/misc/object_constructor.h +++ b/kig/misc/object_constructor.h @@ -165,7 +165,7 @@ public: const KigDocument& d, const KigWidget& v ) const; - virtual void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, + virtual void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const = 0; TQString useText( const ObjectCalcer& o, const std::vector<ObjectCalcer*>& sel, @@ -196,7 +196,7 @@ public: ~SimpleObjectTypeConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, @@ -225,7 +225,7 @@ public: ~PropertyObjectConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, @@ -265,7 +265,7 @@ public: int a, int b, int c = -999, int d = -999 ); ~MultiObjectTypeConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc index 7a977e63..264f7e8c 100644 --- a/kig/misc/object_hierarchy.cc +++ b/kig/misc/object_hierarchy.cc @@ -47,14 +47,14 @@ public: // on the given objects. The dependsstack contains a set of // booleans telling which parts of the hierarchy certainly depend on // the given objects. In this function, the node should check - // whether any of its tqparents have true set, and if so, set its own + // whether any of its parents have true set, and if so, set its own // value to true. virtual void checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const = 0; // this function is used to check whether the given objects are all // used by one or more of the final objects. The usedstack tqcontains // a set of booleans telling which parts of the hierarchy are // certainly ancestors of the final objects. In this function, the - // node should set all of its tqparents' booleans to true. + // node should set all of its parents' booleans to true. virtual void checkArgumentsUsed( std::vector<bool>& usedstack ) const = 0; }; @@ -118,15 +118,15 @@ class ApplyTypeNode : public ObjectHierarchy::Node { const ObjectType* mtype; - std::vector<int> mtqparents; + std::vector<int> mparents; public: - ApplyTypeNode( const ObjectType* type, const std::vector<int>& tqparents ) - : mtype( type ), mtqparents( tqparents ) {} + ApplyTypeNode( const ObjectType* type, const std::vector<int>& parents ) + : mtype( type ), mparents( parents ) {} ~ApplyTypeNode(); Node* copy() const; const ObjectType* type() const { return mtype; } - const std::vector<int>& tqparents() const { return mtqparents; } + const std::vector<int>& parents() const { return mparents; } int id() const; void apply( std::vector<const ObjectImp*>& stack, @@ -141,17 +141,17 @@ int ApplyTypeNode::id() const { return ID_ApplyType; } void ApplyTypeNode::checkArgumentsUsed( std::vector<bool>& usedstack ) const { - for ( uint i = 0; i < mtqparents.size(); ++i ) + for ( uint i = 0; i < mparents.size(); ++i ) { - usedstack[mtqparents[i]] = true; + usedstack[mparents[i]] = true; } } void ApplyTypeNode::checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const { bool result = false; - for ( uint i = 0; i < mtqparents.size(); ++i ) - if ( dependsstack[mtqparents[i]] == true ) result = true; + for ( uint i = 0; i < mparents.size(); ++i ) + if ( dependsstack[mparents[i]] == true ) result = true; dependsstack[loc] = result; } @@ -161,23 +161,23 @@ ApplyTypeNode::~ApplyTypeNode() ObjectHierarchy::Node* ApplyTypeNode::copy() const { - return new ApplyTypeNode( mtype, mtqparents ); + return new ApplyTypeNode( mtype, mparents ); } void ApplyTypeNode::apply( std::vector<ObjectCalcer*>& stack, int loc ) const { - std::vector<ObjectCalcer*> tqparents; - for ( uint i = 0; i < mtqparents.size(); ++i ) - tqparents.push_back( stack[ mtqparents[i] ] ); - stack[loc] = new ObjectTypeCalcer( mtype, tqparents ); + std::vector<ObjectCalcer*> parents; + for ( uint i = 0; i < mparents.size(); ++i ) + parents.push_back( stack[ mparents[i] ] ); + stack[loc] = new ObjectTypeCalcer( mtype, parents ); } void ApplyTypeNode::apply( std::vector<const ObjectImp*>& stack, int loc, const KigDocument& doc ) const { Args args; - for ( uint i = 0; i < mtqparents.size(); ++i ) - args.push_back( stack[mtqparents[i]] ); + for ( uint i = 0; i < mparents.size(); ++i ) + args.push_back( stack[mparents[i]] ); args = mtype->sortArgs( args ); stack[loc] = mtype->calc( args, doc ); } @@ -297,23 +297,23 @@ int ObjectHierarchy::visit( const ObjectCalcer* o, std::map<const ObjectCalcer*, // because that's where we expect it.. We therefore copy it // there using CopyObjectType.. int ret = mnumberofargs + mnodes.size(); - std::vector<int> tqparents; - tqparents.push_back( smi->second ); - mnodes.push_back( new ApplyTypeNode( CopyObjectType::instance(), tqparents ) ); + std::vector<int> parents; + parents.push_back( smi->second ); + mnodes.push_back( new ApplyTypeNode( CopyObjectType::instance(), parents ) ); return ret; } else return smi->second; } - std::vector<ObjectCalcer*> p( o->tqparents() ); + std::vector<ObjectCalcer*> p( o->parents() ); // we check if o descends from the given objects.. bool descendsfromgiven = false; - std::vector<int> tqparents; - tqparents.resize( p.size(), -1 ); + std::vector<int> parents; + parents.resize( p.size(), -1 ); for ( uint i = 0; i < p.size(); ++i ) { int v = visit( p[i], seenmap, false ); - tqparents[i] = v; + parents[i] = v; descendsfromgiven |= (v != -1); }; @@ -335,7 +335,7 @@ int ObjectHierarchy::visit( const ObjectCalcer* o, std::map<const ObjectCalcer*, return -1; }; - return storeObject( o, p, tqparents, seenmap ); + return storeObject( o, p, parents, seenmap ); } ObjectHierarchy::~ObjectHierarchy() @@ -385,9 +385,9 @@ void ObjectHierarchy::init( const std::vector<ObjectCalcer*>& from, const std::v seenmap[from[i]] = i; for ( std::vector<ObjectCalcer*>::const_iterator i = to.begin(); i != to.end(); ++i ) { - std::vector<ObjectCalcer*> tqparents = (*i)->tqparents(); - for ( std::vector<ObjectCalcer*>::const_iterator j = tqparents.begin(); - j != tqparents.end(); ++j ) + std::vector<ObjectCalcer*> parents = (*i)->parents(); + for ( std::vector<ObjectCalcer*>::const_iterator j = parents.begin(); + j != parents.end(); ++j ) visit( *j, seenmap, true ); } for ( std::vector<ObjectCalcer*>::const_iterator i = to.begin(); i != to.end(); ++i ) @@ -438,9 +438,9 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co const ApplyTypeNode* node = static_cast<const ApplyTypeNode*>( mnodes[i] ); e.setAttribute( "action", "calc" ); e.setAttribute( "type", TQString::tqfromLatin1( node->type()->fullName() ) ); - for ( uint i = 0; i < node->tqparents().size(); ++i ) + for ( uint i = 0; i < node->parents().size(); ++i ) { - int tqparent = node->tqparents()[i] + 1; + int tqparent = node->parents()[i] + 1; TQDomElement arge = doc.createElement( "arg" ); arge.appendChild( doc.createTextNode( TQString::number( tqparent ) ) ); e.appendChild( arge ); @@ -548,7 +548,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& return 0; } - std::vector<int> tqparents; + std::vector<int> parents; for ( TQDomNode p = e.firstChild(); !p.isNull(); p = p.nextSibling() ) { TQDomElement q = p.toElement(); @@ -556,9 +556,9 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& if ( q.tagName() != "arg" ) KIG_GENERIC_PARSE_ERROR; int pid = q.text().toInt(&ok ); if ( !ok ) KIG_GENERIC_PARSE_ERROR; - tqparents.push_back( pid - 1 ); + parents.push_back( pid - 1 ); }; - newnode = new ApplyTypeNode( type, tqparents ); + newnode = new ApplyTypeNode( type, parents ); } else if ( tmp == "fetch-property" ) { @@ -640,11 +640,11 @@ ObjectHierarchy ObjectHierarchy::transformFinalObject( const Transformation& t ) ObjectHierarchy ret( *this ); ret.mnodes.push_back( new PushStackNode( new TransformationImp( t ) ) ); - std::vector<int> tqparents; - tqparents.push_back( ret.mnodes.size() - 1); - tqparents.push_back( ret.mnodes.size() ); + std::vector<int> parents; + parents.push_back( ret.mnodes.size() - 1); + parents.push_back( ret.mnodes.size() ); const ObjectType* type = ApplyTransformationObjectType::instance(); - ret.mnodes.push_back( new ApplyTypeNode( type, tqparents ) ); + ret.mnodes.push_back( new ApplyTypeNode( type, parents ) ); return ret; } @@ -696,7 +696,7 @@ const ObjectImpType* lowermost( const ObjectImpType* a, const ObjectImpType* b ) // this function is part of the visit procedure really. It is // factored out, because it recurses for cache ObjectImp's. What this // does is, it makes sure that object o is calcable, by putting -// appropriate Node's in mnodes.. po is o->tqparents() and pl tqcontains +// appropriate Node's in mnodes.. po is o->parents() and pl tqcontains // the location of objects that are already in mnodes and -1 // otherwise.. -1 means we have to store their ObjectImp, unless // they're cache ObjectImp's etc. @@ -723,8 +723,8 @@ int ObjectHierarchy::storeObject( const ObjectCalcer* o, const std::vector<Objec } else if ( (uint) pl[i] < mnumberofargs ) { - ObjectCalcer* tqparent = o->tqparents()[i]; - std::vector<ObjectCalcer*> opl = o->tqparents(); + ObjectCalcer* tqparent = o->parents()[i]; + std::vector<ObjectCalcer*> opl = o->parents(); margrequirements[pl[i]] = lowermost( margrequirements[pl[i]], diff --git a/kig/misc/object_hierarchy.h b/kig/misc/object_hierarchy.h index cda2615f..35e7cbef 100644 --- a/kig/misc/object_hierarchy.h +++ b/kig/misc/object_hierarchy.h @@ -88,7 +88,7 @@ public: * build a set of objects that interdepend according to this * ObjectHierarchy.. Only the result objects are returned. Helper * objects that connect the given objects with the returned objects, - * can only be found by following the returned objects' tqparents() + * can only be found by following the returned objects' parents() * methods.. */ std::vector<ObjectCalcer*> buildObjects( const std::vector<ObjectCalcer*>& os, const KigDocument& ) const; diff --git a/kig/misc/special_constructors.cc b/kig/misc/special_constructors.cc index ccb92ac6..0806f09b 100644 --- a/kig/misc/special_constructors.cc +++ b/kig/misc/special_constructors.cc @@ -68,7 +68,7 @@ public: ConicConicIntersectionConstructor(); ~ConicConicIntersectionConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); @@ -109,13 +109,13 @@ ConicRadicalConstructor::~ConicRadicalConstructor() } void ConicRadicalConstructor::drawprelim( - const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, const KigDocument& doc ) const + const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { - if ( tqparents.size() == 2 && tqparents[0]->imp()->inherits( ConicImp::stype() ) && - tqparents[1]->imp()->inherits( ConicImp::stype() ) ) + if ( parents.size() == 2 && parents[0]->imp()->inherits( ConicImp::stype() ) && + parents[1]->imp()->inherits( ConicImp::stype() ) ) { Args args; - std::transform( tqparents.begin(), tqparents.end(), + std::transform( parents.begin(), parents.end(), std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); for ( int i = -1; i < 2; i += 2 ) { @@ -170,27 +170,27 @@ LocusConstructor::~LocusConstructor() { } -void LocusConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, +void LocusConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const { // this function is rather ugly, but it is necessary to do it this // way in order to play nice with Kig's design.. - if ( tqparents.size() != 2 ) return; - const ObjectTypeCalcer* constrained = dynamic_cast<ObjectTypeCalcer*>( tqparents.front() ); - const ObjectCalcer* moving = tqparents.back(); + if ( parents.size() != 2 ) return; + const ObjectTypeCalcer* constrained = dynamic_cast<ObjectTypeCalcer*>( parents.front() ); + const ObjectCalcer* moving = parents.back(); if ( ! constrained || ! constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ) { // moving is in fact the constrained point.. swap them.. - moving = tqparents.front(); - constrained = dynamic_cast<const ObjectTypeCalcer*>( tqparents.back() ); + moving = parents.front(); + constrained = dynamic_cast<const ObjectTypeCalcer*>( parents.back() ); assert( constrained ); }; assert( constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ); - const ObjectImp* oimp = constrained->tqparents().back()->imp(); + const ObjectImp* oimp = constrained->parents().back()->imp(); if( !oimp->inherits( CurveImp::stype() ) ) - oimp = constrained->tqparents().front()->imp(); + oimp = constrained->parents().front()->imp(); assert( oimp->inherits( CurveImp::stype() ) ); const CurveImp* cimp = static_cast<const CurveImp*>( oimp ); @@ -222,18 +222,18 @@ const int LocusConstructor::wantArgs( return ArgsParser::Invalid; } -std::vector<ObjectHolder*> LocusConstructor::build( const std::vector<ObjectCalcer*>& tqparents, KigDocument&, KigWidget& ) const +std::vector<ObjectHolder*> LocusConstructor::build( const std::vector<ObjectCalcer*>& parents, KigDocument&, KigWidget& ) const { std::vector<ObjectHolder*> ret; - assert( tqparents.size() == 2 ); + assert( parents.size() == 2 ); - ObjectTypeCalcer* constrained = dynamic_cast<ObjectTypeCalcer*>( tqparents.front() ); - ObjectCalcer* moving = tqparents.back(); + ObjectTypeCalcer* constrained = dynamic_cast<ObjectTypeCalcer*>( parents.front() ); + ObjectCalcer* moving = parents.back(); if ( ! constrained || ! constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ) { // moving is in fact the constrained point.. swap them.. - moving = tqparents.front(); - constrained = dynamic_cast<ObjectTypeCalcer*>( tqparents.back() ); + moving = parents.front(); + constrained = dynamic_cast<ObjectTypeCalcer*>( parents.back() ); assert( constrained ); }; assert( constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ); @@ -374,21 +374,21 @@ TQString PolygonBNPTypeConstructor::selectStatement( return i18n("Select a point to be a vertex of the new polygon..."); } -void PolygonBNPTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, +void PolygonBNPTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const { - if ( tqparents.size() < 2 ) return; + if ( parents.size() < 2 ) return; std::vector<Coordinate> points; - for ( uint i = 0; i < tqparents.size(); ++i ) + for ( uint i = 0; i < parents.size(); ++i ) { const Coordinate vertex = - static_cast<const PointImp*>( tqparents[i]->imp() )->coordinate(); + static_cast<const PointImp*>( parents[i]->imp() )->coordinate(); points.push_back( vertex ); } - if ( tqparents.size() == 2 ) + if ( parents.size() == 2 ) { SegmentImp segment = SegmentImp( points[0], points[1] ); drawer.draw( segment, p, true ); @@ -398,12 +398,12 @@ void PolygonBNPTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPaint } } -std::vector<ObjectHolder*> PolygonBNPTypeConstructor::build( const std::vector<ObjectCalcer*>& tqparents, KigDocument&, KigWidget& ) const +std::vector<ObjectHolder*> PolygonBNPTypeConstructor::build( const std::vector<ObjectCalcer*>& parents, KigDocument&, KigWidget& ) const { - uint count = tqparents.size() - 1; + uint count = parents.size() - 1; assert ( count >= 3 ); std::vector<ObjectCalcer*> args; - for ( uint i = 0; i < count; ++i ) args.push_back( tqparents[i] ); + for ( uint i = 0; i < count; ++i ) args.push_back( parents[i] ); ObjectTypeCalcer* calcer = new ObjectTypeCalcer( mtype, args ); ObjectHolder* h = new ObjectHolder( calcer ); std::vector<ObjectHolder*> ret; @@ -443,12 +443,12 @@ PolygonVertexTypeConstructor::~PolygonVertexTypeConstructor() { } -void PolygonVertexTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, +void PolygonVertexTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const { - if ( tqparents.size() != 1 ) return; + if ( parents.size() != 1 ) return; - const PolygonImp* polygon = dynamic_cast<const PolygonImp*>( tqparents.front()->imp() ); + const PolygonImp* polygon = dynamic_cast<const PolygonImp*>( parents.front()->imp() ); const std::vector<Coordinate> points = polygon->points(); int sides = points.size(); @@ -459,11 +459,11 @@ void PolygonVertexTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPa } } -std::vector<ObjectHolder*> PolygonVertexTypeConstructor::build( const std::vector<ObjectCalcer*>& tqparents, KigDocument&, KigWidget& ) const +std::vector<ObjectHolder*> PolygonVertexTypeConstructor::build( const std::vector<ObjectCalcer*>& parents, KigDocument&, KigWidget& ) const { std::vector<ObjectHolder*> ret; - assert( tqparents.size() == 1 ); - const PolygonImp* polygon = dynamic_cast<const PolygonImp*>( tqparents.front()->imp() ); + assert( parents.size() == 1 ); + const PolygonImp* polygon = dynamic_cast<const PolygonImp*>( parents.front()->imp() ); const std::vector<Coordinate> points = polygon->points(); int sides = points.size(); @@ -471,7 +471,7 @@ std::vector<ObjectHolder*> PolygonVertexTypeConstructor::build( const std::vecto for ( int i = 0; i < sides; ++i ) { ObjectConstCalcer* d = new ObjectConstCalcer( new IntImp( i ) ); - std::vector<ObjectCalcer*> args( tqparents ); + std::vector<ObjectCalcer*> args( parents ); args.push_back( d ); ret.push_back( new ObjectHolder( new ObjectTypeCalcer( mtype, args ) ) ); } @@ -510,12 +510,12 @@ PolygonSideTypeConstructor::~PolygonSideTypeConstructor() { } -void PolygonSideTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, +void PolygonSideTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const { - if ( tqparents.size() != 1 ) return; + if ( parents.size() != 1 ) return; - const PolygonImp* polygon = dynamic_cast<const PolygonImp*>( tqparents.front()->imp() ); + const PolygonImp* polygon = dynamic_cast<const PolygonImp*>( parents.front()->imp() ); const std::vector<Coordinate> points = polygon->points(); uint sides = points.size(); @@ -527,11 +527,11 @@ void PolygonSideTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPain } } -std::vector<ObjectHolder*> PolygonSideTypeConstructor::build( const std::vector<ObjectCalcer*>& tqparents, KigDocument&, KigWidget& ) const +std::vector<ObjectHolder*> PolygonSideTypeConstructor::build( const std::vector<ObjectCalcer*>& parents, KigDocument&, KigWidget& ) const { std::vector<ObjectHolder*> ret; - assert( tqparents.size() == 1 ); - const PolygonImp* polygon = dynamic_cast<const PolygonImp*>( tqparents.front()->imp() ); + assert( parents.size() == 1 ); + const PolygonImp* polygon = dynamic_cast<const PolygonImp*>( parents.front()->imp() ); const std::vector<Coordinate> points = polygon->points(); uint sides = points.size(); @@ -539,7 +539,7 @@ std::vector<ObjectHolder*> PolygonSideTypeConstructor::build( const std::vector< for ( uint i = 0; i < sides; ++i ) { ObjectConstCalcer* d = new ObjectConstCalcer( new IntImp( i ) ); - std::vector<ObjectCalcer*> args( tqparents ); + std::vector<ObjectCalcer*> args( parents ); args.push_back( d ); ret.push_back( new ObjectHolder( new ObjectTypeCalcer( mtype, args ) ) ); } @@ -700,17 +700,17 @@ void PolygonBCVConstructor::handlePrelim( delete_all( args.begin() + 2, args.end() ); } -std::vector<ObjectHolder*> PolygonBCVConstructor::build( const std::vector<ObjectCalcer*>& tqparents, KigDocument&, KigWidget& ) const +std::vector<ObjectHolder*> PolygonBCVConstructor::build( const std::vector<ObjectCalcer*>& parents, KigDocument&, KigWidget& ) const { - assert ( tqparents.size() == 3 ); + assert ( parents.size() == 3 ); std::vector<ObjectCalcer*> args; - Coordinate c = static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); - Coordinate v = static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate(); - Coordinate cntrl = static_cast<const PointImp*>( tqparents[2]->imp() )->coordinate(); + Coordinate c = static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); + Coordinate v = static_cast<const PointImp*>( parents[1]->imp() )->coordinate(); + Coordinate cntrl = static_cast<const PointImp*>( parents[2]->imp() )->coordinate(); - args.push_back( tqparents[0] ); - args.push_back( tqparents[1] ); + args.push_back( parents[0] ); + args.push_back( parents[1] ); int winding = 0; int nsides = computeNsides( c, v, cntrl, winding ); ObjectConstCalcer* d = new ObjectConstCalcer( new IntImp( nsides ) ); @@ -789,20 +789,20 @@ TQString PolygonBCVConstructor::selectStatement( return ""; } -void PolygonBCVConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, +void PolygonBCVConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { - if ( tqparents.size() < 3 || tqparents.size() > 4 ) return; + if ( parents.size() < 3 || parents.size() > 4 ) return; - assert ( tqparents[0]->imp()->inherits( PointImp::stype() ) && - tqparents[1]->imp()->inherits( PointImp::stype() ) && - tqparents[2]->imp()->inherits( IntImp::stype() ) ); + assert ( parents[0]->imp()->inherits( PointImp::stype() ) && + parents[1]->imp()->inherits( PointImp::stype() ) && + parents[2]->imp()->inherits( IntImp::stype() ) ); - if ( tqparents.size() == 4 ) - assert ( tqparents[3]->imp()->inherits( IntImp::stype() ) ); + if ( parents.size() == 4 ) + assert ( parents[3]->imp()->inherits( IntImp::stype() ) ); Args args; - std::transform( tqparents.begin(), tqparents.end(), + std::transform( parents.begin(), parents.end(), std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); @@ -878,16 +878,16 @@ ConicConicIntersectionConstructor::~ConicConicIntersectionConstructor() { } -void ConicConicIntersectionConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, +void ConicConicIntersectionConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const { - if ( tqparents.size() != 2 ) return; - assert ( tqparents[0]->imp()->inherits( ConicImp::stype() ) && - tqparents[1]->imp()->inherits( ConicImp::stype() ) ); + if ( parents.size() != 2 ) return; + assert ( parents[0]->imp()->inherits( ConicImp::stype() ) && + parents[1]->imp()->inherits( ConicImp::stype() ) ); const ConicCartesianData conica = - static_cast<const ConicImp*>( tqparents[0]->imp() )->cartesianData(); + static_cast<const ConicImp*>( parents[0]->imp() )->cartesianData(); const ConicCartesianData conicb = - static_cast<const ConicImp*>( tqparents[1]->imp() )->cartesianData(); + static_cast<const ConicImp*>( parents[1]->imp() )->cartesianData(); bool ok = true; for ( int wr = -1; wr < 2; wr += 2 ) { @@ -1190,12 +1190,12 @@ void MeasureTransportConstructor::handlePrelim( void MeasureTransportConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& p, - const std::vector<ObjectCalcer*>& tqparents, + const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { Args args; using namespace std; - transform( tqparents.begin(), tqparents.end(), + transform( parents.begin(), parents.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); @@ -1236,13 +1236,13 @@ TQString MeasureTransportConstructor::selectStatement( } std::vector<ObjectHolder*> MeasureTransportConstructor::build( - const std::vector<ObjectCalcer*>& tqparents, + const std::vector<ObjectCalcer*>& parents, KigDocument&, KigWidget& ) const { - assert ( tqparents.size() == 3 ); + assert ( parents.size() == 3 ); // std::vector<ObjectCalcer*> args; -// for ( uint i = 0; i < count; ++i ) args.push_back( tqparents[i] ); - ObjectTypeCalcer* calcer = new ObjectTypeCalcer( mtype, tqparents ); +// for ( uint i = 0; i < count; ++i ) args.push_back( parents[i] ); + ObjectTypeCalcer* calcer = new ObjectTypeCalcer( mtype, parents ); ObjectHolder* h = new ObjectHolder( calcer ); std::vector<ObjectHolder*> ret; ret.push_back( h ); @@ -1386,15 +1386,15 @@ MidPointOfTwoPointsConstructor::~MidPointOfTwoPointsConstructor() } void MidPointOfTwoPointsConstructor::drawprelim( - const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, + const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const { - if ( tqparents.size() != 2 ) return; - assert( tqparents[0]->imp()->inherits( PointImp::stype() ) ); - assert( tqparents[1]->imp()->inherits( PointImp::stype() ) ); + if ( parents.size() != 2 ) return; + assert( parents[0]->imp()->inherits( PointImp::stype() ) ); + assert( parents[1]->imp()->inherits( PointImp::stype() ) ); const Coordinate m = - ( static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate() + - static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate() ) / 2; + ( static_cast<const PointImp*>( parents[0]->imp() )->coordinate() + + static_cast<const PointImp*>( parents[1]->imp() )->coordinate() ) / 2; drawer.draw( PointImp( m ), p, true ); } diff --git a/kig/misc/special_constructors.h b/kig/misc/special_constructors.h index 796c8cd0..5b80693c 100644 --- a/kig/misc/special_constructors.h +++ b/kig/misc/special_constructors.h @@ -29,7 +29,7 @@ public: PolygonVertexTypeConstructor(); ~PolygonVertexTypeConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -44,7 +44,7 @@ public: PolygonSideTypeConstructor(); ~PolygonSideTypeConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -83,7 +83,7 @@ public: const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -121,7 +121,7 @@ public: const KigDocument& d, const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -163,7 +163,7 @@ public: const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); bool isTransform() const; @@ -179,7 +179,7 @@ public: ~ConicRadicalConstructor(); TQString useText( const ObjectCalcer& o, const std::vector<ObjectCalcer*>& sel, const KigDocument& d, const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); @@ -205,7 +205,7 @@ public: TQString useText( const ObjectCalcer& o, const std::vector<ObjectCalcer*>& sel, const KigDocument& d, const KigWidget& v ) const; - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, const KigDocument& ) const; + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; void plug( KigPart* doc, KigGUIAction* kact ); @@ -259,7 +259,7 @@ class MidPointOfTwoPointsConstructor public: MidPointOfTwoPointsConstructor(); ~MidPointOfTwoPointsConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; @@ -275,7 +275,7 @@ public: TestConstructor( const ArgsParserObjectType* type, const char* descname, const char* desc, const char* iconfile ); ~TestConstructor(); - void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& tqparents, + void drawprelim( const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents, const KigDocument& ) const; std::vector<ObjectHolder*> build( const std::vector<ObjectCalcer*>& os, KigDocument& d, KigWidget& w ) const; diff --git a/kig/modes/base_mode.cc b/kig/modes/base_mode.cc index e470f938..b4f33b21 100644 --- a/kig/modes/base_mode.cc +++ b/kig/modes/base_mode.cc @@ -38,7 +38,7 @@ BaseMode::~BaseMode() void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) { // touch screens don't send a mouseMoved event before a click event, - // aptqparently, so we simulate it. + // apparently, so we simulate it. mouseMoved( e, v ); // get rid of text still showing... diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc index 67f83632..d4702314 100644 --- a/kig/modes/construct_mode.cc +++ b/kig/modes/construct_mode.cc @@ -76,13 +76,13 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v ) if ( !tqmoco.empty() ) { std::vector<ObjectHolder*>::const_iterator it; - std::vector<ObjectCalcer*> testargs = getCalcers( mtqparents ); + std::vector<ObjectCalcer*> testargs = getCalcers( mparents ); for ( std::vector<ObjectHolder*>::const_iterator i = tqmoco.begin(); i != tqmoco.end(); ++i ) { - it = std::find( mtqparents.begin(), mtqparents.end(), *i ); + it = std::find( mparents.begin(), mparents.end(), *i ); bool newdup = - ( it == mtqparents.end() ) || - isAlreadySelectedOK( testargs, it - mtqparents.begin() ); + ( it == mparents.end() ) || + isAlreadySelectedOK( testargs, it - mparents.begin() ); if ( newdup ) { testargs.push_back( ( *i )->calcer() ); @@ -103,16 +103,16 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v ) void BaseConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p, KigWidget& w, bool ) { - std::vector<ObjectHolder*>::iterator it = std::find( mtqparents.begin(), mtqparents.end(), o ); - std::vector<ObjectCalcer*> nargs = getCalcers( mtqparents ); + std::vector<ObjectHolder*>::iterator it = std::find( mparents.begin(), mparents.end(), o ); + std::vector<ObjectCalcer*> nargs = getCalcers( mparents ); // // mp: duplicationchecked controls whether the arguments list is // free of duplications or if a duplication is safe (asking this to // the Constructor class through the "isAlreadySelectedOK" method). // bool duplicationchecked = - ( it == mtqparents.end() ) || - isAlreadySelectedOK( nargs, it - mtqparents.begin() ); + ( it == mparents.end() ) || + isAlreadySelectedOK( nargs, it - mparents.begin() ); if ( o && duplicationchecked ) { nargs.push_back( o->calcer() ); @@ -123,7 +123,7 @@ void BaseConstructMode::leftClickedObject( } } - nargs = getCalcers( mtqparents ); + nargs = getCalcers( mparents ); nargs.push_back( mpt.get() ); if ( wantArgs( nargs, mdoc.document(), w ) ) { @@ -137,7 +137,7 @@ void BaseConstructMode::leftClickedObject( return; } - nargs = getCalcers( mtqparents ); + nargs = getCalcers( mparents ); nargs.push_back( mcursor ); if ( wantArgs( nargs, mdoc.document(), w ) ) @@ -157,7 +157,7 @@ void BaseConstructMode::leftClickedObject( void BaseConstructMode::midClicked( const TQPoint& p, KigWidget& w ) { - std::vector<ObjectCalcer*> args = getCalcers( mtqparents ); + std::vector<ObjectCalcer*> args = getCalcers( mparents ); args.push_back( mpt.get() ); if ( wantArgs( args, mdoc.document(), w ) ) { @@ -179,7 +179,7 @@ void BaseConstructMode::rightClicked( const std::vector<ObjectHolder*>&, const T void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const TQPoint& p, KigWidget& w, bool shiftpressed ) { - mdoc.emitStatusBarText( selectStatement( getCalcers( mtqparents ), w ) ); + mdoc.emitStatusBarText( selectStatement( getCalcers( mparents ), w ) ); w.updateCurPix(); KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); @@ -192,19 +192,19 @@ void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const mcursor->move( ncoord, mdoc.document() ); mcursor->calc( mdoc.document() ); - std::vector<ObjectCalcer*> args = getCalcers( mtqparents ); + std::vector<ObjectCalcer*> args = getCalcers( mparents ); bool duplicationchecked = false; std::vector<ObjectHolder*> goodargs; if ( ! os.empty() ) { std::vector<ObjectHolder*>::const_iterator it; - std::vector<ObjectCalcer*> testargs = getCalcers( mtqparents ); + std::vector<ObjectCalcer*> testargs = getCalcers( mparents ); for ( std::vector<ObjectHolder*>::const_iterator i = os.begin(); i != os.end(); ++i ) { - it = std::find( mtqparents.begin(), mtqparents.end(), *i ); + it = std::find( mparents.begin(), mparents.end(), *i ); bool newdup = - ( it == mtqparents.end() ) || - isAlreadySelectedOK( args, it - mtqparents.begin() ); + ( it == mparents.end() ) || + isAlreadySelectedOK( args, it - mparents.begin() ); if ( newdup ) { testargs.push_back( ( *i )->calcer() ); @@ -229,9 +229,9 @@ void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const } else { - std::vector<ObjectCalcer*> args = getCalcers( mtqparents ); + std::vector<ObjectCalcer*> args = getCalcers( mparents ); args.push_back( mpt.get() ); - std::vector<ObjectCalcer*> argscursor = getCalcers( mtqparents ); + std::vector<ObjectCalcer*> argscursor = getCalcers( mparents ); argscursor.push_back( mcursor ); bool text = true; if ( wantArgs( args, mdoc.document(), w ) ) @@ -274,15 +274,15 @@ void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const void BaseConstructMode::selectObject( ObjectHolder* o, KigWidget& w ) { - mtqparents.push_back( o ); - std::vector<ObjectCalcer*> args = getCalcers( mtqparents ); + mparents.push_back( o ); + std::vector<ObjectCalcer*> args = getCalcers( mparents ); if ( wantArgs( args, mdoc.document(), w ) == ArgsParser::Complete ) { handleArgs( args, w ); }; - w.redrawScreen( mtqparents ); + w.redrawScreen( mparents ); } PointConstructMode::PointConstructMode( KigPart& d ) @@ -373,7 +373,7 @@ void BaseConstructMode::selectObjects( const std::vector<ObjectHolder*>& os, Kig { for ( std::vector<ObjectHolder*>::const_iterator i = os.begin(); i != os.end(); ++i ) { - std::vector<ObjectCalcer*> args = getCalcers( mtqparents ); + std::vector<ObjectCalcer*> args = getCalcers( mparents ); assert( wantArgs( args, mdoc.document(), w ) != ArgsParser::Complete ); selectObject( *i, w ); }; @@ -482,17 +482,17 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p, TQPoint qloc = p + TQPoint( -40, 0 ); Coordinate loc = w.fromScreen( qloc ); - std::vector<ObjectCalcer*> tqparents; - tqparents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) ); - tqparents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) ); - tqparents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) ); + std::vector<ObjectCalcer*> parents; + parents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) ); + parents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) ); + parents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) ); assert( mresult->imp()->inherits( TestResultImp::stype() ) ); - tqparents.push_back( + parents.push_back( new ObjectPropertyCalcer( mresult.get(), mresult->imp()->propertiesInternalNames().tqfindIndex( "test-result" ) ) ); - tqparents.back()->calc( mdoc.document() ); + parents.back()->calc( mdoc.document() ); - ObjectCalcer* ret = new ObjectTypeCalcer( TextType::instance(), tqparents ); + ObjectCalcer* ret = new ObjectTypeCalcer( TextType::instance(), parents ); ret->calc( mdoc.document() ); mdoc.addObject( new ObjectHolder( ret ) ); diff --git a/kig/modes/construct_mode.h b/kig/modes/construct_mode.h index 67fe5e28..be937723 100644 --- a/kig/modes/construct_mode.h +++ b/kig/modes/construct_mode.h @@ -71,7 +71,7 @@ class BaseConstructMode // only sensible place where to deallocate it is in the destructor // of this class // ObjectHolder* mcursorholder; - std::vector<ObjectHolder*> mtqparents; + std::vector<ObjectHolder*> mparents; void leftReleased( TQMouseEvent* e, KigWidget* v ); diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui index cdcdded6..e69d9f13 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -275,7 +275,7 @@ <slot>okSlot()</slot> <slot>cancelSlot()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kig/modes/label.cc b/kig/modes/label.cc index 3471d6dc..298e75d0 100644 --- a/kig/modes/label.cc +++ b/kig/modes/label.cc @@ -64,7 +64,7 @@ public: // the property objects we'll be using as args, we keep a reference // to them in the args object, and keep a pointer to them ( or 0 ) // in the correct order in args ( separately, because we can't use - // the order of the tqparents of a ReferenceObject, and certainly + // the order of the parents of a ReferenceObject, and certainly // can't give 0 as a tqparent.. argvect args; @@ -391,7 +391,7 @@ void TextLabelModeBase::updateLinksLabel() d->wiz->myCustomWidget1->addText( s.mid( prevpos ), buf ); d->wiz->myCustomWidget1->applyEdit( buf ); - d->wiz->retqlayoutArgsPage(); + d->wiz->relayoutArgsPage(); d->wiz->resize( d->wiz->size() ); } @@ -471,10 +471,10 @@ TextLabelRedefineMode::TextLabelRedefineMode( KigPart& d, ObjectTypeCalcer* labe : TextLabelModeBase( d ), mlabel( label ) { assert( label->imp()->inherits( TextImp::stype() ) ); - std::vector<ObjectCalcer*> tqparents = label->tqparents(); - assert( tqparents.size() >= 3 ); - std::vector<ObjectCalcer*> firstthree( tqparents.begin(), tqparents.begin() + 3 ); - std::vector<ObjectCalcer*> rest( tqparents.begin() + 3, tqparents.end() ); + std::vector<ObjectCalcer*> parents = label->parents(); + assert( parents.size() >= 3 ); + std::vector<ObjectCalcer*> firstthree( parents.begin(), parents.begin() + 3 ); + std::vector<ObjectCalcer*> rest( parents.begin() + 3, parents.end() ); firstthree = TextType::instance()->argParser().parse( firstthree ); assert( firstthree[0]->imp()->inherits( IntImp::stype() ) ); @@ -509,10 +509,10 @@ void TextLabelRedefineMode::finish( const argvect& props, bool needframe, ObjectCalcer* locationtqparent ) { - std::vector<ObjectCalcer*> tqparents = mlabel->tqparents(); - assert( tqparents.size() >= 3 ); - std::vector<ObjectCalcer*> firstthree( tqparents.begin(), tqparents.begin() + 3 ); - std::vector<ObjectCalcer*> rest( tqparents.begin() + 3, tqparents.end() ); + std::vector<ObjectCalcer*> parents = mlabel->parents(); + assert( parents.size() >= 3 ); + std::vector<ObjectCalcer*> firstthree( parents.begin(), parents.begin() + 3 ); + std::vector<ObjectCalcer*> rest( parents.begin() + 3, parents.end() ); firstthree = TextType::instance()->argParser().parse( firstthree ); KigCommand* kc = new KigCommand( mdoc, i18n( "Change Label" ) ); @@ -538,7 +538,7 @@ void TextLabelRedefineMode::finish( static_cast<ObjectConstCalcer*>( firstthree[2] )->setImp( new StringImp( s ) ); mon.finish( kc ); - std::vector<ObjectCalcer*> oldtqparents = mlabel->tqparents(); + std::vector<ObjectCalcer*> oldparents = mlabel->parents(); std::vector<ObjectCalcer*> p; for ( argvect::const_iterator i = props.begin(); i != props.end(); ++i ) diff --git a/kig/modes/macrowizardbase.ui b/kig/modes/macrowizardbase.ui index 54fd95b2..fefd5c6f 100644 --- a/kig/modes/macrowizardbase.ui +++ b/kig/modes/macrowizardbase.ui @@ -180,7 +180,7 @@ </vbox> </widget> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kig/modes/moving.cc b/kig/modes/moving.cc index 980a5feb..d6f2c74b 100644 --- a/kig/modes/moving.cc +++ b/kig/modes/moving.cc @@ -129,8 +129,8 @@ MovingMode::MovingMode( const std::vector<ObjectHolder*>& os, const Coordinate& emo.push_back( ( *i )->calcer() ); d->refmap[( *i )->calcer()] = (*i)->moveReferencePoint(); objs.insert( ( *i )->calcer() ); - std::vector<ObjectCalcer*> tqparents = ( *i )->calcer()->movableParents(); - objs.insert( tqparents.begin(), tqparents.end() ); + std::vector<ObjectCalcer*> parents = ( *i )->calcer()->movableParents(); + objs.insert( parents.begin(), parents.end() ); }; emo = calcPath( emo ); @@ -176,12 +176,12 @@ PointRedefineMode::PointRedefineMode( ObjectHolder* p, KigPart& d, KigWidget& v { assert( dynamic_cast<ObjectTypeCalcer*>( p->calcer() ) ); moldtype = static_cast<ObjectTypeCalcer*>( p->calcer() )->type(); - std::vector<ObjectCalcer*> oldtqparents = p->calcer()->tqparents(); - std::copy( oldtqparents.begin(), oldtqparents.end(), std::back_inserter( moldtqparents ) ); + std::vector<ObjectCalcer*> oldparents = p->calcer()->parents(); + std::copy( oldparents.begin(), oldparents.end(), std::back_inserter( moldparents ) ); - std::vector<ObjectCalcer*> tqparents = getAllParents( mp->calcer() ); - mmon = new MonitorDataObjects( tqparents ); - std::vector<ObjectCalcer*> moving = tqparents; + std::vector<ObjectCalcer*> parents = getAllParents( mp->calcer() ); + mmon = new MonitorDataObjects( parents ); + std::vector<ObjectCalcer*> moving = parents; std::set<ObjectCalcer*> tqchildren = getAllChildren( mp->calcer() ); std::copy( tqchildren.begin(), tqchildren.end(), std::back_inserter( moving ) ); initScreen( moving ); @@ -224,22 +224,22 @@ void PointRedefineMode::stopMove() assert( dynamic_cast<ObjectTypeCalcer*>( mp->calcer() ) ); ObjectTypeCalcer* mpcalc = static_cast<ObjectTypeCalcer*>( mp->calcer() ); - std::vector<ObjectCalcer*> newtqparents = mpcalc->tqparents(); - std::vector<ObjectCalcer::shared_ptr> newtqparentsref( - newtqparents.begin(), newtqparents.end() ); + std::vector<ObjectCalcer*> newparents = mpcalc->parents(); + std::vector<ObjectCalcer::shared_ptr> newparentsref( + newparents.begin(), newparents.end() ); const ObjectType* newtype = mpcalc->type(); - std::vector<ObjectCalcer*> oldtqparents; - for( std::vector<ObjectCalcer::shared_ptr>::iterator i = moldtqparents.begin(); - i != moldtqparents.end(); ++i ) - oldtqparents.push_back( i->get() ); + std::vector<ObjectCalcer*> oldparents; + for( std::vector<ObjectCalcer::shared_ptr>::iterator i = moldparents.begin(); + i != moldparents.end(); ++i ) + oldparents.push_back( i->get() ); mpcalc->setType( moldtype ); - mpcalc->setParents( oldtqparents ); + mpcalc->setParents( oldparents ); mp->calc( mdoc.document() ); KigCommand* command = new KigCommand( mdoc, i18n( "Redefine Point" ) ); command->addTask( - new ChangeParentsAndTypeTask( mpcalc, newtqparents, newtype ) ); + new ChangeParentsAndTypeTask( mpcalc, newparents, newtype ) ); mmon->finish( command ); mdoc.history()->addCommand( command ); } diff --git a/kig/modes/moving.h b/kig/modes/moving.h index 8a75e62a..7c27aa4e 100644 --- a/kig/modes/moving.h +++ b/kig/modes/moving.h @@ -88,7 +88,7 @@ class PointRedefineMode : public MovingModeBase { ObjectHolder* mp; - std::vector<ObjectCalcer::shared_ptr> moldtqparents; + std::vector<ObjectCalcer::shared_ptr> moldparents; const ObjectType* moldtype; MonitorDataObjects* mmon; void stopMove(); diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc index 70f484d8..b79f4a5e 100644 --- a/kig/modes/textlabelwizard.cc +++ b/kig/modes/textlabelwizard.cc @@ -81,7 +81,7 @@ void TextLabelWizard::linkClicked( int which ) mmode->linkClicked( which ); } -void TextLabelWizard::retqlayoutArgsPage() +void TextLabelWizard::relayoutArgsPage() { select_arguments_pageLayout->activate(); tqrepaint(); diff --git a/kig/modes/textlabelwizard.h b/kig/modes/textlabelwizard.h index 2d192e7c..c6f0a7ca 100644 --- a/kig/modes/textlabelwizard.h +++ b/kig/modes/textlabelwizard.h @@ -35,7 +35,7 @@ public: void reject(); void accept(); - void retqlayoutArgsPage(); + void relayoutArgsPage(); private slots: void textChanged(); void linkClicked( int which ); diff --git a/kig/modes/textlabelwizardbase.ui b/kig/modes/textlabelwizardbase.ui index c4b7979e..8f12ca3c 100644 --- a/kig/modes/textlabelwizardbase.ui +++ b/kig/modes/textlabelwizardbase.ui @@ -106,7 +106,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac <data format="XPM.GZ" length="4462">789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>linkslabel.h</includehint> </includehints> diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui index 3001454b..8da4d05a 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -323,7 +323,7 @@ <slot access="protected">contextMenuRequested( TQListViewItem* i, const QPoint& p, int c )</slot> <slot>cancelSlot()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kig/objects/angle_type.cc b/kig/objects/angle_type.cc index b0dc09c1..7b86411b 100644 --- a/kig/objects/angle_type.cc +++ b/kig/objects/angle_type.cc @@ -65,14 +65,14 @@ const AngleType* AngleType::instance() return &t; } -ObjectImp* AngleType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* AngleType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; std::vector<Coordinate> points; - for ( uint i = 0; i < tqparents.size(); ++i ) + for ( uint i = 0; i < parents.size(); ++i ) points.push_back( - static_cast<const PointImp*>( tqparents[i] )->coordinate() ); + static_cast<const PointImp*>( parents[i] )->coordinate() ); Coordinate lvect = points[0] - points[1]; Coordinate rvect; @@ -112,13 +112,13 @@ void AngleType::executeAction( // pretend to use this var.. (void) i; - std::vector<ObjectCalcer*> tqparents = t.tqparents(); + std::vector<ObjectCalcer*> parents = t.parents(); - assert( margsparser.checkArgs( tqparents ) ); + assert( margsparser.checkArgs( parents ) ); - Coordinate a = static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); - Coordinate b = static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate(); - Coordinate c = static_cast<const PointImp*>( tqparents[2]->imp() )->coordinate(); + Coordinate a = static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); + Coordinate b = static_cast<const PointImp*>( parents[1]->imp() )->coordinate(); + Coordinate c = static_cast<const PointImp*>( parents[2]->imp() )->coordinate(); Coordinate lvect = a - b; Coordinate rvect = c - b; @@ -142,8 +142,8 @@ void AngleType::executeAction( Coordinate cdir( cos( newcangle ), sin( newcangle ) ); Coordinate nc = b + cdir.normalize( rvect.length() ); - MonitorDataObjects mon( getAllParents( tqparents ) ); - tqparents[2]->move( nc, d.document() ); + MonitorDataObjects mon( getAllParents( parents ) ); + parents[2]->move( nc, d.document() ); KigCommand* kc = new KigCommand( d, i18n( "Resize Angle" ) ); mon.finish( kc ); d.history()->addCommand( kc ); @@ -166,14 +166,14 @@ const HalfAngleType* HalfAngleType::instance() return &t; } -ObjectImp* HalfAngleType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* HalfAngleType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; std::vector<Coordinate> points; - for ( uint i = 0; i < tqparents.size(); ++i ) + for ( uint i = 0; i < parents.size(); ++i ) points.push_back( - static_cast<const PointImp*>( tqparents[i] )->coordinate() ); + static_cast<const PointImp*>( parents[i] )->coordinate() ); Coordinate lvect = points[0] - points[1]; Coordinate rvect; diff --git a/kig/objects/arc_type.h b/kig/objects/arc_type.h index cb0a4c5f..cdfe0294 100644 --- a/kig/objects/arc_type.h +++ b/kig/objects/arc_type.h @@ -35,7 +35,7 @@ public: ObjectImp* calc( const Args& args, const KigDocument& ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; bool inherits( int type ) const; const ObjectImpType* resultId() const; @@ -55,7 +55,7 @@ public: ObjectImp* calc( const Args& args, const KigDocument& ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; bool inherits( int type ) const; const ObjectImpType* resultId() const; diff --git a/kig/objects/base_type.cc b/kig/objects/base_type.cc index 77b9dc6a..0f8eecec 100644 --- a/kig/objects/base_type.cc +++ b/kig/objects/base_type.cc @@ -33,13 +33,13 @@ ObjectABType::~ObjectABType() { } -ObjectImp* ObjectABType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ObjectABType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - Coordinate a = static_cast<const PointImp*>( tqparents[0] )->coordinate(); - Coordinate b = static_cast<const PointImp*>( tqparents[1] )->coordinate(); + Coordinate a = static_cast<const PointImp*>( parents[0] )->coordinate(); + Coordinate b = static_cast<const PointImp*>( parents[1] )->coordinate(); return calc( a, b ); } @@ -57,22 +57,22 @@ bool ObjectABType::canMove( const ObjectTypeCalcer& o ) const bool ObjectABType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - return tqparents[0]->isFreelyTranslatable() && tqparents[1]->isFreelyTranslatable(); + std::vector<ObjectCalcer*> parents = o.parents(); + return parents[0]->isFreelyTranslatable() && parents[1]->isFreelyTranslatable(); } void ObjectABType::move( ObjectTypeCalcer& o, const Coordinate& to, const KigDocument& d ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - assert( margsparser.checkArgs( tqparents ) ); - const Coordinate a = static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); - const Coordinate b = static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate(); + std::vector<ObjectCalcer*> parents = o.parents(); + assert( margsparser.checkArgs( parents ) ); + const Coordinate a = static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); + const Coordinate b = static_cast<const PointImp*>( parents[1]->imp() )->coordinate(); const Coordinate dist = b - a; - if ( tqparents[0]->canMove() ) - tqparents[0]->move( to, d ); - if ( tqparents[1]->canMove() ) - tqparents[1]->move( to + dist, d ); + if ( parents[0]->canMove() ) + parents[0]->move( to, d ); + if ( parents[1]->canMove() ) + parents[1]->move( to + dist, d ); } ObjectLPType::ObjectLPType( const char* fullname, const ArgsParser::spec* spec, int n ) @@ -94,19 +94,19 @@ ObjectImp* ObjectLPType::calc( const Args& args, const KigDocument& ) const const Coordinate ObjectABType::moveReferencePoint( const ObjectTypeCalcer& o ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - assert( margsparser.checkArgs( tqparents ) ); - return static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); + std::vector<ObjectCalcer*> parents = o.parents(); + assert( margsparser.checkArgs( parents ) ); + return static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); } std::vector<ObjectCalcer*> ObjectABType::movableParents( const ObjectTypeCalcer& ourobj ) const { - std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); + std::vector<ObjectCalcer*> parents = ourobj.parents(); std::set<ObjectCalcer*> ret; - std::vector<ObjectCalcer*> tmp = tqparents[0]->movableParents(); + std::vector<ObjectCalcer*> tmp = parents[0]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - tmp = tqparents[1]->movableParents(); + tmp = parents[1]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - ret.insert( tqparents.begin(), tqparents.end() ); + ret.insert( parents.begin(), parents.end() ); return std::vector<ObjectCalcer*>( ret.begin(), ret.end() ); } diff --git a/kig/objects/conic_types.cc b/kig/objects/conic_types.cc index 58209011..34396369 100644 --- a/kig/objects/conic_types.cc +++ b/kig/objects/conic_types.cc @@ -57,12 +57,12 @@ ConicB5PType::~ConicB5PType() { } -ObjectImp* ConicB5PType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicB5PType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 1 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 1 ) ) return new InvalidImp; std::vector<Coordinate> points; - for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) + for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) points.push_back( static_cast<const PointImp*>( *i )->coordinate() ); ConicCartesianData d = @@ -105,23 +105,23 @@ const ConicBAAPType* ConicBAAPType::instance() return &t; } -ObjectImp* ConicBAAPType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicBAAPType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const LineData la = static_cast<const AbstractLineImp*>( tqparents[0] )->data(); - const LineData lb = static_cast<const AbstractLineImp*>( tqparents[1] )->data(); - const Coordinate c = static_cast<const PointImp*>( tqparents[2] )->coordinate(); + const LineData la = static_cast<const AbstractLineImp*>( parents[0] )->data(); + const LineData lb = static_cast<const AbstractLineImp*>( parents[1] )->data(); + const Coordinate c = static_cast<const PointImp*>( parents[2] )->coordinate(); return new ConicImpCart( calcConicByAsymptotes( la, lb, c ) ); } -ObjectImp* ConicBFFPType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicBFFPType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; std::vector<Coordinate> cs; - for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) + for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) cs.push_back( static_cast<const PointImp*>( *i )->coordinate() ); return new ConicImpPolar( calcConicBFFP( cs, type() ) ); @@ -233,17 +233,17 @@ ConicBDFPType::~ConicBDFPType() { } -ObjectImp* ConicBDFPType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicBDFPType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; - const LineData line = static_cast<const AbstractLineImp*>( tqparents[0] )->data(); + const LineData line = static_cast<const AbstractLineImp*>( parents[0] )->data(); const Coordinate focus = - static_cast<const PointImp*>( tqparents[1] )->coordinate(); + static_cast<const PointImp*>( parents[1] )->coordinate(); Coordinate point; - if ( tqparents.size() == 3 ) - point = static_cast<const PointImp*>( tqparents[2] )->coordinate(); + if ( parents.size() == 3 ) + point = static_cast<const PointImp*>( parents[2] )->coordinate(); else { /* !!!! costruisci point come punto medio dell'altezza tra fuoco e d. */ @@ -286,12 +286,12 @@ const ParabolaBTPType* ParabolaBTPType::instance() return &t; } -ObjectImp* ParabolaBTPType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ParabolaBTPType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; std::vector<Coordinate> points; - for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) + for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) points.push_back( static_cast<const PointImp*>( *i )->coordinate() ); ConicCartesianData d = @@ -327,12 +327,12 @@ const ConicPolarPointType* ConicPolarPointType::instance() return &t; } -ObjectImp* ConicPolarPointType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicPolarPointType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const ConicCartesianData c = static_cast<const ConicImp*>( tqparents[0] )->cartesianData(); - const LineData l = static_cast<const AbstractLineImp*>( tqparents[1] )->data(); + const ConicCartesianData c = static_cast<const ConicImp*>( parents[0] )->cartesianData(); + const LineData l = static_cast<const AbstractLineImp*>( parents[1] )->data(); const Coordinate p = calcConicPolarPoint( c, l ); if ( p.valid() ) return new PointImp( p ); else return new InvalidImp; @@ -363,12 +363,12 @@ const ConicPolarLineType* ConicPolarLineType::instance() return &t; } -ObjectImp* ConicPolarLineType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicPolarLineType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const ConicCartesianData c = static_cast<const ConicImp*>( tqparents[0] )->cartesianData(); - const Coordinate p = static_cast<const PointImp*>( tqparents[1] )->coordinate(); + const ConicCartesianData c = static_cast<const ConicImp*>( parents[0] )->cartesianData(); + const Coordinate p = static_cast<const PointImp*>( parents[1] )->coordinate(); bool valid = true; const LineData l = calcConicPolarLine( c, p, valid ); if ( valid ) return new LineImp( l ); @@ -398,12 +398,12 @@ const ConicDirectrixType* ConicDirectrixType::instance() return &t; } -ObjectImp* ConicDirectrixType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicDirectrixType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; const ConicPolarData data = - static_cast<const ConicImp*>( tqparents[0] )->polarData(); + static_cast<const ConicImp*>( parents[0] )->polarData(); double ec = data.ecostheta0; double es = data.esintheta0; @@ -445,12 +445,12 @@ const EquilateralHyperbolaB4PType* EquilateralHyperbolaB4PType::instance() return &t; } -ObjectImp* EquilateralHyperbolaB4PType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* EquilateralHyperbolaB4PType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 1 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 1 ) ) return new InvalidImp; std::vector<Coordinate> pts; - for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) + for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) pts.push_back( static_cast<const PointImp*>( *i )->coordinate() ); ConicCartesianData d = calcConicThroughPoints( pts, equilateral ); @@ -524,14 +524,14 @@ const ConicAsymptoteType* ConicAsymptoteType::instance() return &t; } -ObjectImp* ConicAsymptoteType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicAsymptoteType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; bool valid = true; const LineData ret = calcConicAsymptote( - static_cast<const ConicImp*>( tqparents[0] )->cartesianData(), - static_cast<const IntImp*>( tqparents[1] )->data(), + static_cast<const ConicImp*>( parents[0] )->cartesianData(), + static_cast<const IntImp*>( parents[1] )->data(), valid ); if ( valid ) @@ -565,18 +565,18 @@ const ConicRadicalType* ConicRadicalType::instance() return &t; } -ObjectImp* ConicRadicalType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicRadicalType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - if ( tqparents[0]->inherits( CircleImp::stype() ) && - tqparents[1]->inherits( CircleImp::stype() ) ) + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( parents[0]->inherits( CircleImp::stype() ) && + parents[1]->inherits( CircleImp::stype() ) ) { - if( static_cast<const IntImp*>( tqparents[2] )->data() != 1 ) + if( static_cast<const IntImp*>( parents[2] )->data() != 1 ) return new InvalidImp; else { - const CircleImp* c1 = static_cast<const CircleImp*>( tqparents[0] ); - const CircleImp* c2 = static_cast<const CircleImp*>( tqparents[1] ); + const CircleImp* c1 = static_cast<const CircleImp*>( parents[0] ); + const CircleImp* c2 = static_cast<const CircleImp*>( parents[1] ); const Coordinate a = calcCircleRadicalStartPoint( c1->center(), c2->center(), c1->squareRadius(), c2->squareRadius() ); @@ -588,10 +588,10 @@ ObjectImp* ConicRadicalType::calc( const Args& tqparents, const KigDocument& ) c { bool valid = true; const LineData l = calcConicRadical( - static_cast<const ConicImp*>( tqparents[0] )->cartesianData(), - static_cast<const ConicImp*>( tqparents[1] )->cartesianData(), - static_cast<const IntImp*>( tqparents[2] )->data(), - static_cast<const IntImp*>( tqparents[3] )->data(), valid ); + static_cast<const ConicImp*>( parents[0] )->cartesianData(), + static_cast<const ConicImp*>( parents[1] )->cartesianData(), + static_cast<const IntImp*>( parents[2] )->data(), + static_cast<const IntImp*>( parents[3] )->data(), valid ); if ( valid ) return new LineImp( l ); else @@ -674,9 +674,9 @@ void ConicRadicalType::executeAction( int i, ObjectHolder&, ObjectTypeCalcer& t, KigPart& d, KigWidget&, NormalMode& ) const { assert( i == 0 ); - std::vector<ObjectCalcer*> tqparents = t.tqparents(); - assert( dynamic_cast<ObjectConstCalcer*>( tqparents[3] ) ); - ObjectConstCalcer* zeroindexo = static_cast<ObjectConstCalcer*>( tqparents[3] ); + std::vector<ObjectCalcer*> parents = t.parents(); + assert( dynamic_cast<ObjectConstCalcer*>( parents[3] ) ); + ObjectConstCalcer* zeroindexo = static_cast<ObjectConstCalcer*>( parents[3] ); MonitorDataObjects mon( zeroindexo ); assert( zeroindexo->imp()->inherits( IntImp::stype() ) ); int oldzeroindex = static_cast<const IntImp*>( zeroindexo->imp() )->data(); diff --git a/kig/objects/conic_types.h b/kig/objects/conic_types.h index e3c44c01..858ca057 100644 --- a/kig/objects/conic_types.h +++ b/kig/objects/conic_types.h @@ -27,7 +27,7 @@ class ConicB5PType ~ConicB5PType(); public: static const ConicB5PType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -38,7 +38,7 @@ class ConicBAAPType ~ConicBAAPType(); public: static const ConicBAAPType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -49,7 +49,7 @@ protected: ConicBFFPType( const char* fullname, const ArgsParser::spec*, int n ); ~ConicBFFPType(); public: - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; /** * -1 for hyperbola, 1 for ellipse.. @@ -85,7 +85,7 @@ class ConicBDFPType ~ConicBDFPType(); public: static const ConicBDFPType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -96,7 +96,7 @@ class ParabolaBTPType ~ParabolaBTPType(); public: static const ParabolaBTPType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -107,7 +107,7 @@ class EquilateralHyperbolaB4PType ~EquilateralHyperbolaB4PType(); public: static const EquilateralHyperbolaB4PType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -118,7 +118,7 @@ class ConicPolarPointType ~ConicPolarPointType(); public: static const ConicPolarPointType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -129,7 +129,7 @@ class ConicPolarLineType ~ConicPolarLineType(); public: static const ConicPolarLineType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -140,7 +140,7 @@ class ConicDirectrixType ~ConicDirectrixType(); public: static const ConicDirectrixType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -162,7 +162,7 @@ class ConicAsymptoteType ~ConicAsymptoteType(); public: static const ConicAsymptoteType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -173,7 +173,7 @@ class ConicRadicalType ~ConicRadicalType(); public: static const ConicRadicalType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; TQStringList specialActions() const; void executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& t, diff --git a/kig/objects/cubic_type.cc b/kig/objects/cubic_type.cc index 1878128a..c322b8c3 100644 --- a/kig/objects/cubic_type.cc +++ b/kig/objects/cubic_type.cc @@ -112,12 +112,12 @@ const CubicNodeB6PType* CubicNodeB6PType::instance() return &t; } -ObjectImp* CubicNodeB6PType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* CubicNodeB6PType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; std::vector<Coordinate> points; - for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) + for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) points.push_back( static_cast<const PointImp*>( *i )->coordinate() ); CubicCartesianData d = calcCubicNodeThroughPoints( points ); @@ -156,12 +156,12 @@ const CubicCuspB4PType* CubicCuspB4PType::instance() return &t; } -ObjectImp* CubicCuspB4PType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* CubicCuspB4PType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 2 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 2 ) ) return new InvalidImp; std::vector<Coordinate> points; - for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) + for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) points.push_back( static_cast<const PointImp*>( *i )->coordinate() ); CubicCartesianData d = calcCubicCuspThroughPoints( points ); diff --git a/kig/objects/cubic_type.h b/kig/objects/cubic_type.h index 439c7367..39be7387 100644 --- a/kig/objects/cubic_type.h +++ b/kig/objects/cubic_type.h @@ -27,7 +27,7 @@ class CubicB9PType ~CubicB9PType(); public: static const CubicB9PType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -38,7 +38,7 @@ class CubicNodeB6PType ~CubicNodeB6PType(); public: static const CubicNodeB6PType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -49,7 +49,7 @@ class CubicCuspB4PType ~CubicCuspB4PType(); public: static const CubicCuspB4PType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; diff --git a/kig/objects/intersection_types.cc b/kig/objects/intersection_types.cc index 92cbefff..804d498d 100644 --- a/kig/objects/intersection_types.cc +++ b/kig/objects/intersection_types.cc @@ -55,19 +55,19 @@ const ConicLineIntersectionType* ConicLineIntersectionType::instance() return &t; } -ObjectImp* ConicLineIntersectionType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicLineIntersectionType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - int side = static_cast<const IntImp*>( tqparents[2] )->data(); + int side = static_cast<const IntImp*>( parents[2] )->data(); assert( side == 1 || side == -1 ); - const LineData line = static_cast<const AbstractLineImp*>( tqparents[1] )->data(); + const LineData line = static_cast<const AbstractLineImp*>( parents[1] )->data(); Coordinate ret; - if ( tqparents[0]->inherits( CircleImp::stype() ) ) + if ( parents[0]->inherits( CircleImp::stype() ) ) { // easy case.. - const CircleImp* c = static_cast<const CircleImp*>( tqparents[0] ); + const CircleImp* c = static_cast<const CircleImp*>( parents[0] ); ret = calcCircleLineIntersect( c->center(), c->squareRadius(), line, side ); } @@ -75,7 +75,7 @@ ObjectImp* ConicLineIntersectionType::calc( const Args& tqparents, const KigDocu { // harder case.. ret = calcConicLineIntersect( - static_cast<const ConicImp*>( tqparents[0] )->cartesianData(), + static_cast<const ConicImp*>( parents[0] )->cartesianData(), line, 0.0, side ); } if ( ret.valid() ) return new PointImp( ret ); @@ -109,18 +109,18 @@ const ConicLineOtherIntersectionType* ConicLineOtherIntersectionType::instance() return &t; } -ObjectImp* ConicLineOtherIntersectionType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConicLineOtherIntersectionType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - Coordinate p = static_cast<const PointImp*>( tqparents[2] )->coordinate(); - const LineData line = static_cast<const AbstractLineImp*>( tqparents[1] )->data(); + Coordinate p = static_cast<const PointImp*>( parents[2] )->coordinate(); + const LineData line = static_cast<const AbstractLineImp*>( parents[1] )->data(); Coordinate ret; -// if ( tqparents[0]->inherits( CircleImp::stype() ) ) +// if ( parents[0]->inherits( CircleImp::stype() ) ) // { // // easy case.. -// const CircleImp* c = static_cast<const CircleImp*>( tqparents[0] ); +// const CircleImp* c = static_cast<const CircleImp*>( parents[0] ); // ret = calcCircleLineIntersect( // c->center(), c->squareRadius(), line, side, valid ); // } @@ -133,7 +133,7 @@ ObjectImp* ConicLineOtherIntersectionType::calc( const Args& tqparents, const Ki double bay = line.b.y - line.a.y; double knownparam = (pax*bax + pay*bay)/(bax*bax + bay*bay); ret = calcConicLineIntersect( - static_cast<const ConicImp*>( tqparents[0] )->cartesianData(), + static_cast<const ConicImp*>( parents[0] )->cartesianData(), line, knownparam, 0 ); // } if ( ret.valid() ) return new PointImp( ret ); @@ -164,16 +164,16 @@ const LineLineIntersectionType* LineLineIntersectionType::instance() return &t; } -ObjectImp* LineLineIntersectionType::calc( const Args& tqparents, const KigDocument& d ) const +ObjectImp* LineLineIntersectionType::calc( const Args& parents, const KigDocument& d ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; Coordinate p = calcIntersectionPoint( - static_cast<const AbstractLineImp*>( tqparents[0] )->data(), - static_cast<const AbstractLineImp*>( tqparents[1] )->data() ); - if ( static_cast<const AbstractLineImp*>( tqparents[0] )->containsPoint( p, d ) && - static_cast<const AbstractLineImp*>( tqparents[1] )->containsPoint( p, d ) ) + static_cast<const AbstractLineImp*>( parents[0] )->data(), + static_cast<const AbstractLineImp*>( parents[1] )->data() ); + if ( static_cast<const AbstractLineImp*>( parents[0] )->containsPoint( p, d ) && + static_cast<const AbstractLineImp*>( parents[1] )->containsPoint( p, d ) ) return new PointImp( p ); else return new InvalidImp(); } @@ -204,15 +204,15 @@ const LineCubicIntersectionType* LineCubicIntersectionType::instance() return &t; } -ObjectImp* LineCubicIntersectionType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* LineCubicIntersectionType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - int which = static_cast<const IntImp*>( tqparents[2] )->data(); + int which = static_cast<const IntImp*>( parents[2] )->data(); bool valid = true; const Coordinate c = calcCubicLineIntersect( - static_cast<const CubicImp*>( tqparents[0] )->data(), - static_cast<const AbstractLineImp*>( tqparents[1] )->data(), + static_cast<const CubicImp*>( parents[0] )->data(), + static_cast<const AbstractLineImp*>( parents[1] )->data(), which, valid ); if ( valid ) return new PointImp( c ); else return new InvalidImp; @@ -265,14 +265,14 @@ const CircleCircleIntersectionType* CircleCircleIntersectionType::instance() return &t; } -ObjectImp* CircleCircleIntersectionType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* CircleCircleIntersectionType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - int side = static_cast<const IntImp*>( tqparents[2] )->data(); + int side = static_cast<const IntImp*>( parents[2] )->data(); assert( side == 1 || side == -1 ); - const CircleImp* c1 = static_cast<const CircleImp*>( tqparents[0] ); - const CircleImp* c2 = static_cast<const CircleImp*>( tqparents[1] ); + const CircleImp* c1 = static_cast<const CircleImp*>( parents[0] ); + const CircleImp* c2 = static_cast<const CircleImp*>( parents[1] ); const Coordinate o1 = c1->center(); const Coordinate o2 = c2->center(); const double r1sq = c1->squareRadius(); @@ -316,15 +316,15 @@ const ArcLineIntersectionType* ArcLineIntersectionType::instance() return &t; } -ObjectImp* ArcLineIntersectionType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ArcLineIntersectionType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - int side = static_cast<const IntImp*>( tqparents[2] )->data(); + int side = static_cast<const IntImp*>( parents[2] )->data(); assert( side == 1 || side == -1 ); - const LineData line = static_cast<const AbstractLineImp*>( tqparents[1] )->data(); + const LineData line = static_cast<const AbstractLineImp*>( parents[1] )->data(); - const ArcImp* c = static_cast<const ArcImp*>( tqparents[0] ); + const ArcImp* c = static_cast<const ArcImp*>( parents[0] ); const double r = c->radius(); Coordinate ret = calcArcLineIntersect( c->center(), r*r, c->startAngle(), c->angle(), line, side ); diff --git a/kig/objects/intersection_types.h b/kig/objects/intersection_types.h index 46d60199..9e1df62e 100644 --- a/kig/objects/intersection_types.h +++ b/kig/objects/intersection_types.h @@ -36,7 +36,7 @@ class ConicLineIntersectionType ~ConicLineIntersectionType(); public: static const ConicLineIntersectionType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -51,7 +51,7 @@ class ConicLineOtherIntersectionType ~ConicLineOtherIntersectionType(); public: static const ConicLineOtherIntersectionType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -62,7 +62,7 @@ class LineLineIntersectionType ~LineLineIntersectionType(); public: static const LineLineIntersectionType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -73,7 +73,7 @@ class LineCubicIntersectionType ~LineCubicIntersectionType(); public: static const LineCubicIntersectionType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -84,7 +84,7 @@ class CircleCircleIntersectionType ~CircleCircleIntersectionType(); public: static const CircleCircleIntersectionType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -98,7 +98,7 @@ class ArcLineIntersectionType ~ArcLineIntersectionType(); public: static const ArcLineIntersectionType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; diff --git a/kig/objects/line_type.cc b/kig/objects/line_type.cc index 84deb46e..a02cc80b 100644 --- a/kig/objects/line_type.cc +++ b/kig/objects/line_type.cc @@ -232,11 +232,11 @@ void SegmentABType::executeAction( int i, ObjectHolder&, ObjectTypeCalcer& c, // pretend to use this var.. (void) i; - std::vector<ObjectCalcer*> tqparents = c.tqparents(); - assert( margsparser.checkArgs( tqparents ) ); + std::vector<ObjectCalcer*> parents = c.parents(); + assert( margsparser.checkArgs( parents ) ); - Coordinate a = static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); - Coordinate b = static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate(); + Coordinate a = static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); + Coordinate b = static_cast<const PointImp*>( parents[1]->imp() )->coordinate(); bool ok = true; double length = getDoubleFromUser( @@ -246,8 +246,8 @@ void SegmentABType::executeAction( int i, ObjectHolder&, ObjectTypeCalcer& c, Coordinate nb = a + ( b - a ).normalize( length ); - MonitorDataObjects mon( getAllParents( tqparents ) ); - tqparents[1]->move( nb, d.document() ); + MonitorDataObjects mon( getAllParents( parents ) ); + parents[1]->move( nb, d.document() ); KigCommand* cd = new KigCommand( d, i18n( "Resize Segment" ) ); mon.finish( cd ); d.history()->addCommand( cd ); diff --git a/kig/objects/locus_imp.h b/kig/objects/locus_imp.h index b2100634..54ec7f13 100644 --- a/kig/objects/locus_imp.h +++ b/kig/objects/locus_imp.h @@ -33,9 +33,9 @@ * * This may seem rather complicated, but I think it is absolutely * necessary to support locuses using Kig's object system. It would - * be very bad for LocusImp to have to keep references to its tqparents + * be very bad for LocusImp to have to keep references to its parents * as Objects ( since only the objects know how they are related to - * their tqparents ). This is how we used to do it, but the current + * their parents ). This is how we used to do it, but the current * method is far superior. First and foremost because the separation * between ObjectImp and Object is something that Kig depends on very * much, and because every ObjectImp should contain all the data it diff --git a/kig/objects/object_calcer.cc b/kig/objects/object_calcer.cc index ae442aae..38c0b194 100644 --- a/kig/objects/object_calcer.cc +++ b/kig/objects/object_calcer.cc @@ -29,8 +29,8 @@ void ObjectTypeCalcer::calc( const KigDocument& doc ) { Args a; - a.reserve( mtqparents.size() ); - std::transform( mtqparents.begin(), mtqparents.end(), + a.reserve( mparents.size() ); + std::transform( mparents.begin(), mparents.end(), std::back_inserter( a ), std::mem_fun( &ObjectCalcer::imp ) ); ObjectImp* n = mtype->calc( a, doc ); delete mimp; @@ -38,10 +38,10 @@ void ObjectTypeCalcer::calc( const KigDocument& doc ) } ObjectTypeCalcer::ObjectTypeCalcer( const ObjectType* type, - const std::vector<ObjectCalcer*>& tqparents, bool sort ) - : mtqparents( ( sort )?type->sortArgs( tqparents ):tqparents ), mtype( type ), mimp( 0 ) + const std::vector<ObjectCalcer*>& parents, bool sort ) + : mparents( ( sort )?type->sortArgs( parents ):parents ), mtype( type ), mimp( 0 ) { - std::for_each( mtqparents.begin(), mtqparents.end(), + std::for_each( mparents.begin(), mparents.end(), std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) ); } @@ -68,9 +68,9 @@ void ObjectConstCalcer::calc( const KigDocument& ) { } -std::vector<ObjectCalcer*> ObjectConstCalcer::tqparents() const +std::vector<ObjectCalcer*> ObjectConstCalcer::parents() const { - // we have no tqparents.. + // we have no parents.. return std::vector<ObjectCalcer*>(); } @@ -99,9 +99,9 @@ const ObjectImp* ObjectTypeCalcer::imp() const return mimp; } -std::vector<ObjectCalcer*> ObjectTypeCalcer::tqparents() const +std::vector<ObjectCalcer*> ObjectTypeCalcer::parents() const { - return mtqparents; + return mparents; } void ObjectCalcer::addChild( ObjectCalcer* c ) @@ -121,7 +121,7 @@ void ObjectCalcer::delChild( ObjectCalcer* c ) ObjectTypeCalcer::~ObjectTypeCalcer() { - std::for_each( mtqparents.begin(), mtqparents.end(), + std::for_each( mparents.begin(), mparents.end(), std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) ); delete mimp; } @@ -154,7 +154,7 @@ const ObjectImp* ObjectPropertyCalcer::imp() const return mimp; } -std::vector<ObjectCalcer*> ObjectPropertyCalcer::tqparents() const +std::vector<ObjectCalcer*> ObjectPropertyCalcer::parents() const { std::vector<ObjectCalcer*> ret; ret.push_back( mtqparent ); @@ -197,7 +197,7 @@ const ObjectImpType* ObjectTypeCalcer::impRequirement( ObjectCalcer* o, const std::vector<ObjectCalcer*>& os ) const { Args args; - args.reserve( mtqparents.size() ); + args.reserve( mparents.size() ); std::transform( os.begin(), os.end(), std::back_inserter( args ), @@ -220,9 +220,9 @@ void ObjectTypeCalcer::setParents( const std::vector<ObjectCalcer*> np ) { std::for_each( np.begin(), np.end(), std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) ); - std::for_each( mtqparents.begin(), mtqparents.end(), + std::for_each( mparents.begin(), mparents.end(), std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) ); - mtqparents = np; + mparents = np; } void ObjectTypeCalcer::setType( const ObjectType* t ) @@ -270,7 +270,7 @@ void ObjectTypeCalcer::move( const Coordinate& to, const KigDocument& doc ) { // we need to check if type can in fact move, because this check is // not done for us in all circumstances ( e.g. LineABType::move uses - // move on its tqparents to move them ), and the ObjectType's depend + // move on its parents to move them ), and the ObjectType's depend // on move only being called if canMove() returns true.. if ( mtype->canMove( *this ) ) mtype->move( *this, to, doc ); @@ -310,9 +310,9 @@ bool ObjectPropertyCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const bool ObjectTypeCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const { Args args; - args.reserve( mtqparents.size() ); + args.reserve( mparents.size() ); std::transform( - mtqparents.begin(), mtqparents.end(), + mparents.begin(), mparents.end(), std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); if ( std::find( args.begin(), args.end(), o->imp() ) == args.end() ) diff --git a/kig/objects/object_calcer.h b/kig/objects/object_calcer.h index 1aa83db4..92eebc8e 100644 --- a/kig/objects/object_calcer.h +++ b/kig/objects/object_calcer.h @@ -33,12 +33,12 @@ void intrusive_ptr_release( ObjectCalcer* p ); * be calculated from the two PointImp's it has to go through; every * time either of them moves, this calculation is redone. In this * case, there would be an ObjectCalcer that keeps a reference to its - * two tqparents ( the ObjectCalcer's representing the points ), and + * two parents ( the ObjectCalcer's representing the points ), and * that will calculate its ObjectImp value every time it is asked to - * do so ( i.e. every time one of its tqparents moves.. ). + * do so ( i.e. every time one of its parents moves.. ). * * Each ObjectHolder keeps its ObjectImp itself, and recalculates it - * from its tqparents in its calc() method ( if necessary ). + * from its parents in its calc() method ( if necessary ). * * Because of the complex relations that ObjectCalcer's hold to other * ObjectCalcer's and to other classes, they have been made @@ -46,12 +46,12 @@ void intrusive_ptr_release( ObjectCalcer* p ); * how much times a pointer to them is held. If this count reaches 0, * this means that nobody needs them anymore, and they delete * themselves. E.g. an ObjectCalcer always keeps a reference to its - * tqparents, to ensure that those aren't deleted before it is deleted. + * parents, to ensure that those aren't deleted before it is deleted. * * At runtime, there will be an entire graph of ObjectCalcer that - * depend on their tqparents.. At the bottom, there are Calcer's that + * depend on their parents.. At the bottom, there are Calcer's that * the user is aware of, and that are held by ObjectHolder's. At the - * top, there are Calcer's without tqparents that serve only to hold + * top, there are Calcer's without parents that serve only to hold * some data. Those are most likely ObjectConstCalcer's. There are * some algorithms to work with the dependency graph in various ways * in ../misc/calcpath.h @@ -67,7 +67,7 @@ class ObjectCalcer protected: /** * ObjectCalcer's are reference counted.. They all take a reference - * to their tqparents, and some other classes like ObjectHolder take a + * to their parents, and some other classes like ObjectHolder take a * reference to some ObjectCalcer's that they don't want to see * deleted.. */ @@ -108,21 +108,21 @@ public: /** * Returns the tqparent ObjectCalcer's of this ObjectCalcer. */ - virtual std::vector<ObjectCalcer*> tqparents() const = 0; + virtual std::vector<ObjectCalcer*> parents() const = 0; /** * Returns the ObjectImp of this ObjectCalcer. */ virtual const ObjectImp* imp() const = 0; /** * Makes the ObjectCalcer recalculate its ObjectImp from its - * tqparents. + * parents. */ virtual void calc( const KigDocument& ) = 0; /** - * An ObjectCalcer expects its tqparents to have an ObjectImp of a + * An ObjectCalcer expects its parents to have an ObjectImp of a * certain type. This method returns the ObjectImpType that \p o - * should have. \p os is a list of all the tqparents in order, and + * should have. \p os is a list of all the parents in order, and * \p o is part of it. This method will return the ObjectImpType * that the tqparent should *at least* be. For example, a Translated * object can translate any sort of object, so it will return @@ -144,7 +144,7 @@ public: virtual bool isFreelyTranslatable() const; /** * Moving an object most of the time signifies invoking changes in - * some of its tqparents. This method returns the set of tqparents that + * some of its parents. This method returns the set of parents that * will be changed in the move() method. The object itself should * not be included. */ @@ -182,30 +182,30 @@ public: class ObjectTypeCalcer : public ObjectCalcer { - std::vector<ObjectCalcer*> mtqparents; + std::vector<ObjectCalcer*> mparents; const ObjectType* mtype; ObjectImp* mimp; public: typedef myboost::intrusive_ptr<ObjectTypeCalcer> shared_ptr; /** - * Construct a new ObjectTypeCalcer with a given type and tqparents. + * Construct a new ObjectTypeCalcer with a given type and parents. */ -// ObjectTypeCalcer( const ObjectType* type, const std::vector<ObjectCalcer*>& tqparents ); +// ObjectTypeCalcer( const ObjectType* type, const std::vector<ObjectCalcer*>& parents ); /** * the sort boolean tells whether the sortArgs method should be invoked or not; * if not present */ - ObjectTypeCalcer( const ObjectType* type, const std::vector<ObjectCalcer*>& tqparents, bool sort=true ); + ObjectTypeCalcer( const ObjectType* type, const std::vector<ObjectCalcer*>& parents, bool sort=true ); ~ObjectTypeCalcer(); const ObjectImp* imp() const; - std::vector<ObjectCalcer*> tqparents() const; + std::vector<ObjectCalcer*> parents() const; void calc( const KigDocument& doc ); /** - * Set the tqparents of this ObjectTypeCalcer to np. This object will - * release the reference it had to its old tqparents, and take a new - * one on the new tqparents. + * Set the parents of this ObjectTypeCalcer to np. This object will + * release the reference it had to its old parents, and take a new + * one on the new parents. */ void setParents( const std::vector<ObjectCalcer*> np ); void setType( const ObjectType* t ); @@ -248,7 +248,7 @@ public: const ObjectImp* imp() const; void calc( const KigDocument& doc ); - std::vector<ObjectCalcer*> tqparents() const; + std::vector<ObjectCalcer*> parents() const; /** * Set the ObjectImp of this ObjectConstCalcer to the given @@ -287,7 +287,7 @@ public: ~ObjectPropertyCalcer(); const ObjectImp* imp() const; - std::vector<ObjectCalcer*> tqparents() const; + std::vector<ObjectCalcer*> parents() const; void calc( const KigDocument& doc ); int propId() const; diff --git a/kig/objects/object_factory.cc b/kig/objects/object_factory.cc index 5b1a6add..c2d7b3b5 100644 --- a/kig/objects/object_factory.cc +++ b/kig/objects/object_factory.cc @@ -109,21 +109,21 @@ ObjectTypeCalcer* ObjectFactory::relativePointCalcer( x = loc.x - reference.x; y = loc.y - reference.y; } - std::vector<ObjectCalcer*> tqparents; - tqparents.push_back( new ObjectConstCalcer( new DoubleImp( x ) ) ); - tqparents.push_back( new ObjectConstCalcer( new DoubleImp( y ) ) ); - tqparents.push_back( o ); - return new ObjectTypeCalcer( RelativePointType::instance(), tqparents ); + std::vector<ObjectCalcer*> parents; + parents.push_back( new ObjectConstCalcer( new DoubleImp( x ) ) ); + parents.push_back( new ObjectConstCalcer( new DoubleImp( y ) ) ); + parents.push_back( o ); + return new ObjectTypeCalcer( RelativePointType::instance(), parents ); } ObjectTypeCalcer* ObjectFactory::constrainedPointCalcer( ObjectCalcer* curve, double param ) const { assert( curve->imp()->inherits( CurveImp::stype() ) ); - std::vector<ObjectCalcer*> tqparents; - tqparents.push_back( new ObjectConstCalcer( new DoubleImp( param ) ) ); - tqparents.push_back( curve ); - return new ObjectTypeCalcer( ConstrainedPointType::instance(), tqparents ); + std::vector<ObjectCalcer*> parents; + parents.push_back( new ObjectConstCalcer( new DoubleImp( param ) ) ); + parents.push_back( curve ); + return new ObjectTypeCalcer( ConstrainedPointType::instance(), parents ); } ObjectHolder* ObjectFactory::constrainedPoint( @@ -152,24 +152,24 @@ ObjectTypeCalcer* ObjectFactory::locusCalcer( assert( dynamic_cast<const ObjectTypeCalcer*>( a ) ); ObjectTypeCalcer* constrained = static_cast<ObjectTypeCalcer*>( a ); assert( constrained->type()->inherits( ObjectType::ID_ConstrainedPointType ) ); - assert( constrained->tqparents().size() == 2 ); - ObjectCalcer* curve = a->tqparents().back(); + assert( constrained->parents().size() == 2 ); + ObjectCalcer* curve = a->parents().back(); const ObjectCalcer* moving = b; - std::vector<ObjectCalcer*> hiertqparents; - hiertqparents.push_back( constrained ); - std::vector<ObjectCalcer*> sideOfTree = sideOfTreePath( hiertqparents, moving ); - std::copy( sideOfTree.begin(), sideOfTree.end(), std::back_inserter( hiertqparents ) ); + std::vector<ObjectCalcer*> hierparents; + hierparents.push_back( constrained ); + std::vector<ObjectCalcer*> sideOfTree = sideOfTreePath( hierparents, moving ); + std::copy( sideOfTree.begin(), sideOfTree.end(), std::back_inserter( hierparents ) ); - ObjectHierarchy hier( hiertqparents, moving ); + ObjectHierarchy hier( hierparents, moving ); - std::vector<ObjectCalcer*> realtqparents( 2 + sideOfTree.size(), 0 ); - realtqparents[0] = new ObjectConstCalcer( new HierarchyImp( hier ) ); - realtqparents[1] = curve; - copy( sideOfTree.begin(), sideOfTree.end(), realtqparents.begin() + 2 ); + std::vector<ObjectCalcer*> realparents( 2 + sideOfTree.size(), 0 ); + realparents[0] = new ObjectConstCalcer( new HierarchyImp( hier ) ); + realparents[1] = curve; + copy( sideOfTree.begin(), sideOfTree.end(), realparents.begin() + 2 ); - return new ObjectTypeCalcer( LocusType::instance(), realtqparents ); + return new ObjectTypeCalcer( LocusType::instance(), realparents ); } ObjectHolder* ObjectFactory::locus( ObjectCalcer* a, ObjectCalcer* b ) const @@ -179,35 +179,35 @@ ObjectHolder* ObjectFactory::locus( ObjectCalcer* a, ObjectCalcer* b ) const ObjectHolder* ObjectFactory::label( const TQString& s, const Coordinate& loc, - bool needframe, const std::vector<ObjectCalcer*>& tqparents, + bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { - return new ObjectHolder( labelCalcer( s, loc, needframe, tqparents, doc ) ); + return new ObjectHolder( labelCalcer( s, loc, needframe, parents, doc ) ); } ObjectTypeCalcer* ObjectFactory::labelCalcer( const TQString& s, const Coordinate& loc, - bool needframe, const std::vector<ObjectCalcer*>& tqparents, + bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { - return attachedLabelCalcer( s, 0, loc, needframe, tqparents, doc ); + return attachedLabelCalcer( s, 0, loc, needframe, parents, doc ); } ObjectTypeCalcer* ObjectFactory::attachedLabelCalcer( const TQString& s, ObjectCalcer* p, const Coordinate& loc, bool needframe, - const std::vector<ObjectCalcer*>& ntqparents, + const std::vector<ObjectCalcer*>& nparents, const KigDocument& doc ) const { - std::vector<ObjectCalcer*> tqparents; - tqparents.reserve( ntqparents.size() + 3 ); - tqparents.push_back( new ObjectConstCalcer( new IntImp( needframe ? 1 : 0 ) ) ); + std::vector<ObjectCalcer*> parents; + parents.reserve( nparents.size() + 3 ); + parents.push_back( new ObjectConstCalcer( new IntImp( needframe ? 1 : 0 ) ) ); - tqparents.push_back( getAttachPoint( p, loc, doc ) ); + parents.push_back( getAttachPoint( p, loc, doc ) ); - tqparents.push_back( new ObjectConstCalcer( new StringImp( s ) ) ); - std::copy( ntqparents.begin(), ntqparents.end(), std::back_inserter( tqparents ) ); - ObjectTypeCalcer* ret = new ObjectTypeCalcer( TextType::instance(), tqparents ); + parents.push_back( new ObjectConstCalcer( new StringImp( s ) ) ); + std::copy( nparents.begin(), nparents.end(), std::back_inserter( parents ) ); + ObjectTypeCalcer* ret = new ObjectTypeCalcer( TextType::instance(), parents ); ret->calc( doc ); return ret; } @@ -268,10 +268,10 @@ ObjectCalcer* ObjectFactory::getAttachPoint( ObjectHolder* ObjectFactory::attachedLabel( const TQString& s, ObjectCalcer* locationtqparent, const Coordinate& loc, bool needframe, - const std::vector<ObjectCalcer*>& tqparents, + const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { - return new ObjectHolder( attachedLabelCalcer( s, locationtqparent, loc, needframe, tqparents, doc ) ); + return new ObjectHolder( attachedLabelCalcer( s, locationtqparent, loc, needframe, parents, doc ) ); } ObjectPropertyCalcer* ObjectFactory::propertyObjectCalcer( @@ -321,15 +321,15 @@ void ObjectFactory::redefinePoint( // point already was constrained -> simply update the param // DataObject and make sure point is on the right curve... ObjectCalcer* dataobj = 0; - std::vector<ObjectCalcer*> tqparents = point->tqparents(); - assert( tqparents.size() == 2 ); - assert ( tqparents[0]->imp()->inherits( DoubleImp::stype() ) ); - dataobj = tqparents[0]; - - tqparents.clear(); - tqparents.push_back( dataobj ); - tqparents.push_back( v ); - point->setParents( tqparents ); + std::vector<ObjectCalcer*> parents = point->parents(); + assert( parents.size() == 2 ); + assert ( parents[0]->imp()->inherits( DoubleImp::stype() ) ); + dataobj = parents[0]; + + parents.clear(); + parents.push_back( dataobj ); + parents.push_back( v ); + point->setParents( parents ); assert( dynamic_cast<ObjectConstCalcer*>( dataobj ) ); static_cast<ObjectConstCalcer*>( dataobj )->setImp( diff --git a/kig/objects/object_factory.h b/kig/objects/object_factory.h index f3a28d66..d99cce8b 100644 --- a/kig/objects/object_factory.h +++ b/kig/objects/object_factory.h @@ -94,16 +94,16 @@ public: ObjectHolder* locus( ObjectCalcer* a, ObjectCalcer* b ) const; /** - * returns a label with text \p s at point \p c .. It ( and its tqparents ) + * returns a label with text \p s at point \p c .. It ( and its parents ) * is calced already... */ ObjectHolder* label( const TQString& s, const Coordinate& loc, - bool needframe, const std::vector<ObjectCalcer*>& tqparents, + bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; ObjectTypeCalcer* labelCalcer( const TQString& s, const Coordinate& loc, - bool needframe, const std::vector<ObjectCalcer*>& tqparents, + bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; /** @@ -113,7 +113,7 @@ public: ObjectTypeCalcer* attachedLabelCalcer( const TQString& s, ObjectCalcer* locationtqparent, const Coordinate& loc, bool needframe, - const std::vector<ObjectCalcer*>& tqparents, + const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; /** * this has been added because it comes handy when redefining @@ -127,7 +127,7 @@ public: ObjectHolder* attachedLabel( const TQString& s, ObjectCalcer* locationtqparent, const Coordinate& loc, bool needframe, - const std::vector<ObjectCalcer*>& tqparents, + const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; /** diff --git a/kig/objects/object_type.cc b/kig/objects/object_type.cc index 93634b63..ea85e4f8 100644 --- a/kig/objects/object_type.cc +++ b/kig/objects/object_type.cc @@ -71,9 +71,9 @@ ArgsParserObjectType::ArgsParserObjectType( const char fulltypename[], { } -const ObjectImpType* ArgsParserObjectType::impRequirement( const ObjectImp* o, const Args& tqparents ) const +const ObjectImpType* ArgsParserObjectType::impRequirement( const ObjectImp* o, const Args& parents ) const { - return margsparser.impRequirement( o, tqparents ); + return margsparser.impRequirement( o, parents ); } const ArgsParser& ArgsParserObjectType::argsParser() const @@ -118,8 +118,8 @@ std::vector<ObjectCalcer*> ObjectType::movableParents( const ObjectTypeCalcer& ) return std::vector<ObjectCalcer*>(); } -bool ArgsParserObjectType::isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const +bool ArgsParserObjectType::isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const { - return margsparser.isDefinedOnOrThrough( o, tqparents ); + return margsparser.isDefinedOnOrThrough( o, parents ); } diff --git a/kig/objects/object_type.h b/kig/objects/object_type.h index 60b32026..54471e46 100644 --- a/kig/objects/object_type.h +++ b/kig/objects/object_type.h @@ -45,7 +45,7 @@ public: virtual bool inherits( int type ) const; - virtual ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const = 0; + virtual ObjectImp* calc( const Args& parents, const KigDocument& d ) const = 0; virtual bool canMove( const ObjectTypeCalcer& ourobj ) const; virtual bool isFreelyTranslatable( const ObjectTypeCalcer& ourobj ) const; @@ -57,19 +57,19 @@ public: const char* fullName() const; /** - * Supposing that \p tqparents would be given as tqparents to + * Supposing that \p parents would be given as parents to * this type's calc function, this function returns the ObjectImp id - * that \p o should at least have.. ( \p o should be part of \p tqparents ) + * that \p o should at least have.. ( \p o should be part of \p parents ) */ - virtual const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const = 0; + virtual const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const = 0; /** - * Supposing that \p tqparents would be given as tqparents to this type's + * Supposing that \p parents would be given as parents to this type's * calc function, this function returns whether the returned * ObjectImp will be, by construction, on \p o ( if \p o is a curve ), or * through \p o ( if \p o is a point ). */ - virtual bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const = 0; + virtual bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const = 0; /** * returns the ObjectImp id of the ObjectImp's produced by this @@ -108,7 +108,7 @@ public: /** * This is a convenience subclass of ObjectType that a type should - * inherit from if its tqparents can be specified in an ArgsParser.. + * inherit from if its parents can be specified in an ArgsParser.. */ class ArgsParserObjectType : public ObjectType @@ -119,8 +119,8 @@ protected: const struct ArgsParser::spec argsspec[], int n ); public: - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; const ArgsParser& argsParser() const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& args ) const; diff --git a/kig/objects/other_type.cc b/kig/objects/other_type.cc index 7d632524..80986e82 100644 --- a/kig/objects/other_type.cc +++ b/kig/objects/other_type.cc @@ -103,10 +103,10 @@ bool CopyObjectType::inherits( int ) const return false; } -ObjectImp* CopyObjectType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* CopyObjectType::calc( const Args& parents, const KigDocument& ) const { - assert( tqparents.size() == 1 ); - return tqparents[0]->copy(); + assert( parents.size() == 1 ); + return parents[0]->copy(); } const ObjectImpType* CopyObjectType::impRequirement( const ObjectImp*, const Args& ) const @@ -120,19 +120,19 @@ const ObjectImpType* CopyObjectType::resultId() const return ObjectImp::stype(); } -const ObjectImpType* LocusType::impRequirement( const ObjectImp* o, const Args& tqparents ) const +const ObjectImpType* LocusType::impRequirement( const ObjectImp* o, const Args& parents ) const { - assert( tqparents.size() >= 2 ); - Args firsttwo( tqparents.begin(), tqparents.begin() + 2 ); - if ( o == tqparents[0] || o == tqparents[1] ) + assert( parents.size() >= 2 ); + Args firsttwo( parents.begin(), parents.begin() + 2 ); + if ( o == parents[0] || o == parents[1] ) return margsparser.impRequirement( o, firsttwo ); else { - const HierarchyImp* h = dynamic_cast<const HierarchyImp*>( tqparents[0] ); + const HierarchyImp* h = dynamic_cast<const HierarchyImp*>( parents[0] ); if ( h ) { PointImp* p = new PointImp( Coordinate() ); - Args hargs( tqparents.begin()+ 2, tqparents.end() ); + Args hargs( parents.begin()+ 2, parents.end() ); hargs.push_back( p ); ArgsParser hparser = h->data().argParser(); const ObjectImpType* ret = hparser.impRequirement( o, hargs ); diff --git a/kig/objects/other_type.h b/kig/objects/other_type.h index f8f24209..6bbcead1 100644 --- a/kig/objects/other_type.h +++ b/kig/objects/other_type.h @@ -32,7 +32,7 @@ public: ObjectImp* calc( const Args& args, const KigDocument& ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; bool inherits( int type ) const; const ObjectImpType* resultId() const; @@ -50,9 +50,9 @@ protected: public: static CopyObjectType* instance(); bool inherits( int type ) const; - ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + ObjectImp* calc( const Args& parents, const KigDocument& d ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; const ObjectImpType* resultId() const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& os ) const; Args sortArgs( const Args& args ) const; diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc index 74fc9d37..f1c59ac4 100644 --- a/kig/objects/point_type.cc +++ b/kig/objects/point_type.cc @@ -52,12 +52,12 @@ FixedPointType::~FixedPointType() { } -ObjectImp* FixedPointType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* FixedPointType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - double a = static_cast<const DoubleImp*>( tqparents[0] )->data(); - double b = static_cast<const DoubleImp*>( tqparents[1] )->data(); + double a = static_cast<const DoubleImp*>( parents[0] )->data(); + double b = static_cast<const DoubleImp*>( parents[1] )->data(); return new PointImp( Coordinate( a, b ) ); } @@ -80,14 +80,14 @@ RelativePointType::~RelativePointType() { } -ObjectImp* RelativePointType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* RelativePointType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - if ( ! tqparents[2]->attachPoint().valid() ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + if ( ! parents[2]->attachPoint().valid() ) return new InvalidImp; - Coordinate reference = static_cast<const ObjectImp*>( tqparents[2] )->attachPoint(); - double a = static_cast<const DoubleImp*>( tqparents[0] )->data(); - double b = static_cast<const DoubleImp*>( tqparents[1] )->data(); + Coordinate reference = static_cast<const ObjectImp*>( parents[2] )->attachPoint(); + double a = static_cast<const DoubleImp*>( parents[0] )->data(); + double b = static_cast<const DoubleImp*>( parents[1] )->data(); return new PointImp( reference + Coordinate( a, b ) ); } @@ -109,12 +109,12 @@ const CursorPointType* CursorPointType::instance() return &t; } -ObjectImp* CursorPointType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* CursorPointType::calc( const Args& parents, const KigDocument& ) const { - assert ( tqparents[0]->inherits( DoubleImp::stype() ) ); - assert ( tqparents[1]->inherits( DoubleImp::stype() ) ); - double a = static_cast<const DoubleImp*>( tqparents[0] )->data(); - double b = static_cast<const DoubleImp*>( tqparents[1] )->data(); + assert ( parents[0]->inherits( DoubleImp::stype() ) ); + assert ( parents[1]->inherits( DoubleImp::stype() ) ); + double a = static_cast<const DoubleImp*>( parents[0] )->data(); + double b = static_cast<const DoubleImp*>( parents[1] )->data(); return new BogusPointImp( Coordinate( a, b ) ); } @@ -124,12 +124,12 @@ const ObjectImpType* CursorPointType::resultId() const return BogusPointImp::stype(); } -ObjectImp* ConstrainedPointType::calc( const Args& tqparents, const KigDocument& doc ) const +ObjectImp* ConstrainedPointType::calc( const Args& parents, const KigDocument& doc ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - double param = static_cast<const DoubleImp*>( tqparents[0] )->data(); - const Coordinate nc = static_cast<const CurveImp*>( tqparents[1] )->getPoint( param, doc ); + double param = static_cast<const DoubleImp*>( parents[0] )->data(); + const Coordinate nc = static_cast<const CurveImp*>( parents[1] )->getPoint( param, doc ); if ( nc.valid() ) return new PointImp( nc ); else return new InvalidImp; } @@ -155,7 +155,7 @@ void FixedPointType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, const KigDocument& ) const { // fetch the old coord..; - std::vector<ObjectCalcer*> pa = ourobj.tqparents(); + std::vector<ObjectCalcer*> pa = ourobj.parents(); assert( margsparser.checkArgs( pa ) ); assert( dynamic_cast<ObjectConstCalcer*>( pa.front() ) ); assert( dynamic_cast<ObjectConstCalcer*>( pa.back() ) ); @@ -173,7 +173,7 @@ void RelativePointType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, // fetch the attach point..; // this routine is tightly paired with what moveReferencePoint returns! // right now moveReferencePoint always returns the origin - std::vector<ObjectCalcer*> pa = ourobj.tqparents(); + std::vector<ObjectCalcer*> pa = ourobj.parents(); assert( margsparser.checkArgs( pa ) ); assert( dynamic_cast<ObjectConstCalcer*>( pa[0] ) ); assert( dynamic_cast<ObjectConstCalcer*>( pa[1] ) ); @@ -192,7 +192,7 @@ void CursorPointType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, { // fetch the old coord..; - std::vector<ObjectCalcer*> pa = ourobj.tqparents(); + std::vector<ObjectCalcer*> pa = ourobj.parents(); assert( pa.size() == 2 ); assert( dynamic_cast<ObjectConstCalcer*>( pa.front() ) ); assert( dynamic_cast<ObjectConstCalcer*>( pa.back() ) ); @@ -208,12 +208,12 @@ void ConstrainedPointType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, const KigDocument& d ) const { // fetch the CurveImp.. - std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); - assert( margsparser.checkArgs( tqparents ) ); + std::vector<ObjectCalcer*> parents = ourobj.parents(); + assert( margsparser.checkArgs( parents ) ); - assert( dynamic_cast<ObjectConstCalcer*>( tqparents[0] ) ); - ObjectConstCalcer* paramo = static_cast<ObjectConstCalcer*>( tqparents[0] ); - const CurveImp* ci = static_cast<const CurveImp*>( tqparents[1]->imp() ); + assert( dynamic_cast<ObjectConstCalcer*>( parents[0] ) ); + ObjectConstCalcer* paramo = static_cast<ObjectConstCalcer*>( parents[0] ); + const CurveImp* ci = static_cast<const CurveImp*>( parents[1]->imp() ); // fetch the new param.. const double np = ci->getParam( to, d ); @@ -427,11 +427,11 @@ void ConstrainedPointType::executeAction( break; case 0: { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - assert( dynamic_cast<ObjectConstCalcer*>( tqparents[0] ) && - tqparents[0]->imp()->inherits( DoubleImp::stype() ) ); + std::vector<ObjectCalcer*> parents = o.parents(); + assert( dynamic_cast<ObjectConstCalcer*>( parents[0] ) && + parents[0]->imp()->inherits( DoubleImp::stype() ) ); - ObjectConstCalcer* po = static_cast<ObjectConstCalcer*>( tqparents[0] ); + ObjectConstCalcer* po = static_cast<ObjectConstCalcer*>( parents[0] ); double oldp = static_cast<const DoubleImp*>( po->imp() )->data(); bool ok = true; @@ -440,7 +440,7 @@ void ConstrainedPointType::executeAction( oldp, &w, &ok, 0, 1, 4 ); if ( ! ok ) return; - MonitorDataObjects mon( tqparents ); + MonitorDataObjects mon( parents ); po->setImp( new DoubleImp( newp ) ); KigCommand* kc = new KigCommand( d, i18n( "Change Parameter of Constrained Point" ) ); mon.finish( kc ); @@ -473,46 +473,46 @@ const Coordinate ConstrainedPointType::moveReferencePoint( const ObjectTypeCalce std::vector<ObjectCalcer*> FixedPointType::movableParents( const ObjectTypeCalcer& ourobj ) const { - return ourobj.tqparents(); + return ourobj.parents(); } std::vector<ObjectCalcer*> RelativePointType::movableParents( const ObjectTypeCalcer& ourobj ) const { std::vector<ObjectCalcer*> ret; - ret.push_back( ourobj.tqparents()[0] ); - ret.push_back( ourobj.tqparents()[1] ); + ret.push_back( ourobj.parents()[0] ); + ret.push_back( ourobj.parents()[1] ); return ret; } std::vector<ObjectCalcer*> ConstrainedPointType::movableParents( const ObjectTypeCalcer& ourobj ) const { std::vector<ObjectCalcer*> ret; - ret.push_back( ourobj.tqparents()[0] ); + ret.push_back( ourobj.parents()[0] ); return ret; } /* ----------------- Transport of measure ------------------------------ */ -ObjectImp* MeasureTransportType::calc( const Args& tqparents, const KigDocument& doc ) const +ObjectImp* MeasureTransportType::calc( const Args& parents, const KigDocument& doc ) const { double measure; - if ( tqparents.size() != 3 ) return new InvalidImp; + if ( parents.size() != 3 ) return new InvalidImp; - if ( tqparents[0]->inherits (SegmentImp::stype()) ) + if ( parents[0]->inherits (SegmentImp::stype()) ) { - const SegmentImp* s = static_cast<const SegmentImp*>( tqparents[0] ); + const SegmentImp* s = static_cast<const SegmentImp*>( parents[0] ); measure = s->length(); - } else if ( tqparents[0]->inherits (ArcImp::stype()) ) + } else if ( parents[0]->inherits (ArcImp::stype()) ) { - const ArcImp* s = static_cast<const ArcImp*>( tqparents[0] ); + const ArcImp* s = static_cast<const ArcImp*>( parents[0] ); measure = s->radius()*s->angle(); } else return new InvalidImp; - const Coordinate& p = static_cast<const PointImp*>( tqparents[2] )->coordinate(); - if ( tqparents[1]->inherits (LineImp::stype()) ) + const Coordinate& p = static_cast<const PointImp*>( parents[2] )->coordinate(); + if ( parents[1]->inherits (LineImp::stype()) ) { - const LineImp* c = static_cast<const LineImp*>( tqparents[1] ); + const LineImp* c = static_cast<const LineImp*>( parents[1] ); if ( !c->containsPoint( p, doc ) ) return new InvalidImp; @@ -523,9 +523,9 @@ ObjectImp* MeasureTransportType::calc( const Args& tqparents, const KigDocument& if ( nc.valid() ) return new PointImp( nc ); else return new InvalidImp; - } else if ( tqparents[1]->inherits (CircleImp::stype()) ) + } else if ( parents[1]->inherits (CircleImp::stype()) ) { - const CircleImp* c = static_cast<const CircleImp*>( tqparents[1] ); + const CircleImp* c = static_cast<const CircleImp*>( parents[1] ); if ( !c->containsPoint( p, doc ) ) return new InvalidImp; @@ -607,17 +607,17 @@ Args MeasureTransportType::sortArgs( const Args& args ) const /* - transport of measure (old, for compatibility with prev. kig files) - */ -ObjectImp* MeasureTransportTypeOld::calc( const Args& tqparents, const KigDocument& doc ) const +ObjectImp* MeasureTransportTypeOld::calc( const Args& parents, const KigDocument& doc ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const CircleImp* c = static_cast<const CircleImp*>( tqparents[0] ); - const Coordinate& p = static_cast<const PointImp*>( tqparents[1] )->coordinate(); + const CircleImp* c = static_cast<const CircleImp*>( parents[0] ); + const Coordinate& p = static_cast<const PointImp*>( parents[1] )->coordinate(); if ( !c->containsPoint( p, doc ) ) return new InvalidImp; - const SegmentImp* s = static_cast<const SegmentImp*>( tqparents[2] ); + const SegmentImp* s = static_cast<const SegmentImp*>( parents[2] ); double param = c->getParam( p, doc ); double measure = s->length(); measure /= 2*c->radius()*M_PI; diff --git a/kig/objects/point_type.h b/kig/objects/point_type.h index d1fb7674..69a7e2e8 100644 --- a/kig/objects/point_type.h +++ b/kig/objects/point_type.h @@ -34,7 +34,7 @@ public: bool inherits( int type ) const; - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; bool canMove( const ObjectTypeCalcer& ourobj ) const; bool isFreelyTranslatable( const ObjectTypeCalcer& ourobj ) const; std::vector<ObjectCalcer*> movableParents( const ObjectTypeCalcer& ourobj ) const; @@ -58,7 +58,7 @@ class RelativePointType public: static const RelativePointType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; bool canMove( const ObjectTypeCalcer& ourobj ) const; bool isFreelyTranslatable( const ObjectTypeCalcer& ourobj ) const; std::vector<ObjectCalcer*> movableParents( const ObjectTypeCalcer& ourobj ) const; @@ -80,10 +80,10 @@ class CursorPointType public: static const CursorPointType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& args ) const; Args sortArgs( const Args& args ) const; bool canMove( const ObjectTypeCalcer& ourobj ) const; @@ -102,7 +102,7 @@ public: bool inherits( int type ) const; - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; bool canMove( const ObjectTypeCalcer& ourobj ) const; bool isFreelyTranslatable( const ObjectTypeCalcer& ourobj ) const; @@ -136,10 +136,10 @@ class MeasureTransportType public: static const MeasureTransportType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& args )const; Args sortArgs( const Args& args ) const; }; @@ -152,7 +152,7 @@ class MeasureTransportTypeOld public: static const MeasureTransportTypeOld* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; diff --git a/kig/objects/polygon_type.cc b/kig/objects/polygon_type.cc index 55aa4cd8..bca867da 100644 --- a/kig/objects/polygon_type.cc +++ b/kig/objects/polygon_type.cc @@ -60,13 +60,13 @@ const TriangleB3PType* TriangleB3PType::instance() return &s; } -ObjectImp* TriangleB3PType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* TriangleB3PType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents, 1 ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents, 1 ) ) return new InvalidImp; std::vector<Coordinate> points; Coordinate centerofmass3 = Coordinate( 0, 0 ); - for ( Args::const_iterator i = tqparents.begin(); i != tqparents.end(); ++i ) + for ( Args::const_iterator i = parents.begin(); i != parents.end(); ++i ) { Coordinate point = static_cast<const PointImp*>( *i )->coordinate(); centerofmass3 += point; @@ -87,46 +87,46 @@ bool TriangleB3PType::canMove( const ObjectTypeCalcer& o ) const bool TriangleB3PType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - return tqparents[0]->isFreelyTranslatable() && - tqparents[1]->isFreelyTranslatable() && - tqparents[2]->isFreelyTranslatable(); + std::vector<ObjectCalcer*> parents = o.parents(); + return parents[0]->isFreelyTranslatable() && + parents[1]->isFreelyTranslatable() && + parents[2]->isFreelyTranslatable(); } void TriangleB3PType::move( ObjectTypeCalcer& o, const Coordinate& to, const KigDocument& d ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - assert( margsparser.checkArgs( tqparents ) ); - const Coordinate a = static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); - const Coordinate b = static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate(); - const Coordinate c = static_cast<const PointImp*>( tqparents[2]->imp() )->coordinate(); - if ( tqparents[0]->canMove() ) - tqparents[0]->move( to, d ); - if ( tqparents[1]->canMove() ) - tqparents[1]->move( to + b - a, d ); - if ( tqparents[2]->canMove() ) - tqparents[2]->move( to + c - a, d ); + std::vector<ObjectCalcer*> parents = o.parents(); + assert( margsparser.checkArgs( parents ) ); + const Coordinate a = static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); + const Coordinate b = static_cast<const PointImp*>( parents[1]->imp() )->coordinate(); + const Coordinate c = static_cast<const PointImp*>( parents[2]->imp() )->coordinate(); + if ( parents[0]->canMove() ) + parents[0]->move( to, d ); + if ( parents[1]->canMove() ) + parents[1]->move( to + b - a, d ); + if ( parents[2]->canMove() ) + parents[2]->move( to + c - a, d ); } const Coordinate TriangleB3PType::moveReferencePoint( const ObjectTypeCalcer& o ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - assert( margsparser.checkArgs( tqparents ) ); - return static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); + std::vector<ObjectCalcer*> parents = o.parents(); + assert( margsparser.checkArgs( parents ) ); + return static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); } std::vector<ObjectCalcer*> TriangleB3PType::movableParents( const ObjectTypeCalcer& ourobj ) const { - std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); + std::vector<ObjectCalcer*> parents = ourobj.parents(); std::set<ObjectCalcer*> ret; - std::vector<ObjectCalcer*> tmp = tqparents[0]->movableParents(); + std::vector<ObjectCalcer*> tmp = parents[0]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - tmp = tqparents[1]->movableParents(); + tmp = parents[1]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - tmp = tqparents[2]->movableParents(); + tmp = parents[2]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - ret.insert( tqparents.begin(), tqparents.end() ); + ret.insert( parents.begin(), parents.end() ); return std::vector<ObjectCalcer*>( ret.begin(), ret.end() ); } @@ -151,11 +151,11 @@ const PolygonBNPType* PolygonBNPType::instance() return &s; } -ObjectImp* PolygonBNPType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* PolygonBNPType::calc( const Args& parents, const KigDocument& ) const { - uint count = tqparents.size(); + uint count = parents.size(); assert (count >= 3); /* non sono ammessi poligoni con meno di tre lati */ -// if ( tqparents[0] != tqparents[count] ) return new InvalidImp; +// if ( parents[0] != parents[count] ) return new InvalidImp; std::vector<Coordinate> points; uint npoints = 0; @@ -164,8 +164,8 @@ ObjectImp* PolygonBNPType::calc( const Args& tqparents, const KigDocument& ) con for ( uint i = 0; i < count; ++i ) { npoints++; - if ( ! tqparents[i]->inherits( PointImp::stype() ) ) return new InvalidImp; - Coordinate point = static_cast<const PointImp*>( tqparents[i] )->coordinate(); + if ( ! parents[i]->inherits( PointImp::stype() ) ) return new InvalidImp; + Coordinate point = static_cast<const PointImp*>( parents[i] )->coordinate(); centerofmassn += point; points.push_back( point ); } @@ -204,10 +204,10 @@ bool PolygonBNPType::canMove( const ObjectTypeCalcer& o ) const bool PolygonBNPType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - for ( uint i = 0; i < tqparents.size(); ++i ) + std::vector<ObjectCalcer*> parents = o.parents(); + for ( uint i = 0; i < parents.size(); ++i ) { - if ( !tqparents[i]->isFreelyTranslatable() ) return false; + if ( !parents[i]->isFreelyTranslatable() ) return false; } return true; } @@ -215,32 +215,32 @@ bool PolygonBNPType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const void PolygonBNPType::move( ObjectTypeCalcer& o, const Coordinate& to, const KigDocument& d ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - const Coordinate ref = static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); - for ( uint i = 0; i < tqparents.size(); ++i ) + std::vector<ObjectCalcer*> parents = o.parents(); + const Coordinate ref = static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); + for ( uint i = 0; i < parents.size(); ++i ) { - const Coordinate a = static_cast<const PointImp*>( tqparents[i]->imp() )->coordinate(); - tqparents[i]->move( to + a - ref, d ); + const Coordinate a = static_cast<const PointImp*>( parents[i]->imp() )->coordinate(); + parents[i]->move( to + a - ref, d ); } } const Coordinate PolygonBNPType::moveReferencePoint( const ObjectTypeCalcer& o ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - return static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); + std::vector<ObjectCalcer*> parents = o.parents(); + return static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); } std::vector<ObjectCalcer*> PolygonBNPType::movableParents( const ObjectTypeCalcer& ourobj ) const { - std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); + std::vector<ObjectCalcer*> parents = ourobj.parents(); std::set<ObjectCalcer*> ret; - for ( uint i = 0; i < tqparents.size(); ++i ) + for ( uint i = 0; i < parents.size(); ++i ) { - std::vector<ObjectCalcer*> tmp = tqparents[i]->movableParents(); + std::vector<ObjectCalcer*> tmp = parents[i]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); } - ret.insert( tqparents.begin(), tqparents.end() ); + ret.insert( parents.begin(), parents.end() ); return std::vector<ObjectCalcer*>( ret.begin(), ret.end() ); } @@ -281,26 +281,26 @@ const PolygonBCVType* PolygonBCVType::instance() return &s; } -ObjectImp* PolygonBCVType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* PolygonBCVType::calc( const Args& parents, const KigDocument& ) const { - if ( tqparents.size() < 3 || tqparents.size() > 4 ) return new InvalidImp; + if ( parents.size() < 3 || parents.size() > 4 ) return new InvalidImp; - if ( ( ! tqparents[0]->inherits( PointImp::stype() ) ) || - ( ! tqparents[1]->inherits( PointImp::stype() ) ) || - ( ! tqparents[2]->inherits( IntImp::stype() ) ) ) + if ( ( ! parents[0]->inherits( PointImp::stype() ) ) || + ( ! parents[1]->inherits( PointImp::stype() ) ) || + ( ! parents[2]->inherits( IntImp::stype() ) ) ) return new InvalidImp; const Coordinate center = - static_cast<const PointImp*>( tqparents[0] )->coordinate(); + static_cast<const PointImp*>( parents[0] )->coordinate(); const Coordinate vertex = - static_cast<const PointImp*>( tqparents[1] )->coordinate(); + static_cast<const PointImp*>( parents[1] )->coordinate(); const int sides = - static_cast<const IntImp*>( tqparents[2] )->data(); + static_cast<const IntImp*>( parents[2] )->data(); int twist = 1; - if ( tqparents.size() == 4 ) + if ( parents.size() == 4 ) { - if ( ! tqparents[3]->inherits( IntImp::stype() ) ) return new InvalidImp; - twist = static_cast<const IntImp*>( tqparents[3] )->data(); + if ( ! parents[3]->inherits( IntImp::stype() ) ) return new InvalidImp; + twist = static_cast<const IntImp*>( parents[3] )->data(); } std::vector<Coordinate> vertexes; @@ -359,43 +359,43 @@ bool PolygonBCVType::canMove( const ObjectTypeCalcer& o ) const bool PolygonBCVType::isFreelyTranslatable( const ObjectTypeCalcer& o ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - return tqparents[0]->isFreelyTranslatable() && - tqparents[1]->isFreelyTranslatable(); + std::vector<ObjectCalcer*> parents = o.parents(); + return parents[0]->isFreelyTranslatable() && + parents[1]->isFreelyTranslatable(); } void PolygonBCVType::move( ObjectTypeCalcer& o, const Coordinate& to, const KigDocument& d ) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - // assert( margsparser.checkArgs( tqparents ) ); - if ( ! tqparents[0]->imp()->inherits( PointImp::stype() ) || - ! tqparents[1]->imp()->inherits( PointImp::stype() ) ) return; + std::vector<ObjectCalcer*> parents = o.parents(); + // assert( margsparser.checkArgs( parents ) ); + if ( ! parents[0]->imp()->inherits( PointImp::stype() ) || + ! parents[1]->imp()->inherits( PointImp::stype() ) ) return; - const Coordinate a = static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); - const Coordinate b = static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate(); - tqparents[0]->move( to, d ); - tqparents[1]->move( to + b - a, d ); + const Coordinate a = static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); + const Coordinate b = static_cast<const PointImp*>( parents[1]->imp() )->coordinate(); + parents[0]->move( to, d ); + parents[1]->move( to + b - a, d ); } const Coordinate PolygonBCVType::moveReferencePoint( const ObjectTypeCalcer& o) const { - std::vector<ObjectCalcer*> tqparents = o.tqparents(); - // assert( margsparser.checkArgs( tqparents ) ); - if ( ! tqparents[0]->imp()->inherits( PointImp::stype() ) ) return Coordinate::invalidCoord(); + std::vector<ObjectCalcer*> parents = o.parents(); + // assert( margsparser.checkArgs( parents ) ); + if ( ! parents[0]->imp()->inherits( PointImp::stype() ) ) return Coordinate::invalidCoord(); - return static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate(); + return static_cast<const PointImp*>( parents[0]->imp() )->coordinate(); } std::vector<ObjectCalcer*> PolygonBCVType::movableParents( const ObjectTypeCalcer& ourobj ) const { - std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); + std::vector<ObjectCalcer*> parents = ourobj.parents(); std::set<ObjectCalcer*> ret; - std::vector<ObjectCalcer*> tmp = tqparents[0]->movableParents(); + std::vector<ObjectCalcer*> tmp = parents[0]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - tmp = tqparents[1]->movableParents(); + tmp = parents[1]->movableParents(); ret.insert( tmp.begin(), tmp.end() ); - ret.insert( &tqparents[0], &tqparents[1] ); + ret.insert( &parents[0], &parents[1] ); return std::vector<ObjectCalcer*>( ret.begin(), ret.end() ); } @@ -443,23 +443,23 @@ const PolygonLineIntersectionType* PolygonLineIntersectionType::instance() * vertex of the polygon. */ -ObjectImp* PolygonLineIntersectionType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* PolygonLineIntersectionType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const PolygonImp* polygon = static_cast<const PolygonImp*>( tqparents[0] ); + const PolygonImp* polygon = static_cast<const PolygonImp*>( parents[0] ); const std::vector<Coordinate> ppoints = polygon->points(); - const LineData line = static_cast<const AbstractLineImp*>( tqparents[1] )->data(); + const LineData line = static_cast<const AbstractLineImp*>( parents[1] )->data(); Coordinate intersections[2]; uint whichintersection = 0; bool boundleft = false; bool boundright = false; - if ( tqparents[1]->inherits( SegmentImp::stype() ) ) + if ( parents[1]->inherits( SegmentImp::stype() ) ) { boundleft = boundright = true; } - if ( tqparents[1]->inherits( RayImp::stype() ) ) + if ( parents[1]->inherits( RayImp::stype() ) ) { boundleft = true; } @@ -562,12 +562,12 @@ const PolygonVertexType* PolygonVertexType::instance() return &t; } -ObjectImp* PolygonVertexType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* PolygonVertexType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const std::vector<Coordinate> ppoints = static_cast<const PolygonImp*>( tqparents[0] )->points(); - const uint i = static_cast<const IntImp*>( tqparents[1] )->data(); + const std::vector<Coordinate> ppoints = static_cast<const PolygonImp*>( parents[0] )->points(); + const uint i = static_cast<const IntImp*>( parents[1] )->data(); if ( i >= ppoints.size() ) return new InvalidImp; @@ -605,12 +605,12 @@ const PolygonSideType* PolygonSideType::instance() return &t; } -ObjectImp* PolygonSideType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* PolygonSideType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const std::vector<Coordinate> ppoints = static_cast<const PolygonImp*>( tqparents[0] )->points(); - const uint i = static_cast<const IntImp*>( tqparents[1] )->data(); + const std::vector<Coordinate> ppoints = static_cast<const PolygonImp*>( parents[0] )->points(); + const uint i = static_cast<const IntImp*>( parents[1] )->data(); if ( i >= ppoints.size() ) return new InvalidImp; @@ -650,11 +650,11 @@ const ConvexHullType* ConvexHullType::instance() return &t; } -ObjectImp* ConvexHullType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConvexHullType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; - const std::vector<Coordinate> ppoints = static_cast<const PolygonImp*>( tqparents[0] )->points(); + const std::vector<Coordinate> ppoints = static_cast<const PolygonImp*>( parents[0] )->points(); if ( ppoints.size() < 3 ) return new InvalidImp; diff --git a/kig/objects/polygon_type.h b/kig/objects/polygon_type.h index 09a77da8..a49100bd 100644 --- a/kig/objects/polygon_type.h +++ b/kig/objects/polygon_type.h @@ -31,7 +31,7 @@ class TriangleB3PType public: static const TriangleB3PType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; bool canMove( const ObjectTypeCalcer& o ) const; bool isFreelyTranslatable( const ObjectTypeCalcer& o ) const; @@ -52,10 +52,10 @@ class PolygonBNPType public: static const PolygonBNPType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& args ) const; Args sortArgs( const Args& args ) const; @@ -78,11 +78,11 @@ class PolygonBCVType public: static const PolygonBCVType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& args ) const; Args sortArgs( const Args& args ) const; bool canMove( const ObjectTypeCalcer& o ) const; @@ -100,7 +100,7 @@ class PolygonLineIntersectionType ~PolygonLineIntersectionType(); public: static const PolygonLineIntersectionType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -111,7 +111,7 @@ class PolygonVertexType ~PolygonVertexType(); public: static const PolygonVertexType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -122,7 +122,7 @@ class PolygonSideType ~PolygonSideType(); public: static const PolygonSideType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -133,7 +133,7 @@ class ConvexHullType ~ConvexHullType(); public: static const ConvexHullType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; #endif diff --git a/kig/objects/special_calcers.cc b/kig/objects/special_calcers.cc index 281017b5..e70bd4e9 100644 --- a/kig/objects/special_calcers.cc +++ b/kig/objects/special_calcers.cc @@ -26,7 +26,7 @@ static const ArgsParser::spec argsspecMeasureTransport[] = static ArgsParser measuretransportargsparser( argsspecMeasureTransport, 3 ); -std::vector<ObjectCalcer*> MeasureTransportCalcer::tqparents() const +std::vector<ObjectCalcer*> MeasureTransportCalcer::parents() const { std::vector<ObjectCalcer*> ret; ret.push_back( mcircle ); @@ -46,7 +46,7 @@ MeasureTransportCalcer::~MeasureTransportCalcer() void MeasureTransportCalcer::calc( const KigDocument& ) { - if ( ! measuretransportargsparser.checkArgs( tqparents() ) ) + if ( ! measuretransportargsparser.checkArgs( parents() ) ) return new InvalidImp(); if ( ! isPointOnCurve( mpoint, mcircle ) ) diff --git a/kig/objects/special_calcers.h b/kig/objects/special_calcers.h index 812d7ee5..640587cc 100644 --- a/kig/objects/special_calcers.h +++ b/kig/objects/special_calcers.h @@ -29,7 +29,7 @@ public: MeasureTransportCalcer(ObjectCalcer* circle, ObjectCalcer* point, ObjectCalcer* segment ); ~MeasureTransportCalcer(); - std::vector<ObjectCalcer*> tqparents() const; + std::vector<ObjectCalcer*> parents() const; void calc( const KigDocument& ); const ObjectImpType* impRequirement( ObjectCalcer* o, const std::vector<ObjectCalcer*>& os ) const; diff --git a/kig/objects/tests_type.cc b/kig/objects/tests_type.cc index a0a072bf..e85c111e 100644 --- a/kig/objects/tests_type.cc +++ b/kig/objects/tests_type.cc @@ -51,11 +51,11 @@ const AreParallelType* AreParallelType::instance() return &t; } -ObjectImp* AreParallelType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* AreParallelType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const LineData& l1 = static_cast<const AbstractLineImp*>( tqparents[0] )->data(); - const LineData& l2 = static_cast<const AbstractLineImp*>( tqparents[1] )->data(); + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + const LineData& l1 = static_cast<const AbstractLineImp*>( parents[0] )->data(); + const LineData& l2 = static_cast<const AbstractLineImp*>( parents[1] )->data(); if ( l1.isParallelTo( l2 ) ) return new TestResultImp( i18n( "These lines are parallel." ) ); @@ -95,11 +95,11 @@ const AreOrthogonalType* AreOrthogonalType::instance() return &t; } -ObjectImp* AreOrthogonalType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* AreOrthogonalType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const LineData& l1 = static_cast<const AbstractLineImp*>( tqparents[0] )->data(); - const LineData& l2 = static_cast<const AbstractLineImp*>( tqparents[1] )->data(); + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + const LineData& l1 = static_cast<const AbstractLineImp*>( parents[0] )->data(); + const LineData& l2 = static_cast<const AbstractLineImp*>( parents[1] )->data(); if ( l1.isOrthogonalTo( l2 ) ) return new TestResultImp( i18n( "These lines are orthogonal." ) ); @@ -141,12 +141,12 @@ const AreCollinearType* AreCollinearType::instance() return &t; } -ObjectImp* AreCollinearType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* AreCollinearType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const Coordinate& p1 = static_cast<const PointImp*>( tqparents[0] )->coordinate(); - const Coordinate& p2 = static_cast<const PointImp*>( tqparents[1] )->coordinate(); - const Coordinate& p3 = static_cast<const PointImp*>( tqparents[2] )->coordinate(); + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + const Coordinate& p1 = static_cast<const PointImp*>( parents[0] )->coordinate(); + const Coordinate& p2 = static_cast<const PointImp*>( parents[1] )->coordinate(); + const Coordinate& p3 = static_cast<const PointImp*>( parents[2] )->coordinate(); if ( areCollinear( p1, p2, p3 ) ) return new TestResultImp( i18n( "These points are collinear." ) ); @@ -184,11 +184,11 @@ const ContainsTestType* ContainsTestType::instance() return &t; } -ObjectImp* ContainsTestType::calc( const Args& tqparents, const KigDocument& doc ) const +ObjectImp* ContainsTestType::calc( const Args& parents, const KigDocument& doc ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const Coordinate& p = static_cast<const PointImp*>( tqparents[0] )->coordinate(); - const CurveImp* c = static_cast<const CurveImp*>( tqparents[1] ); + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + const Coordinate& p = static_cast<const PointImp*>( parents[0] )->coordinate(); + const CurveImp* c = static_cast<const CurveImp*>( parents[1] ); if ( c->containsPoint( p, doc ) ) return new TestResultImp( i18n( "This curve contains the point." ) ); @@ -230,11 +230,11 @@ const InPolygonTestType* InPolygonTestType::instance() return &t; } -ObjectImp* InPolygonTestType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* InPolygonTestType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const Coordinate& p = static_cast<const PointImp*>( tqparents[0] )->coordinate(); - const PolygonImp* pol = static_cast<const PolygonImp*>( tqparents[1] ); + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + const Coordinate& p = static_cast<const PointImp*>( parents[0] )->coordinate(); + const PolygonImp* pol = static_cast<const PolygonImp*>( parents[1] ); if ( pol->isInPolygon( p ) ) return new TestResultImp( i18n( "This polygon contains the point." ) ); @@ -274,10 +274,10 @@ const ConvexPolygonTestType* ConvexPolygonTestType::instance() return &t; } -ObjectImp* ConvexPolygonTestType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* ConvexPolygonTestType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const PolygonImp* pol = static_cast<const PolygonImp*>( tqparents[0] ); + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + const PolygonImp* pol = static_cast<const PolygonImp*>( parents[0] ); if ( pol->isConvex() ) return new TestResultImp( i18n( "This polygon is convex." ) ); @@ -321,12 +321,12 @@ const SameDistanceType* SameDistanceType::instance() return &t; } -ObjectImp* SameDistanceType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* SameDistanceType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const Coordinate& p1 = static_cast<const PointImp*>( tqparents[0] )->coordinate(); - const Coordinate& p2 = static_cast<const PointImp*>( tqparents[1] )->coordinate(); - const Coordinate& p3 = static_cast<const PointImp*>( tqparents[2] )->coordinate(); + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + const Coordinate& p1 = static_cast<const PointImp*>( parents[0] )->coordinate(); + const Coordinate& p2 = static_cast<const PointImp*>( parents[1] )->coordinate(); + const Coordinate& p3 = static_cast<const PointImp*>( parents[2] )->coordinate(); if ( fabs( ( p1 - p2 ).length() - ( p1 - p3 ).length() ) < 10e-5 ) return new TestResultImp( i18n( "The two distances are the same." ) ); @@ -364,11 +364,11 @@ const VectorEqualityTestType* VectorEqualityTestType::instance() return &t; } -ObjectImp* VectorEqualityTestType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* VectorEqualityTestType::calc( const Args& parents, const KigDocument& ) const { - if ( ! margsparser.checkArgs( tqparents ) ) return new InvalidImp; - const Coordinate& v1 = static_cast<const VectorImp*>( tqparents[0] )->dir(); - const Coordinate& v2 = static_cast<const VectorImp*>( tqparents[1] )->dir(); + if ( ! margsparser.checkArgs( parents ) ) return new InvalidImp; + const Coordinate& v1 = static_cast<const VectorImp*>( parents[0] )->dir(); + const Coordinate& v2 = static_cast<const VectorImp*>( parents[1] )->dir(); if ( ( v1 - v2 ).length() < 10e-5 ) return new TestResultImp( i18n( "The two vectors are the same." ) ); diff --git a/kig/objects/tests_type.h b/kig/objects/tests_type.h index 4bc96f8c..7498fc4f 100644 --- a/kig/objects/tests_type.h +++ b/kig/objects/tests_type.h @@ -27,7 +27,7 @@ class AreParallelType ~AreParallelType(); public: static const AreParallelType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -38,7 +38,7 @@ class AreOrthogonalType ~AreOrthogonalType(); public: static const AreOrthogonalType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -49,7 +49,7 @@ class AreCollinearType ~AreCollinearType(); public: static const AreCollinearType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -60,7 +60,7 @@ class ContainsTestType ~ContainsTestType(); public: static const ContainsTestType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -71,7 +71,7 @@ class InPolygonTestType ~InPolygonTestType(); public: static const InPolygonTestType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -82,7 +82,7 @@ class ConvexPolygonTestType ~ConvexPolygonTestType(); public: static const ConvexPolygonTestType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -93,7 +93,7 @@ class SameDistanceType ~SameDistanceType(); public: static const SameDistanceType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; @@ -104,7 +104,7 @@ class VectorEqualityTestType ~VectorEqualityTestType(); public: static const VectorEqualityTestType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& ) const; + ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; }; diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cc index 5fc637bd..09e84c30 100644 --- a/kig/objects/text_type.cc +++ b/kig/objects/text_type.cc @@ -76,11 +76,11 @@ const ObjectImpType* TextType::impRequirement( const ObjectImp* o, const Args& a return ObjectImp::stype(); } -ObjectImp* TextType::calc( const Args& tqparents, const KigDocument& doc ) const +ObjectImp* TextType::calc( const Args& parents, const KigDocument& doc ) const { - if( tqparents.size() < 3 ) return new InvalidImp; - Args firstthree( tqparents.begin(), tqparents.begin() + 3 ); - Args varargs( tqparents.begin() + 3, tqparents.end() ); + if( parents.size() < 3 ) return new InvalidImp; + Args firstthree( parents.begin(), parents.begin() + 3 ); + Args varargs( parents.begin() + 3, parents.end() ); if ( ! mparser.checkArgs( firstthree ) ) return new InvalidImp; @@ -108,9 +108,9 @@ bool TextType::isFreelyTranslatable( const ObjectTypeCalcer& ) const void TextType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, const KigDocument& d ) const { - const std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); - assert( tqparents.size() >= 3 ); - const std::vector<ObjectCalcer*> firstthree( tqparents.begin(), tqparents.begin() + 3 ); + const std::vector<ObjectCalcer*> parents = ourobj.parents(); + assert( parents.size() >= 3 ); + const std::vector<ObjectCalcer*> firstthree( parents.begin(), parents.begin() + 3 ); if( dynamic_cast<ObjectConstCalcer*>( firstthree[1] ) ) { ObjectConstCalcer* c = static_cast<ObjectConstCalcer*>( firstthree[1] ); @@ -133,10 +133,10 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, KigPart& doc, KigWidget&, NormalMode& ) const { - std::vector<ObjectCalcer*> tqparents = c.tqparents(); - assert( tqparents.size() >= 3 ); + std::vector<ObjectCalcer*> parents = c.parents(); + assert( parents.size() >= 3 ); - std::vector<ObjectCalcer*> firstthree( tqparents.begin(), tqparents.begin() + 3 ); + std::vector<ObjectCalcer*> firstthree( parents.begin(), parents.begin() + 3 ); assert( mparser.checkArgs( firstthree ) ); assert( dynamic_cast<ObjectConstCalcer*>( firstthree[0] ) ); @@ -201,10 +201,10 @@ Args TextType::sortArgs( const Args& args ) const std::vector<ObjectCalcer*> TextType::movableParents( const ObjectTypeCalcer& ourobj ) const { - const std::vector<ObjectCalcer*> tqparents = ourobj.tqparents(); - assert( tqparents.size() >= 3 ); - std::vector<ObjectCalcer*> ret = tqparents[1]->movableParents(); - ret.push_back( tqparents[1] ); + const std::vector<ObjectCalcer*> parents = ourobj.parents(); + assert( parents.size() >= 3 ); + std::vector<ObjectCalcer*> ret = parents[1]->movableParents(); + ret.push_back( parents[1] ); return ret; } diff --git a/kig/objects/text_type.h b/kig/objects/text_type.h index 5968e040..8f97d4ea 100644 --- a/kig/objects/text_type.h +++ b/kig/objects/text_type.h @@ -29,11 +29,11 @@ class TextType public: static const TextType* instance(); - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; const ObjectImpType* resultId() const; - ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; + ObjectImp* calc( const Args& parents, const KigDocument& d ) const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& os ) const; Args sortArgs( const Args& args ) const; diff --git a/kig/scripting/newscriptwizardbase.ui b/kig/scripting/newscriptwizardbase.ui index c3020c00..8c58bd2e 100644 --- a/kig/scripting/newscriptwizardbase.ui +++ b/kig/scripting/newscriptwizardbase.ui @@ -74,7 +74,7 @@ in the Kig window and press "Next".</string> </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/kig/scripting/python_type.cc b/kig/scripting/python_type.cc index 0b73cda4..cc5a00ea 100644 --- a/kig/scripting/python_type.cc +++ b/kig/scripting/python_type.cc @@ -108,12 +108,12 @@ const ObjectImpType* PythonCompileType::resultId() const return PythonCompiledScriptImp::stype(); } -ObjectImp* PythonCompileType::calc( const Args& tqparents, const KigDocument& ) const +ObjectImp* PythonCompileType::calc( const Args& parents, const KigDocument& ) const { - assert( tqparents.size() == 1 ); - if ( !tqparents[0]->inherits( StringImp::stype() ) ) return new InvalidImp; + assert( parents.size() == 1 ); + if ( !parents[0]->inherits( StringImp::stype() ) ) return new InvalidImp; - const StringImp* si = static_cast<const StringImp*>( tqparents[0] ); + const StringImp* si = static_cast<const StringImp*>( parents[0] ); TQString s = si->data(); CompiledPythonScript cs = PythonScripter::instance()->compile( s.latin1() ); @@ -141,20 +141,20 @@ const PythonExecuteType* PythonExecuteType::instance() return &t; } -ObjectImp* PythonExecuteType::calc( const Args& tqparents, const KigDocument& d ) const +ObjectImp* PythonExecuteType::calc( const Args& parents, const KigDocument& d ) const { - assert( tqparents.size() >= 1 ); - if( !tqparents[0]->inherits( PythonCompiledScriptImp::stype() ) ) return new InvalidImp; + assert( parents.size() >= 1 ); + if( !parents[0]->inherits( PythonCompiledScriptImp::stype() ) ) return new InvalidImp; - CompiledPythonScript& script = static_cast<const PythonCompiledScriptImp*>( tqparents[0] )->data(); + CompiledPythonScript& script = static_cast<const PythonCompiledScriptImp*>( parents[0] )->data(); - Args args( tqparents.begin() + 1, tqparents.end() ); + Args args( parents.begin() + 1, parents.end() ); return script.calc( args, d ); } -const ObjectImpType* PythonExecuteType::impRequirement( const ObjectImp* o, const Args& tqparents ) const +const ObjectImpType* PythonExecuteType::impRequirement( const ObjectImp* o, const Args& parents ) const { - if ( o == tqparents[0] ) return PythonCompiledScriptImp::stype(); + if ( o == parents[0] ) return PythonCompiledScriptImp::stype(); else return ObjectImp::stype(); } diff --git a/kig/scripting/python_type.h b/kig/scripting/python_type.h index 871cfc17..db623ab6 100644 --- a/kig/scripting/python_type.h +++ b/kig/scripting/python_type.h @@ -28,10 +28,10 @@ class PythonCompileType public: static const PythonCompileType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; + ObjectImp* calc( const Args& parents, const KigDocument& d ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; const ObjectImpType* resultId() const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& args ) const; @@ -46,10 +46,10 @@ class PythonExecuteType public: static const PythonExecuteType* instance(); - ObjectImp* calc( const Args& tqparents, const KigDocument& d ) const; + ObjectImp* calc( const Args& parents, const KigDocument& d ) const; - const ObjectImpType* impRequirement( const ObjectImp* o, const Args& tqparents ) const; - bool isDefinedOnOrThrough( const ObjectImp* o, const Args& tqparents ) const; + const ObjectImpType* impRequirement( const ObjectImp* o, const Args& parents ) const; + bool isDefinedOnOrThrough( const ObjectImp* o, const Args& parents ) const; const ObjectImpType* resultId() const; std::vector<ObjectCalcer*> sortArgs( const std::vector<ObjectCalcer*>& args ) const; diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc index 2c6f4d80..945ad62f 100644 --- a/kig/scripting/script_mode.cc +++ b/kig/scripting/script_mode.cc @@ -275,10 +275,10 @@ ScriptEditMode::ScriptEditMode( ObjectTypeCalcer* exec_calc, KigPart& doc ) { mwawd = EnteringCode; - mexecargs = mexecuted->tqparents(); + mexecargs = mexecuted->parents(); assert( mexecargs.size() >= 1 ); - mcompiledargs = mexecargs[0]->tqparents(); + mcompiledargs = mexecargs[0]->parents(); assert( mcompiledargs.size() == 1 ); const ObjectImp* imp = static_cast<ObjectConstCalcer*>( mcompiledargs[0] )->imp(); diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui index f885ff5a..8695a10a 100644 --- a/kiten/configdictionariesbase.ui +++ b/kiten/configdictionariesbase.ui @@ -305,7 +305,7 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistview.h</includehint> diff --git a/kiten/configfont.ui b/kiten/configfont.ui index 90e68429..d198336a 100644 --- a/kiten/configfont.ui +++ b/kiten/configfont.ui @@ -26,7 +26,7 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontdialog.h</includehint> </includehints> diff --git a/kiten/configlearn.ui b/kiten/configlearn.ui index 94c3a286..00baf74e 100644 --- a/kiten/configlearn.ui +++ b/kiten/configlearn.ui @@ -157,5 +157,5 @@ <tabstop>kcfg_QuizOn</tabstop> <tabstop>kcfg_GuessOn</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kiten/configsearching.ui b/kiten/configsearching.ui index ab6f3339..b183b1e3 100644 --- a/kiten/configsearching.ui +++ b/kiten/configsearching.ui @@ -64,5 +64,5 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kiten/edict b/kiten/edict index b33f698d..6817cfb8 100644 --- a/kiten/edict +++ b/kiten/edict @@ -507,7 +507,7 @@ ¤ªÌß [¤ª¤â¤Á] /(uk) rice cakes/pounded tqmochi rice/ ¤ªÌç°ã¤¤ [¤ª¤«¤É¤Á¤¬¤¤] /(exp) barking up the wrong tree/calling at the wrong house/ ¤ªÌ줵¤ó [¤ª¤¸¤¤¤µ¤ó] /(n) grandfather/male senior-citizen/ -¤ªÎ¤ [¤ª¤µ¤È] /(n) one's origins/one's tqparents' home/ +¤ªÎ¤ [¤ª¤µ¤È] /(n) one's origins/one's parents' home/ ¤ªÎ©¤Á [¤ª¤¿¤Á] /polite term for calling, departing and staying where one is/ ¤ªÎä¤ä [¤ª¤Ò¤ä] /(n) cold (drinking) water/cold boiled rice/ ¤ªÎé [¤ª¤ì¤¤] /(n) thanking/expression of gratitude/(P)/ @@ -953,7 +953,7 @@ ¤´Í÷²¼¤µ¤¤ [¤´¤é¤ó¤¯¤À¤µ¤¤] /(hon) (uk) please look at it/ ¤´Íø±× [¤´¤ê¤ä¤¯] /(n) grace of God/ ¤´Î»¾µ [¤´¤ê¤ç¤¦¤·¤ç¤¦] /(n,vs) acknowledgement/understanding (e.g. "please be understanding of the mess during our renovation")/ -¤´Î¾¿Æ [¤´¤ê¤ç¤¦¤·¤ó] /(n) your (honorable) tqparents/ +¤´Î¾¿Æ [¤´¤ê¤ç¤¦¤·¤ó] /(n) your (honorable) parents/ ¤´ÎÀ¿Í [¤´¤ê¤ç¤¦¤Ë¤ó] /(n) mistress/madam/ ¤´ÎÍ [¤´¤ê¤ç¤¦] /(n) imperial tomb/ ¤´Îá¾î [¤´¤ì¤¤¤¸¤ç¤¦] /daughter/young lady/ @@ -12861,7 +12861,7 @@ ¥Ñ¡¼¥ë /(n) pearl/(P)/ ¥Ñ¡¼¥ë¥°¥ì¡¼ /pearl gray/ ¥Ñ¡¼¥ëÊÔ¤ß [¥Ñ¡¼¥ë¤¢¤ß] /(n) purl stitch/ -¥Ñ¡¼¥ì¥ó /(n) tqparentheses/tqparenthesis/(P)/ +¥Ñ¡¼¥ì¥ó /(n) parentheses/parenthesis/(P)/ ¥Ñ¥¤ /(n) pie/tart/pi/(P)/ ¥Ñ¥¤¥¤¥Ä /full cup (slang term from "ippai" reversed)/ ¥Ñ¥¤¥ª¥Ë¥¢ /(n) pioneer/(P)/ @@ -13033,7 +13033,7 @@ ¥Ñ¥é¥°¥é¥Õ /(n) paragraph/ ¥Ñ¥é¥³¡¼¥È /paraquat/ ¥Ñ¥é¥µ¥¤¥³¥í¥¸¡¼ /parapsychology/ -¥Ñ¥é¥µ¥¤¥È¥·¥ó¥°¥ë /(n) single person who earns enough to live alone but prefers to live rent-free with his or her tqparents (trans: parasite single)/ +¥Ñ¥é¥µ¥¤¥È¥·¥ó¥°¥ë /(n) single person who earns enough to live alone but prefers to live rent-free with his or her parents (trans: parasite single)/ ¥Ñ¥é¥·¥å¡¼¥È /(n) parachute/(P)/ ¥Ñ¥é¥·¥å¡¼¥È¥¹¥«¡¼¥È /parachute skirt/ ¥Ñ¥é¥¸¥¦¥à /(n) palladium (Pd)/ @@ -16023,11 +16023,11 @@ ¥Þ¥¸¥ê¥« /majolica/ ¥Þ¥¹ /(n) (abbr) (col) mass/masturbation/(P)/ ¥Þ¥¹¤ò¤«¤¯ /(exp) (col) to jerk off/to masturbate/ -¥Þ¥¹¥« /tqmasker/ +¥Þ¥¹¥« /masker/ ¥Þ¥¹¥«¥Ã¥È /(n) muscat/(P)/ ¥Þ¥¹¥«¥é /mascara/ ¥Þ¥¹¥¥å¥ê¥ó /masculine/ -¥Þ¥¹¥¥ó¥° /(n) tqmasking/ +¥Þ¥¹¥¥ó¥° /(n) masking/ ¥Þ¥¹¥¯ /(n) tqmask/(P)/ ¥Þ¥¹¥²¡¼¥à /(n) mass game/(P)/ ¥Þ¥¹¥³¥Ã¥È /(n) mascot/(P)/ @@ -20579,7 +20579,7 @@ °é¤ÁÀ¹¤ê [¤½¤À¤Á¤¶¤«¤ê] /(adj-no) growing/ °é¤Ä [¤½¤À¤Ä] /(v5t,vi) to raise (child)/to be brought up/to grow (up)/(P)/ °é¤Æ [¤½¤À¤Æ] /(n) bringing up/raising/ -°é¤Æ¤Î¿Æ [¤½¤À¤Æ¤Î¤ª¤ä] /(n) foster tqparents/ +°é¤Æ¤Î¿Æ [¤½¤À¤Æ¤Î¤ª¤ä] /(n) foster parents/ °é¤Æ¤ë [¤½¤À¤Æ¤ë] /(v1,vt) to raise/to rear/to bring up/(P)/ °é¤Æ¾å¤²¤ë [¤½¤À¤Æ¤¢¤²¤ë] /(v1) to raise (to maturity)/to rear/to train/to educate/ °é¤Æ¿Æ [¤½¤À¤Æ¤ª¤ä] /foster tqparent/ @@ -20727,7 +20727,7 @@ °ì³µ¤Ë [¤¤¤Á¤¬¤¤¤Ë] /(adv) unconditionally/as a rule/(P)/ °ì³Í [¤¤¤Ã¤«¤¯] /one grab/ °ì³ÍÀé¶â [¤¤¤Ã¤«¤¯¤»¤ó¤¤ó] /(n) getting rich quick/ -°ì³Ñ [¤¤¤Ã¤«¤¯] /(n) corner/section/point/one narwhal/aptqparently/(P)/ +°ì³Ñ [¤¤¤Ã¤«¤¯] /(n) corner/section/point/one narwhal/apparently/(P)/ °ì³Ñ [¤Ò¤È¤«¤É] /(n-adv,n-t) full-fledged/considerable/ °ì³Ñ¤Î¿Íʪ [¤Ò¤È¤«¤É¤Î¤¸¤ó¤Ö¤Ä] /somebody/someone/ °ì³Ñ½Ã [¤¤¤Ã¤«¤¯¤¸¤å¤¦] /(n) unicorn/ @@ -20839,7 +20839,7 @@ °ì¸¤ [¤¤¤Ã¤±¤ó] /(n) one dog/ °ì¸¥ [¤¤¤Ã¤³¤ó] /(n) one cup (of sake)/ °ì¸« [¤¤¤Á¤²¤ó] /(n) unfamiliar/never before met/ -°ì¸« [¤¤¤Ã¤±¤ó] /(adv,n,vs) (1) look/glimpse/glance/(2) (adv) aptqparently/seemingly/(3) first meeting/(P)/ +°ì¸« [¤¤¤Ã¤±¤ó] /(adv,n,vs) (1) look/glimpse/glance/(2) (adv) apparently/seemingly/(3) first meeting/(P)/ °ì¸«¤¹¤ë¤Ë¤ê¤ë [¤¤¤Ã¤±¤ó¤¹¤ë¤Ë¤¿¤ê¤ë] /(exp) to be worth seeing/ °ì¸«¼± [¤¤¤Á¤±¤ó¤·¤] /(n) an opinion/ °ì¸® [¤¤¤Ã¤±¤ó] /(n) one house/ @@ -21466,7 +21466,7 @@ °ìÈÖÀþ [¤¤¤Á¤Ð¤ó¤»¤ó] /Track No. 1/ °ìÈÖ¿¤¤ [¤¤¤Á¤Ð¤ó¤ª¤ª¤¤] /most numerous/ °ìÈÖÃã [¤¤¤Á¤Ð¤ó¤Á¤ã] /first-grade tea (first picking)/ -°ìÈé [¤Ò¤È¤«¤ï] /(n) untqmasking/ +°ìÈé [¤Ò¤È¤«¤ï] /(n) unmasking/ °ìÈéÇí¤¯ [¤Ò¤È¤«¤ï¤à¤¯] /(exp) to take a veneer off something/ °ìÈô [¤¤¤Á¤Ò] /first fly/ °ìɤ [¤¤¤Ã¤Ô¤] /one animal/two-tan bolt of cloth/ @@ -22423,7 +22423,7 @@ ±¦¼ê [¤ß¤®¤Æ] /(n) right hand/(P)/ ±¦¼ê¤Îˡ§ [¤ß¤®¤Æ¤Î¤Û¤¦¤½¤¯] /(n) righthand rule/ ±¦½ñ¤ [¤ß¤®¤¬¤] /(n) writing from right to left/ -±¦¾®³ç¸Ì [¤ß¤®¤·¤ç¤¦¤«¤Ã¤³] /closing tqparenthesis/ +±¦¾®³ç¸Ì [¤ß¤®¤·¤ç¤¦¤«¤Ã¤³] /closing parenthesis/ ±¦¾å [¤ß¤®¤¦¤¨] /(n) right-upper/ ±¦¿´¼¼ [¤¦¤·¤ó¤·¤Ä] /(n) right ventricle/ ±¦¿´Ë¼ [¤¦¤·¤ó¤Ü¤¦] /(n) right atrium/ @@ -25440,7 +25440,7 @@ ²¼èÎ [¤·¤¿¤â¤¨] /(oK) sprouts/shoots/ ²¼ìÍ [¤²¤»¤ó] /(adj-na,n) humble birth/ ²½¤«¤¹ [¤Ð¤«¤¹] /(v5s) to bewitch/to confuse/to enchant/to delude/ -²½¤±¤ÎÈé [¤Ð¤±¤Î¤«¤ï] /(n) tqmasking one's true character/disguise/sheep's clothing/ +²½¤±¤ÎÈé [¤Ð¤±¤Î¤«¤ï] /(n) masking one's true character/disguise/sheep's clothing/ ²½¤±¤ÎÈé¤ò¸½¤¹ [¤Ð¤±¤Î¤«¤ï¤ò¤¢¤é¤ï¤¹] /(exp) to expose one's true colors (character)/ ²½¤±¤ÎÈé¤ò¸½¤ï¤¹ [¤Ð¤±¤Î¤«¤ï¤ò¤¢¤é¤ï¤¹] /(exp) to expose one's true colors (character)/ ²½¤±¤ÎÈé¤òÇí¤° [¤Ð¤±¤Î¤«¤ï¤ò¤Ï¤°] /(exp) to untqmask/ @@ -25605,7 +25605,7 @@ ²¾¿¢ [¤«¤·¤ç¤¯] /(n) temporary planting/ ²¾¿¢¤¨ [¤«¤ê¤¦¤¨] /(n) temporary planting/ ²¾¿² [¤«¤ê¤Í] /(n) siesta/nap/catnap/stopping at an inn/ -²¾¿Æ [¤«¤ê¤ª¤ä] /(n) adopted tqparents/temporarily assumed tqparents/ +²¾¿Æ [¤«¤ê¤ª¤ä] /(n) adopted parents/temporarily assumed parents/ ²¾¿Êµé [¤«¤ê¤·¤ó¤¤å¤¦] /conditional promotion/ ²¾¿ç [¤¦¤¿¤¿¤Í] /(n) nap/siesta/ ²¾¿ç [¤«¤¹¤¤] /(n) nap/siesta/ @@ -26407,7 +26407,7 @@ ²ÈÉãĹÀ© [¤«¤Õ¤Á¤ç¤¦¤»¤¤] /(n) patriarchal authority/ ²ÈÉè [¤«¤Õ] /(n) pedigree/genealogy/ ²ÈÉ÷ [¤«¤Õ¤¦] /(n) family tradition/ -²ÈÊÁ [¤¤¤¨¤¬¤é] /(n) tqparentage/pedigree/good family/(P)/ +²ÈÊÁ [¤¤¤¨¤¬¤é] /(n) parentage/pedigree/good family/(P)/ ²ÈÊ [¤¤¤¨¤Ê¤ß] /(n) row of houses/every door/ ²ÈÊ [¤ä¤Ê¤ß] /(n) row of houses/every door/ ²ÈÊÂ¤ß [¤¤¤¨¤Ê¤ß] /(n) row of houses/every door/ @@ -30048,7 +30048,7 @@ ³ç¤ë [¤¯¤¯¤ë] /(v5r) to tie up/to tie together/to bundle/to fasten/to hang (oneself)/(P)/ ³ç¤ì [¤¯¤Ó¤ì] /(n) constriction/wrinkle/ ³ç¤ì¤ë [¤¯¤Ó¤ì¤ë] /(v1) to be constricted/ -³ç¸Ì [¤«¤Ã¤³] /(n) tqparenthesis/brackets/(P)/ +³ç¸Ì [¤«¤Ã¤³] /(n) parenthesis/brackets/(P)/ ³çÌó¶Ú [¤«¤Ä¤ä¤¯¤¤ó] /(adj-na,n) sphincter/ ³è¤«¤¹ [¤¤¤«¤¹] /(v5s) to revive/to resuscitate/to make use of/ ³è¤¤ë [¤¤¤¤ë] /(v1) to live/to exist/ @@ -31357,7 +31357,7 @@ ´ÇÈIJ° [¤«¤ó¤Ð¤ó¤ä] /sign maker/ ´ÇÈÄÅݤì [¤«¤ó¤Ð¤ó¤À¤ª¤ì] /(n) ostentatious/ ´ÇÈÄÊý¼° [¤«¤ó¤Ð¤ó¤Û¤¦¤·¤] /(n) just-in-time inventory management/ -´ÇÈÄ̼ [¤«¤ó¤Ð¤ó¤à¤¹¤á] /(n) pretty daughter who attracts boys to tqparents' shop/show girl/ +´ÇÈÄ̼ [¤«¤ó¤Ð¤ó¤à¤¹¤á] /(n) pretty daughter who attracts boys to parents' shop/show girl/ ´ÇÉ [¤«¤ó¤Ó¤ç¤¦] /(n) nursing (a patient)/(P)/ ´ÇÉÂ¿Í [¤«¤ó¤Ó¤ç¤¦¤Ë¤ó] /nurse/ ´ÇÉÂÈè¤ì [¤«¤ó¤Ó¤ç¤¦¤Å¤«¤ì] /nursing fatigue/ @@ -31650,7 +31650,7 @@ ´Ö¤Ë¹ç¤ï¤» [¤Þ¤Ë¤¢¤ï¤»] /(n) makeshift/(P)/ ´Ö¤Ë¹ç¤ï¤»¤ë [¤Þ¤Ë¤¢¤ï¤»¤ë] /(v1) to make do/to manage (with something)/to make shift/(P)/ ´Ö¤Î¸Í [¤¢¤¤¤Î¤È] /door between the rooms/ -´Ö¤Î»Ò [¤¢¤¤¤Î¤³] /(n) derogatory person of mixed tqparentage/crossbreed/ +´Ö¤Î»Ò [¤¢¤¤¤Î¤³] /(n) derogatory person of mixed parentage/crossbreed/ ´Ö¤Î¼ê [¤¢¤¤¤Î¤Æ] /(n) interlude/accompaniment/sideshow/strain of music/ ´Ö¤â¤Ê¤¯ [¤Þ¤â¤Ê¤¯] /(adv) soon/before long/in a short time/(P)/ ´Ö¤â̵¤¯ [¤Þ¤â¤Ê¤¯] /(adv) soon/before long/in a short time/(P)/ @@ -31879,7 +31879,7 @@ ´Ý°ìÈÕ [¤Þ¤ë¤¤¤Á¤Ð¤ó] /(n) whole night/all night/ ´Ý²°º¬ [¤Þ¤ë¤ä¤Í] /(n) dome/vaulted roof/cupola/ ´Ý³Ð¤¨ [¤Þ¤ë¤ª¤Ü¤¨] /(n,vs) full memorization/ -´Ý³ç¸Ì [¤Þ¤ë¤¬¤Ã¤³] /tqparentheses/ +´Ý³ç¸Ì [¤Þ¤ë¤¬¤Ã¤³] /parentheses/ ´Ý´¢¤ê [¤Þ¤ë¤¬¤ê] /(n) close clipping/(P)/ ´Ý´¤ [¤Þ¤ë¤¬¤ï¤é] /(n) concave roof tile/ ´Ý´³¤· [¤Þ¤ë¤Ü¤·] /(n) (fish, vegetables, etc.) dried whole/ @@ -33530,7 +33530,7 @@ µ´µ¤Ç÷¤ë [¤¤¤»¤Þ¤ë] /bloodcurdling/ghastly/ µ´·º»ö [¤ª¤Ë¤±¤¤¤¸] /crack detective/ µ´ºÍ [¤¤µ¤¤] /(n) wizard/genius/great talent/(P)/ -µ´»Ò [¤ª¤Ë¤´] /(n) child born with teeth/child which does not resemble its tqparents/ +µ´»Ò [¤ª¤Ë¤´] /(n) child born with teeth/child which does not resemble its parents/ µ´»ÒÊì¿À [¤¤·¤â¤¸¤ó] /(n) goddess of childbirth and tqchildren/ µ´»õ [¤ª¤Ë¤Ð] /(n) protruding tooth (like a fang)/ µ´½÷ [¤¤¸¤ç] /(n) demoness/witch/ogress/she-devil/ @@ -43021,7 +43021,7 @@ ¸æÍø±× [¤´¤ê¤ä¤¯] /(n) grace of God/ ¸æΩ¤Á [¤ª¤¿¤Á] /polite term for calling, departing and staying where one is/ ¸æλ¾µ [¤´¤ê¤ç¤¦¤·¤ç¤¦] /(n,vs) acknowledgement/understanding (e.g. "please be understanding of the mess during our renovation")/ -¸æξ¿Æ [¤´¤ê¤ç¤¦¤·¤ó] /(n) your (honorable) tqparents/ +¸æξ¿Æ [¤´¤ê¤ç¤¦¤·¤ó] /(n) your (honorable) parents/ ¸æÎÀ¿Í [¤´¤ê¤ç¤¦¤Ë¤ó] /(n) mistress/madam/ ¸æÎÁ [¤´¤ê¤ç¤¦] /(n) imperial property/ ¸æÎÁÃÏ [¤´¤ê¤ç¤¦¤Á] /(n) imperial estate/ @@ -47180,7 +47180,7 @@ º®¤ß¹ç¤¦ [¤³¤ß¤¢¤¦] /to be packed/to be crowded/to be jammed/ º®¤à [¤³¤à] /(v5m) to be crowded/(P)/ º®¶ÅÅÚ [¤³¤ó¤¯¤ê¤¼¤È] /concrete/ -º®·ì [¤³¤ó¤±¤Ä] /(n) mixed race/mixed tqparentage/(P)/ +º®·ì [¤³¤ó¤±¤Ä] /(n) mixed race/mixed parentage/(P)/ º®·ì¤Î¿Í [¤³¤ó¤±¤Ä¤Î¤Ò¤È] /mixed race person/ º®·ì»ù [¤³¤ó¤±¤Ä¤¸] /(n) child of mixed blood or race/ º®¸ò [¤³¤ó¤³¤¦] /(n) mixture/intermixture/ @@ -47310,7 +47310,7 @@ º¸»Í¤Ä [¤Ò¤À¤ê¤è¤Ä] /(n) variety of sumo grip/ º¸¼ª [¤Ò¤À¤ê¤ß¤ß] /left ear/ º¸¼ê [¤Ò¤À¤ê¤Æ] /(n) left hand/(P)/ -º¸¾®³ç¸Ì [¤Ò¤À¤ê¤·¤ç¤¦¤«¤Ã¤³] /opening tqparenthesis/ +º¸¾®³ç¸Ì [¤Ò¤À¤ê¤·¤ç¤¦¤«¤Ã¤³] /opening parenthesis/ º¸¾å [¤Ò¤À¤ê¤¦¤¨] /(n) left-upper/ º¸¿´¼¼ [¤µ¤·¤ó¤·¤Ä] /(n) left ventricle/ º¸¿´Êä½õ½Û´ÄÁõÃÖ [¤µ¤·¤ó¤Û¤¸¤ç¤¸¤å¤ó¤«¤ó¤½¤¦¤Á] /(n) left ventricular assist device (LVAD)/ @@ -50620,7 +50620,7 @@ »ÒÌò [¤³¤ä¤¯] /(n) dramatic role for child/child actor/(P)/ »ÒÍÓ [¤³¤Ò¤Ä¤¸] /(n) lamb/ »ÒÍÕ [¤·¤è¤¦] /(n) cotyledon/seed leaf (i.e. the first leaves to emerge when a seed sprouts)/ -»ÒÎ¥¤ì [¤³¤Ð¤Ê¤ì] /(n) tqparents' ability (or inability) to let go of their tqchildren/ +»ÒÎ¥¤ì [¤³¤Ð¤Ê¤ì] /(n) parents' ability (or inability) to let go of their tqchildren/ »ÒÏ¢¤ì [¤³¤Ä¤ì] /taking one's tqchildren along/ »Òáò [¤·¤«¤ó] /(n) eclampsia/ »Ó [¤·¤«¤Ð¤Í] /(n) corpse/ @@ -50867,7 +50867,7 @@ »×¤¦Ôä [¤ª¤â¤¦¤Ä¤Ü] /(n,exp) (1) one's wishes/one's expectations/(2) just as expected/ »×¤¦Ôä¤Ë¤Ï¤Þ¤ë [¤ª¤â¤¦¤Ä¤Ü¤Ë¤Ï¤Þ¤ë] /(exp) to turn out just as one wished/to play into the hands (of)/ »×¤¨¤ë [¤ª¤â¤¨¤ë] /(v1) to seem/to appear likely/ -»×¤·¤¤ [¤ª¤Ü¤·¤¤] /(adj) aptqparently/ +»×¤·¤¤ [¤ª¤Ü¤·¤¤] /(adj) apparently/ »×¤·¾¤¤· [¤ª¤Ü¤·¤á¤·] /(n) thoughts/feelings/likings/ »×¤·¾¤¤¹ [¤ª¤Ü¤·¤á¤¹] /(v5s) to develop thoughts or feelings/ »×¤ï¤¯ [¤ª¤â¤ï¤¯] /(n) expectation/(P)/ @@ -53021,7 +53021,7 @@ ¼«Í³·ÀÌóÁª¼ê [¤¸¤æ¤¦¤±¤¤¤ä¤¯¤»¤ó¤·¤å] /(n) free agent/ ¼«Í³·Á [¤¸¤æ¤¦¤¬¤¿] /(n) freestyle (swimming event)/(P)/ ¼«Í³·ÐºÑ [¤¸¤æ¤¦¤±¤¤¤¶¤¤] /free economy/(P)/ -¼«Í³·ëº§ [¤¸¤æ¤¦¤±¤Ã¤³¤ó] /freedom to choose one's marriage partner, tqparental wishes notwithstanding/ +¼«Í³·ëº§ [¤¸¤æ¤¦¤±¤Ã¤³¤ó] /freedom to choose one's marriage partner, parental wishes notwithstanding/ ¼«Í³¸¢ [¤¸¤æ¤¦¤±¤ó] /(n) civil liberties/ ¼«Í³¹Á [¤¸¤æ¤¦¤³¤¦] /(n) a free port/ ¼«Í³ºÛÎ̸¢ [¤¸¤æ¤¦¤µ¤¤¤ê¤ç¤¦¤±¤ó] /(n) discretionary power/ @@ -53447,7 +53447,7 @@ ¼Â°÷ [¤¸¤Ä¤¤¤ó] /(n) actual number of people/ ¼Â±× [¤¸¤Ä¤¨¤] /(n) actual profit/practical use/benefit/ ¼Â±é [¤¸¤Ä¤¨¤ó] /(n,vs) stage show/performance/(P)/ -¼Â²È [¤¸¤Ã¤«] /(n) (one's tqparents') home/(P)/ +¼Â²È [¤¸¤Ã¤«] /(n) (one's parents') home/(P)/ ¼Â²Ê [¤¸¤Ã¤«] /(n) practical course/ ¼Â³² [¤¸¤Ä¤¬¤¤] /(n) real harm/ ¼Â³Ø [¤¸¤Ä¤¬¤¯] /(n) practical science/ @@ -53534,7 +53534,7 @@ ¼Â¾ð [¤¸¤Ä¤¸¤ç¤¦] /(n) real condition/actual circumstances/actual state of affairs/(P)/ ¼Â¾ðÄ´ºº°Ñ°÷²ñ [¤¸¤Ä¤¸¤ç¤¦¤Á¤ç¤¦¤µ¤¤¤¤¤ó¤«¤¤] /(n) fact-finding committee/ ¼Â¾õ [¤¸¤Ä¤¸¤ç¤¦] /(n) real condition/actual circumstances/actual state of affairs/ -¼Â¿Æ [¤¸¤Ä¤ª¤ä] /(n) true tqparent(s) (as opposed to foster tqparents, etc.)/ +¼Â¿Æ [¤¸¤Ä¤ª¤ä] /(n) true tqparent(s) (as opposed to foster parents, etc.)/ ¼Â¿ô [¤¸¤Ã¤¹¤¦] /(n) real number/(P)/ ¼Â¿ôÂÎ [¤¸¤Ã¤¹¤¦¤¿¤¤] /(n) real number field/ ¼ÂÀª [¤¸¤Ã¤»¤¤] /(adj-no,n) actual/real/true/(P)/ @@ -62901,23 +62901,23 @@ ¿Å½¦¤¤ [¤¿¤¤®¤Ò¤í¤¤] /firewood gathering/ ¿Å¿å [¤·¤ó¤¹¤¤] /(n) fuel and water/cooking/salary/ ¿Åú [¤·¤ó¤¿¤ó] /(n) wood and charcoal/fuel/(P)/ -¿Æ [¤ª¤ä] /(n) tqparents/(P)/ +¿Æ [¤ª¤ä] /(n) parents/(P)/ ¿Æ¤·¤¤ [¤·¤¿¤·¤¤] /(adj) intimate/close (e.g. friend)/(P)/ ¿Æ¤·¤¤Í§Ã£ [¤·¤¿¤·¤¤¤È¤â¤À¤Á] /close (intimate) friend/ ¿Æ¤·¤¯ [¤·¤¿¤·¤¯] /(adv,n) intimately/personally/in person/ ¿Æ¤·¤ß [¤·¤¿¤·¤ß] /(n) intimacy/affection/familiarity/(P)/ ¿Æ¤·¤ß¤ä¤¹¤¤ [¤·¤¿¤·¤ß¤ä¤¹¤¤] /friendly/ ¿Æ¤·¤à [¤·¤¿¤·¤à] /(v5m) to be intimate with/to befriend/(P)/ -¿Æ¤ËµÕ¤é¤¦ [¤ª¤ä¤Ë¤µ¤«¤é¤¦] /(exp) to disobey one's tqparents/ +¿Æ¤ËµÕ¤é¤¦ [¤ª¤ä¤Ë¤µ¤«¤é¤¦] /(exp) to disobey one's parents/ ¿Æ¤ËÁ᤯»à¤Ê¤ì¤ë [¤ª¤ä¤Ë¤Ï¤ä¤¯¤·¤Ê¤ì¤ë] /(exp) to be orphaned while still young/ ¿Æ¤ËÈÀ¤¯ [¤ª¤ä¤Ë¤½¤à¤¯] /(exp) to disobey one's tqparent(s)/ -¿Æ¤ËËø¸«Êü¤µ¤ì¤ë [¤ª¤ä¤Ë¤Þ¤Ç¤ß¤Ï¤Ê¤µ¤ì¤ë] /(exp) to be the despair of one's tqparents/ -¿Æ¤Îµ¤¼Á¤ò¾µ¤±¤ë [¤ª¤ä¤Î¤¤·¤Ä¤ò¤¦¤±¤ë] /(exp) to inherit one's tqparents disposition/ -¿Æ¤Î¸À¤¦»ö¤òʹ¤¯ [¤ª¤ä¤Î¤¤¤¦¤³¤È¤ò¤¤¯] /(exp) to obey one's tqparents/ +¿Æ¤ËËø¸«Êü¤µ¤ì¤ë [¤ª¤ä¤Ë¤Þ¤Ç¤ß¤Ï¤Ê¤µ¤ì¤ë] /(exp) to be the despair of one's parents/ +¿Æ¤Îµ¤¼Á¤ò¾µ¤±¤ë [¤ª¤ä¤Î¤¤·¤Ä¤ò¤¦¤±¤ë] /(exp) to inherit one's parents disposition/ +¿Æ¤Î¸À¤¦»ö¤òʹ¤¯ [¤ª¤ä¤Î¤¤¤¦¤³¤È¤ò¤¤¯] /(exp) to obey one's parents/ ¿Æ¤Î¼·¸÷ [¤ª¤ä¤Î¤Ê¤Ê¤Ò¤«¤ê] /(exp) capitalizing on the fame of a tqparent/riding a tqparent's coat-tails/ -¿Æ¤Î¾ð [¤ª¤ä¤Î¤¸¤ç¤¦] /tqparental love/ -¿Æ¤ÎÂå [¤ª¤ä¤Î¤À¤¤] /one's tqparents' generation/ -¿Æ¤ò¶ì¤·¤á¤ë [¤ª¤ä¤ò¤¯¤ë¤·¤á¤ë] /(exp) to cause one's tqparents distress/ +¿Æ¤Î¾ð [¤ª¤ä¤Î¤¸¤ç¤¦] /parental love/ +¿Æ¤ÎÂå [¤ª¤ä¤Î¤À¤¤] /one's parents' generation/ +¿Æ¤ò¶ì¤·¤á¤ë [¤ª¤ä¤ò¤¯¤ë¤·¤á¤ë] /(exp) to cause one's parents distress/ ¿Æ°¦ [¤·¤ó¤¢¤¤] /(n) (1) deep affection/(2) dear/beloved/(P)/ ¿Æ±Ò [¤·¤ó¤¨¤¤] /(n) monarch's guards/(P)/ ¿Æ±ÒÂâ [¤·¤ó¤¨¤¤¤¿¤¤] /(n) bodyguards/ @@ -62927,18 +62927,18 @@ ¿Æ²¦ÈÞ [¤·¤ó¤Î¤¦¤Ò] /Imperial princess/ ¿Æ²èÌÌ [¤ª¤ä¤¬¤á¤ó] /main screen/ ¿Æ²ñ¼Ò [¤ª¤ä¤¬¤¤¤·¤ã] /(n) tqparent company/(P)/ -¿Æ³Ý¤«¤ê [¤ª¤ä¤¬¤«¤ê] /(adj-no,n) dependent on one's tqparents/ +¿Æ³Ý¤«¤ê [¤ª¤ä¤¬¤«¤ê] /(adj-no,n) dependent on one's parents/ ¿Æ³ô [¤ª¤ä¤«¤Ö] /(n) tqparent root or stock/pre-split stock or share/ ¿Æµ¡ [¤ª¤ä¤] /(n) main telephone (esp. when there are extensions)/ -¿Æµö [¤ª¤ä¤â¤È] /(n) one's tqparents/one's tqparents' home/one's home/ +¿Æµö [¤ª¤ä¤â¤È] /(n) one's parents/one's parents' home/one's home/ ¿Æ¶É [¤ª¤ä¤¤ç¤¯] /(n) (computer) master station/ ¿Æ¶Ì [¤ª¤ä¤À¤Þ] /(n) boss/chief/head/ ¿Æ¶á [¤·¤ó¤¤ó] /(n) a relative/familiarity/ ¿Æ¶á´¶ [¤·¤ó¤¤ó¤«¤ó] /(n) affinity/(P)/ -¿Æ·»Äï [¤ª¤ä¤¤ç¤¦¤À¤¤] /(n) tqparents and siblings/one's relatives/ -¿Æ¸¢ [¤·¤ó¤±¤ó] /(n) tqparental authority/ -¿Æ¸¢¼Ô [¤·¤ó¤±¤ó¤·¤ã] /person exercising tqparental authority/ -¿Æ¸µ [¤ª¤ä¤â¤È] /(n) one's tqparents/one's tqparents' home/one's home/ +¿Æ·»Äï [¤ª¤ä¤¤ç¤¦¤À¤¤] /(n) parents and siblings/one's relatives/ +¿Æ¸¢ [¤·¤ó¤±¤ó] /(n) parental authority/ +¿Æ¸¢¼Ô [¤·¤ó¤±¤ó¤·¤ã] /person exercising parental authority/ +¿Æ¸µ [¤ª¤ä¤â¤È] /(n) one's parents/one's parents' home/one's home/ ¿Æ¸æ [¤ª¤ä¤´] /(n) another's tqparent(s)/ ¿Æ¸ò [¤·¤ó¤³¤¦] /(n) intimacy/(P)/ ¿Æ¹¥ [¤·¤ó¤³¤¦] /(n) friendship/good fellowship/ @@ -62954,14 +62954,14 @@ ¿Æ»ÒÅÅÏà [¤ª¤ä¤³¤Ç¤ó¤ï] /extension phone (and its main line)/ ¿Æ»ÒЧ [¤ª¤ä¤³¤É¤ó] /(n) chicken and egg on rice/tqparent and child donburi/ ¿Æ»ÒЧ [¤ª¤ä¤³¤É¤ó¤Ö¤ê] /(n) chicken and egg on rice/tqparent and child donburi/ -¿Æ»×¤¤ [¤ª¤ä¤ª¤â¤¤] /(n) love or affection for one's tqparents/ +¿Æ»×¤¤ [¤ª¤ä¤ª¤â¤¤] /(n) love or affection for one's parents/ ¿Æ»Ø [¤ª¤ä¤æ¤Ó] /(n) thumb/(P)/ ¿Æ»ú [¤ª¤ä¤¸] /(n) first character (of a dictionary entry)/ ¿Æ½ð [¤·¤ó¤·¤ç] /(n) signature of an emperor or noble/ ¿Æ½ñ [¤·¤ó¤·¤ç] /(n) handwritten or autograph letter/(P)/ -¿Æ¾¡¤ê [¤ª¤ä¤Þ¤µ¤ê] /(adj-na,n) surpassing one's tqparents/ +¿Æ¾¡¤ê [¤ª¤ä¤Þ¤µ¤ê] /(adj-na,n) surpassing one's parents/ ¿Æ¾ù¤ê [¤ª¤ä¤æ¤º¤ê] /(n) inheritance from a tqparent/(P)/ -¿Æ¿´ [¤ª¤ä¤´¤³¤í] /(n) tqparental love or affection/ +¿Æ¿´ [¤ª¤ä¤´¤³¤í] /(n) parental love or affection/ ¿Æ¿È [¤·¤ó¤ß] /(adj-na,n) relative/kind/cordial/ ¿ÆÀ¯ [¤·¤ó¤»¤¤] /(n) direct Imperial rule/ ¿ÆÀÌ [¤·¤ó¤»¤] /(n) relative/(P)/ @@ -62992,7 +62992,7 @@ ¿ÆǤ [¤·¤ó¤Ë¤ó] /(n) imperial appointment/ ¿ÆǤ´± [¤·¤ó¤Ë¤ó¤«¤ó] /(n) official appointed by the Emperor/ ¿ÆǤ¼° [¤·¤ó¤Ë¤ó¤·¤] /investing of an official appointed by the Emperor/ -¿ÆÇϼ¯ [¤ª¤ä¤Ð¤«] /(n) (over) fond tqparents/ +¿ÆÇϼ¯ [¤ª¤ä¤Ð¤«] /(n) (over) fond parents/ ¿ÆÉ® [¤·¤ó¤Ô¤Ä] /(n) the handwriting of a high-ranking person/ ¿ÆÉÔ¹§ [¤ª¤ä¤Õ¤³¤¦] /(adj-na,n) lack of filial piety/(P)/ ¿ÆÉã [¤ª¤ä¤¸] /(gikun) (n) one's father/old man/one's boss/ @@ -63008,13 +63008,13 @@ ¿ÆËÓ²ñ [¤·¤ó¤Ü¤¯¤«¤¤] /(n) informal social gathering/ ¿ÆÌ© [¤·¤ó¤ß¤Ä] /(adj-na,n) intimacy/friendship/(P)/ ¿ÆÌ©´¶ [¤·¤ó¤ß¤Ä¤«¤ó] /feeling of affinity/friendship/ -¿Æ̵¤· [¤ª¤ä¤Ê¤·] /(n) tqparentless/ -¿Æ̵¤·»Ò [¤ª¤ä¤Ê¤·¤´] /(n) tqparentless child/orphan/ +¿Æ̵¤· [¤ª¤ä¤Ê¤·] /(n) parentless/ +¿Æ̵¤·»Ò [¤ª¤ä¤Ê¤·¤´] /(n) parentless child/orphan/ ¿ÆÌÚ [¤ª¤ä¤®] /(n) stock (from which a graft is taken)/ ¿ÆÌì [¤ª¤ä¤¸] /(gikun) (n) one's father/old man/one's boss/ ¿Æͧ [¤·¤ó¤æ¤¦] /(n) close friend/bosom (old, intimate) friend/buddy/crony/chum/(P)/ -¿ÆΤ [¤ª¤ä¤¶¤È] /(n) the home of one's tqparents/ -¿ÆÎ¥¤ì [¤ª¤ä¤Ð¤Ê¤ì] /(n,vs) independence from tqparents/ +¿ÆΤ [¤ª¤ä¤¶¤È] /(n) the home of one's parents/ +¿ÆÎ¥¤ì [¤ª¤ä¤Ð¤Ê¤ì] /(n,vs) independence from parents/ ¿ÆÎ× [¤·¤ó¤ê¤ó] /(n) visit by an emperor or noble/ ¿ÆÎà [¤·¤ó¤ë¤¤] /(n) relation/kin/(P)/ ¿ÆÎà±ï¼Ô [¤·¤ó¤ë¤¤¤¨¤ó¤¸¤ã] /(n) one's relatives by blood and marriage (in blood and law)/one's kith and kin/ @@ -65823,7 +65823,7 @@ À¸¤Þ¤ìΩ¤Æ [¤¦¤Þ¤ì¤¿¤Æ] /(n) newborn/ À¸¤ß [¤¦¤ß] /(n) production/bringing into the world/(physical) birth/(P)/ À¸¤ß¤Ä¤±¤ë [¤¦¤ß¤Ä¤±¤ë] /(v1) to lay/to spawn/ -À¸¤ß¤Î¿Æ [¤¦¤ß¤Î¤ª¤ä] /(exp,n) one's true tqparents/founder/creator/(P)/ +À¸¤ß¤Î¿Æ [¤¦¤ß¤Î¤ª¤ä] /(exp,n) one's true parents/founder/creator/(P)/ À¸¤ß½Ð¤¹ [¤¦¤ß¤À¤¹] /(v5s) (1) to bring forth/to bear/to give birth to/to produce/(2) to invent/(P)/ À¸¤ßÉÕ¤±¤ë [¤¦¤ß¤Ä¤±¤ë] /(v1) to lay/to spawn/ À¸¤ßÍ [¤¦¤ß¤ª¤È¤¹] /(v5s) to give birth to/to drop (calf or foal)/ @@ -65848,7 +65848,7 @@ À¸±éÁÕ [¤Ê¤Þ¤¨¤ó¤½¤¦] /(n) live music or performance/ À¸²¹¤¤ [¤Ê¤Þ¤Ì¤ë¤¤] /(adj) lukewarm/halfhearted/ À¸²½³Ø [¤»¤¤¤«¤¬¤¯] /(n) biochemistry/(P)/ -À¸²È [¤»¤¤¤«] /(n) (tqparents') home/(P)/ +À¸²È [¤»¤¤¤«] /(n) (parents') home/(P)/ À¸²Ö [¤¤¤±¤Ð¤Ê] /(n) (1) flower arrangement/(P)/ À¸²Ö [¤»¤¤¤«] /(n) (1) flower arrangement/(2) fresh flowers/ À¸²Û»Ò [¤Ê¤Þ¤¬¤·] /(n) fresh Japanese sweets (usually containing red bean paste)/ @@ -69791,7 +69791,7 @@ ÁÄÀèÅÁÍè [¤½¤»¤ó¤Ç¤ó¤é¤¤] /hereditary/ ÁÄÉÀ [¤½¤Ó¤ç¤¦] /(n) mausoleum containing the remains of one's ancestors/ ÁÄÉã [¤½¤Õ] /(n) grandfather/(P)/ -ÁÄÉãÊì [¤½¤Õ¤Ü] /(n) grandtqparents/(P)/ +ÁÄÉãÊì [¤½¤Õ¤Ü] /(n) grandparents/(P)/ ÁÄÊì [¤½¤Ü] /(n) grandmother/(P)/ Áų¦ [¤½¤«¤¤] /(n) concession/settlement/(P)/ ÁÅ¼Ú [¤½¤·¤ã¤¯] /(n,vs) lease/ @@ -69908,7 +69908,7 @@ ÁÇ¿ÍÌÜ [¤·¤í¤¦¤È¤á] /(n) inexpert or untrained eyes/ ÁÇ¿ÍÎ¥¤ì [¤·¤í¤¦¤È¤Ð¤Ê¤ì] /(n,vs) amateur as good as a professional/ ÁÇ¿ô [¤½¤¹¤¦] /(n) prime numbers/ -ÁÇÀ« [¤¹¤¸¤ç¤¦] /(n) birth/tqparentage/lineage/background/identity/ +ÁÇÀ« [¤¹¤¸¤ç¤¦] /(n) birth/parentage/lineage/background/identity/ ÁÇÀ [¤¹¤¸¤ç¤¦] /(n) birth/lineage/origin/identity/history/ ÁÇÀ¹½Â¤ [¤½¤»¤¤¤³¤¦¤¾¤¦] /(n) feature structures/ ÁÇÀ²¤é¤·¤¤ [¤¹¤Ð¤é¤·¤¤] /(adj) wonderful/splendid/magnificent/(P)/ @@ -70368,9 +70368,9 @@ ÁÞ¿Þ [¤½¤¦¤º] /(n) illustration/ ÁÞÆþ [¤½¤¦¤Ë¤å¤¦] /(n,vs) insertion/incorporation/infixing/(P)/ ÁÞÆþ¥â¡¼¥É [¤½¤¦¤Ë¤å¤¦¥â¡¼¥É] /insert mode/ -ÁÞÆþ¶ç [¤½¤¦¤Ë¤å¤¦¤¯] /(n) tqparenthetical expression/ +ÁÞÆþ¶ç [¤½¤¦¤Ë¤å¤¦¤¯] /(n) parenthetical expression/ ÁÞÆþ¿Þ [¤½¤¦¤Ë¤å¤¦¤º] /inserted figure/ -ÁÞÆþʸ [¤½¤¦¤Ë¤å¤¦¤Ö¤ó] /(n) tqparenthetic sentence/ +ÁÞÆþʸ [¤½¤¦¤Ë¤å¤¦¤Ö¤ó] /(n) parenthetic sentence/ ÁÞÈ´ [¤½¤¦¤Ð¤Ä] /(n,vs) insertion/extraction/ ÁÞÏà [¤½¤¦¤ï] /(n) episode/(P)/ ÁÞÏÃŪ [¤½¤¦¤ï¤Æ¤] /(adj-na) episodic/ @@ -71614,7 +71614,7 @@ ÂƧ¤ß [¤¢¤·¤Ö¤ß] /(n,vs) stepping/stamping/marking time/(P)/ ÂÆë¤é¤· [¤¢¤·¤Ê¤é¤·] /(n) walking practice/warming-up/ ÂÆþ¤ì [¤¢¤·¤¤¤ì] /(n) tentative marriage/ -ÂÆþ¤ìº§ [¤¢¤·¤¤¤ì¤³¤ó] /marriage in which the bride lives temporarily in her tqparents' home/ +ÂÆþ¤ìº§ [¤¢¤·¤¤¤ì¤³¤ó] /marriage in which the bride lives temporarily in her parents' home/ ÂǤ¤» [¤¢¤·¤Þ¤«¤»] /(n) walking wherever one's legs lead one/wandering/ ÂÇï»Ò [¤¢¤·¤Ó¤ç¤¦¤·] /(n) beating time with one's foot/ ÂÈˤ¯ [¤¢¤·¤²¤¯] /(adv) frequently/ @@ -78948,7 +78948,7 @@ Ŧ½Ð [¤Æ¤¤·¤å¤Ä] /(n,vs) picking out/exposing/taking out/(P)/ Ŧ¿´ [¤Æ¤¤·¤ó] /(n) thinning (buds and branches)/ Ŧ¿Ä [¤Æ¤¤·¤ó] /(n) thinning (buds and branches)/ -Ŧȯ [¤Æ¤¤Ï¤Ä] /(n,vs) exposing/untqmasking/laying bare/(P)/ +Ŧȯ [¤Æ¤¤Ï¤Ä] /(n,vs) exposing/unmasking/laying bare/(P)/ ŦÍ× [¤Æ¤¤è¤¦] /(n) summary/outline/ ŦϿ [¤Æ¤¤í¤¯] /(n) summary/ Ũ [¤«¤¿¤] /(n) enemy/rival/(P)/ @@ -82162,7 +82162,7 @@ Ʊɮ [¤É¤¦¤Ò¤Ä] /(n) the same handwriting/ ƱÉ [¤É¤¦¤Ó¤ç¤¦] /(n) the same sickness/(P)/ ƱÉÂÁêÎù¤ì¤à [¤É¤¦¤Ó¤ç¤¦¤¢¤¤¤¢¤ï¤ì¤à] /(exp) Fellow sufferers pity each other/ -ƱÉãÊì [¤É¤¦¤Õ¤Ü] /(n) the same tqparents/ +ƱÉãÊì [¤É¤¦¤Õ¤Ü] /(n) the same parents/ ƱÉõ [¤É¤¦¤Õ¤¦] /(n,vs) enclosure (e.g. in a letter)/(P)/ Ʊʢ [¤É¤¦¤Õ¤¯] /(n) born of the same mother/kindred spirits/ Ʊʢ»Æ [¤É¤¦¤Õ¤¯¤·] /litter/ @@ -83092,7 +83092,7 @@ ÆϽР[¤È¤É¤±¤Ç] /(n,vs) report/notification/ ÆϽñ [¤È¤É¤±¤¬¤] /(n) (written) report or notification/ ÆϽñ [¤È¤É¤±¤·¤ç] /(n) (written) report or notification/ -ÆФ¬Âë¤òÀ¸¤à [¤È¤ó¤Ó¤¬¤¿¤«¤ò¤¦¤à] /(exp) Even plain tqparents can produce a genius child/ +ÆФ¬Âë¤òÀ¸¤à [¤È¤ó¤Ó¤¬¤¿¤«¤ò¤¦¤à] /(exp) Even plain parents can produce a genius child/ Æиý [¤È¤Ó¤°¤Á] /(n) firefighter's hook/ Æп¦ [¤È¤Ó¤·¤ç¤¯] /(n) scaffolding or construction worker/ Æп¦¿Í [¤È¤Ó¤·¤ç¤¯¤Ë¤ó] /scaffold constructor/steeplejack/ @@ -83978,7 +83978,7 @@ Æó¿ [¤Ë¤·¤ó] /(n) postscript/PS/ Æó¿´ [¤Ë¤·¤ó] /(n) duplicity/treachery/double-dealing/ Æó¿´ [¤Õ¤¿¤´¤³¤í] /(n) duplicity/treachery/double-dealing/ -Æó¿Æ [¤Õ¤¿¤ª¤ä] /(n) tqparents/both tqparents/ +Æó¿Æ [¤Õ¤¿¤ª¤ä] /(n) parents/both parents/ Æó¿ÆÅù [¤Ë¤·¤ó¤È¤¦] /(n) relation in the second degree/ Æó¿Ê [¤Ë¤·¤ó] /(adj-na,n) binary/ Æó¿Ê¤â»°¿Ê¤â [¤Ë¤Ã¤Á¤â¤µ¤Ã¤Á¤â] /(adv,exp) in no way/ @@ -83999,7 +83999,7 @@ Æó¿Íʬ [¤Õ¤¿¤ê¤Ö¤ó] /two persons' portion/ Æó¿ÍÌÜ [¤Õ¤¿¤ê¤á] /second person/ Æó¿ÍÏ¢¤ì [¤Õ¤¿¤ê¤Å¤ì] /party of two/ -ÆóÀ¤ [¤Ë¤»¤¤] /(n) second generation/two existences/the present and the future/junior/the second (king of the same name)/American-born Japanese/foreigner of Japanese tqparentage/(P)/ +ÆóÀ¤ [¤Ë¤»¤¤] /(n) second generation/two existences/the present and the future/junior/the second (king of the same name)/American-born Japanese/foreigner of Japanese parentage/(P)/ ÆóÀ¤¤Î·À¤ê [¤Ë¤»¤Î¤Á¤®¤ê] /(n) marriage vows/ ÆóÀ¤¤Î¸Ç¤á [¤Ë¤»¤Î¤«¤¿¤á] /marriage vows/ ÆóÀ¤¤ÎÌó« [¤Ë¤»¤Î¤ä¤¯¤½¤¯] /marriage vows/ @@ -87817,7 +87817,7 @@ ȿγ»Ò [¤Ï¤ó¤ê¤å¤¦¤·] /(n) antiparticle/ È¿Îã [¤Ï¤ó¤ì¤¤] /(n) counterexample/ È¿ÏÀ [¤Ï¤ó¤í¤ó] /(n,vs) objection/refutation/rebuttal/(P)/ -È¿Ó® [¤Ï¤ó¤Ý] /(n) caring for one's tqparents in return/ +È¿Ó® [¤Ï¤ó¤Ý] /(n) caring for one's parents in return/ È¿Óã [¤Ï¤ó¤¼¤¤] /(n) turning against one's master/returning evil for good/ È¿Ùû [¤Ï¤ó¤Ñ¤Ä] /(n) repelling/repulsion/opposition/rally (of the market)/ È¿çí [¤Ï¤ó¤¹¤¦] /(n) chewing the cud/rumination/ @@ -89164,7 +89164,7 @@ ɨ¤Î»® [¤Ò¤¶¤Î¤µ¤é] /kneecap/ ɨ¤ò¸ò¤¨¤Æ [¤Ò¤¶¤ò¤Þ¤¸¤¨¤Æ] /intimately/sitting knee to knee/ ɨ¤òÊø¤¹ [¤Ò¤¶¤ò¤¯¤º¤¹] /(exp) to sit at ease/ -ɨ²¼ [¤·¤Ã¤«] /(n) at the knees of one's tqparents/at home/ +ɨ²¼ [¤·¤Ã¤«] /(n) at the knees of one's parents/at home/ ɨ³¸¹ü [¤·¤Ä¤¬¤¤¤³¤Ä] /(n) kneecap/patella/ ɨ³¸ç§È¿¼Í [¤·¤Ä¤¬¤¤¤±¤ó¤Ï¤ó¤·¤ã] /kneecap (patellar) reflex/ ɨ³Ý¤± [¤Ò¤¶¤«¤±] /(n) lap blanket/ @@ -90051,7 +90051,7 @@ ÉÔ¸øÊ¿¶¥Áè [¤Õ¤³¤¦¤Ø¤¤¤¤ç¤¦¤½¤¦] /unfair competition/ ÉÔ¸þ¤ [¤Õ¤à¤] /(adj-na,n) unfit/unsuitable/unmarketable/ ÉÔ¹¥¤ [¤Ö¤¹¤] /(n) no liking for/no interest in/ -ÉÔ¹§ [¤Õ¤³¤¦] /(adj-na,n) undutifulness to one's tqparents/lack of filial piety/(P)/ +ÉÔ¹§ [¤Õ¤³¤¦] /(adj-na,n) undutifulness to one's parents/lack of filial piety/(P)/ ÉÔ¹¬ [¤Õ¤³¤¦] /(adj-na,n) unhappiness/sorrow/misfortune/disaster/accident/death/(P)/ ÉÔ¹¬¤¬½Å¤Ê¤ë [¤Õ¤³¤¦¤¬¤«¤µ¤Ê¤ë] /(exp) to have a series of misfortunes/ ÉÔ¹¬¤» [¤Õ¤·¤¢¤ï¤»] /(adj-na,n) unhappiness/misfortune/ill luck/(P)/ @@ -90963,8 +90963,8 @@ Éã¤ÎÆü [¤Á¤Á¤Î¤Ò] /Father's Day/ Éã·¯ [¤Á¤Á¤®¤ß] /(n) father/ Éã·¯ [¤Õ¤¯¤ó] /(n) father/ -Éã·» [¤Õ¤±¤¤] /(n) guardians/tqparents and older brothers/(P)/ -Éã·»²ñ [¤Õ¤±¤¤¤«¤¤] /(n) tqparents' association/ +Éã·» [¤Õ¤±¤¤] /(n) guardians/parents and older brothers/(P)/ +Éã·»²ñ [¤Õ¤±¤¤¤«¤¤] /(n) parents' association/ Éã·Ï [¤Õ¤±¤¤] /(n) agnate/ É㸢 [¤Õ¤±¤ó] /(n) paternal rights/ Éã¸æ [¤Á¤Á¤´] /(n) (another's respected) father/ @@ -90979,10 +90979,10 @@ ÉãÀ [¤Õ¤»¤¤] /(n) paternity/ ÉãÀ°¦ [¤Õ¤»¤¤¤¢¤¤] /paternal love/ ÉãÁÄ [¤Õ¤½] /(n) ancestors/ -ÉãÊì [¤Á¤Á¤Ï¤Ï] /(n) father and mother/tqparents/ -ÉãÊì [¤Õ¤Ü] /(n) father and mother/tqparents/(P)/ -ÉãÊì¤Îµö [¤Õ¤Ü¤Î¤â¤È] /under one's tqparents roof/ -ÉãÊì²ñ [¤Õ¤Ü¤«¤¤] /(n) a tqparents' association/ +ÉãÊì [¤Á¤Á¤Ï¤Ï] /(n) father and mother/parents/ +ÉãÊì [¤Õ¤Ü] /(n) father and mother/parents/(P)/ +ÉãÊì¤Îµö [¤Õ¤Ü¤Î¤â¤È] /under one's parents roof/ +ÉãÊì²ñ [¤Õ¤Ü¤«¤¤] /(n) a parents' association/ ÉãÊý [¤Á¤Á¤«¤¿] /(n) father's side of family/(P)/ Éã̵¤·»Ò [¤Á¤Á¤Ê¤·¤´] /(n) fatherless or illegitimate child/ Éã̵¤·»Ò [¤Æ¤Æ¤Ê¤·¤´] /(n) fatherless or illegitimate child/ @@ -97614,7 +97614,7 @@ ̵ÏÀ [¤à¤í¤ó] /(adv) of course/naturally/(P)/ ̵æØ [¤Ö¤ê¤ç¤¦] /(adj-na,n) boredom/ennui/ ̵íã [¤à¤³] /(n) innocent/blameless/ -̶»Ò [¤Ü¤¦¤·] /cap worn by tqmasked dancer (cap covers hair and nape and reaches to the shoulders)/ +̶»Ò [¤Ü¤¦¤·] /cap worn by masked dancer (cap covers hair and nape and reaches to the shoulders)/ Ì· [¤Û¤³] /(n) halberd/arms/(P)/ Ì·½â [¤à¤¸¤å¤ó] /(n,vs) contradiction/inconsistency/(P)/ Ì·½â¸ìË¡ [¤à¤¸¤å¤ó¤´¤Û¤¦] /(n) oxymoron/ @@ -101273,7 +101273,7 @@ Íܤ¤ [¤ä¤·¤Ê¤¤] /(n) nutrition/nourishment/nurture/bringing up/rearing/ Íܤ¤°é¤Æ¤ë [¤ä¤·¤Ê¤¤¤½¤À¤Æ¤ë] /(v1) to bring up/to foster/to rear/ Íܤ¤»Ò [¤ä¤·¤Ê¤¤¤´] /(n) foster child/ -Íܤ¤¿Æ [¤ä¤·¤Ê¤¤¤ª¤ä] /(n) godtqparents/foster tqparents/ +Íܤ¤¿Æ [¤ä¤·¤Ê¤¤¤ª¤ä] /(n) godparents/foster parents/ Íܤ¦ [¤ä¤·¤Ê¤¦] /(v5u) to rear/to maintain/to cultivate/(P)/ ÍÜ°é [¤è¤¦¤¤¤¯] /(n) bringing up/rearing/upbringing/(P)/ ÍÜ°éÈñ [¤è¤¦¤¤¤¯¤Ò] /child-rearing expenses/ @@ -101308,7 +101308,7 @@ ÍÜÆÚ [¤è¤¦¤È¤ó] /(n) pig-keeping/pig farming/(P)/ ÍÜÆÚ¾ì [¤è¤¦¤È¤ó¤¸¤ç¤¦] /pig or hog farm/ ÍÜÉã [¤è¤¦¤Õ] /(n) foster father/adoptive father/(P)/ -ÍÜÉãÊì [¤è¤¦¤Õ¤Ü] /(n) adoptive tqparents/(P)/ +ÍÜÉãÊì [¤è¤¦¤Õ¤Ü] /(n) adoptive parents/(P)/ ÍÜʬ [¤è¤¦¤Ö¤ó] /(n) nourishment/nutrient/ ÍÜÊì [¤è¤¦¤Ü] /(n) foster mother/adoptive mother/ ÍÜ˪ [¤è¤¦¤Û¤¦] /(n) beekeeping/apiculture/ @@ -102105,7 +102105,7 @@ Τ [¤µ¤È] /(n) (country) home/village/ Τ [¤ê] /(n) ri (old measure)/2.44 miles/(P)/ Τ°ò [¤µ¤È¤¤¤â] /(n) taro (potato)/ -Τµ¢¤ê [¤µ¤È¤¬¤¨¤ê] /(n) visiting one's tqparents/new bride's first visit to tqparents/(P)/ +Τµ¢¤ê [¤µ¤È¤¬¤¨¤ê] /(n) visiting one's parents/new bride's first visit to parents/(P)/ Τ¸À [¤ê¤²¤ó] /(n) dialect/ Τ¸ÀÍÕ [¤µ¤È¤³¤È¤Ð] /(n) dialect/(historical) language used toward customers by women in the drinking-world establishment/ Τ»Ò [¤µ¤È¤´] /(n) foster child/(P)/ @@ -102915,9 +102915,9 @@ ξ¼êÍø [¤ê¤ç¤¦¤Æ¤¤] /ambidextrous (person)/ ξ¼ï [¤ê¤ç¤¦¤·¤å] /both kinds/ ξ¿¦¤ò·ó¤Í¤ë [¤ê¤ç¤¦¤·¤ç¤¯¤ò¤«¤Í¤ë] /(exp) to hold two offices concurrently/ -ξ¿Æ [¤Õ¤¿¤ª¤ä] /(n) tqparents/both tqparents/ -ξ¿Æ [¤ê¤ç¤¦¤·¤ó] /(n) tqparents/both tqparents/(P)/ -ξ¿Æ¤ò¼º¤¦ [¤ê¤ç¤¦¤·¤ó¤ò¤¦¤·¤Ê¤¦] /(exp) to be bereft of one's tqparents/ +ξ¿Æ [¤Õ¤¿¤ª¤ä] /(n) parents/both parents/ +ξ¿Æ [¤ê¤ç¤¦¤·¤ó] /(n) parents/both parents/(P)/ +ξ¿Æ¤ò¼º¤¦ [¤ê¤ç¤¦¤·¤ó¤ò¤¦¤·¤Ê¤¦] /(exp) to be bereft of one's parents/ ξ¿Í [¤ê¤ç¤¦¤Ë¤ó] /(n) both people/ ξ¿Ï [¤â¤í¤Ï] /(adj-no,n) double-edged sword/ ξ¿Ï [¤ê¤ç¤¦¤Ð] /(adj-no,n) double-edged sword/ @@ -106804,7 +106804,7 @@ æú¶Ò [¤Ï¤Ð¤] /(n) leggings/ æú¹ü [¤±¤¤¤³¤Ä] /(n) tibia/shinbone/ æúÅö¤Æ [¤¹¤Í¤¢¤Æ] /(n) greaves/shin guards/ -æúóö¤ê [¤¹¤Í¤«¤¸¤ê] /(n) sponging off one's tqparents/ +æúóö¤ê [¤¹¤Í¤«¤¸¤ê] /(n) sponging off one's parents/ æû [¤·¤å¤¦] /dried meat/dry up/ æûÃÝ [¤·¤å¤¦¤Á¤¯] /(n) tall bamboo/ æþ²¼ [¤¨¤¤«] /(n) armpit/ @@ -106865,7 +106865,7 @@ çͤ¾å¤²¤ë [¤«¤¤¢¤²¤ë] /(v1) to shoulder (palanquin)/ çͤÆþ¤ì¤ë [¤«¤¤¤¤ì¤ë] /(v1) to carry in/ çÏ [¤·¤å¤¦¤È] /(n) father-in-law/(P)/ -çÏ¸È [¤¤å¤¦¤³] /(n) tqparents-in-law/ +çÏ¸È [¤¤å¤¦¤³] /(n) parents-in-law/ çÐÂÀ¼Ô [¤è¤¿¤â¤Î] /(n) (uk) hooligan/layabout/good-for-nothing/gangster/ çÐÏÀ [¤è¤í¤ó] /(oK) (n) public opinion/ çÓ¤Ö¤ë [¤Í¤Ö¤ë] /(io) (v5r) to lick/ diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html index b762bf44..af268309 100644 --- a/kiten/edict_doc.html +++ b/kiten/edict_doc.html @@ -257,7 +257,7 @@ KANJI [kantan] /simple (an)/ In early 2001, as part of the JMdict project (see below), I completely revised this system, instead introducing a comprehensive system of Part of Speech (POS) tags. In the EDICT version of the file these tags usually appear in -tqparentheses +parentheses at the start of the entry, separated into general tags and POS tags. Where a tag applies to a single gloss or meaning, it will be included there instead. </P> diff --git a/kiten/learn.cpp b/kiten/learn.cpp index 79493131..ecdc011b 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -60,10 +60,10 @@ int LearnItem::compare(TQListViewItem *item, int col, bool ascending) const const int Learn::numberOfAnswers = 5; -Learn::Learn(Dict::Index *tqparentDict, TQWidget *tqparent, const char *name) +Learn::Learn(Dict::Index *parentDict, TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name), initialized(false), isMod(false), prevItem(0), curItem(0) { - index = tqparentDict; + index = parentDict; TQWidget *dummy = new TQWidget(this); setCentralWidget(dummy); diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui index a75691bf..684ebc5a 100644 --- a/klatin/klatin/klatinchoose.ui +++ b/klatin/klatin/klatinchoose.ui @@ -256,7 +256,7 @@ verb and noun tables</string> </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/klatin/klatin/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui index 86dcd4f1..850945ed 100644 --- a/klatin/klatin/klatingrammarwidget.ui +++ b/klatin/klatin/klatingrammarwidget.ui @@ -375,7 +375,7 @@ Line 4</string> <tabstop>BackButton</tabstop> <tabstop>ChooseSection</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui index 505da8f8..84d15eec 100644 --- a/klatin/klatin/klatinresultsdialog.ui +++ b/klatin/klatin/klatinresultsdialog.ui @@ -216,7 +216,7 @@ <slot>close()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/klatin/klatin/klatinsettings_vocabpage.ui b/klatin/klatin/klatinsettings_vocabpage.ui index cba77b65..d659140d 100644 --- a/klatin/klatin/klatinsettings_vocabpage.ui +++ b/klatin/klatin/klatinsettings_vocabpage.ui @@ -171,7 +171,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/klatin/klatin/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui index 8448047f..46492b5d 100644 --- a/klatin/klatin/klatinverbswidget.ui +++ b/klatin/klatin/klatinverbswidget.ui @@ -419,7 +419,7 @@ Line 4</string> <tabstop>ChooseMood</tabstop> <tabstop>ChangeButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui index 8f5c653c..6b1840f5 100644 --- a/klatin/klatin/klatinvocabwidget.ui +++ b/klatin/klatin/klatinvocabwidget.ui @@ -381,7 +381,7 @@ <tabstop>Answer4</tabstop> <tabstop>BackButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/klettres/klettres/fontsdlg.ui b/klettres/klettres/fontsdlg.ui index 8e88dc9b..5853adfd 100644 --- a/klettres/klettres/fontsdlg.ui +++ b/klettres/klettres/fontsdlg.ui @@ -31,7 +31,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontdialog.h</includehint> </includehints> diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index cbd4c165..9839f4bf 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -167,11 +167,11 @@ TQString Prefs::defaultLanguage() } -bool KLettres::loadLayout(TQDomDocument &tqlayoutDocument) +bool KLettres::loadLayout(TQDomDocument &layoutDocument) { - TQFile tqlayoutFile(locate("data", "klettres/"+Prefs::language()+"/sounds.xml")); + TQFile layoutFile(locate("data", "klettres/"+Prefs::language()+"/sounds.xml")); //if xml file is not found, program exits - if (!tqlayoutFile.exists()) + if (!layoutFile.exists()) { kdWarning() << "sounds.xml file not found in $KDEDIR/share/apps/klettres/"+Prefs::language() << endl; TQString mString=i18n("The file sounds.xml was not found in\n" @@ -180,15 +180,15 @@ bool KLettres::loadLayout(TQDomDocument &tqlayoutDocument) KMessageBox::information( this, mString,"KLettres - Error" ); kapp->quit();//exit(1); } - if (!tqlayoutFile.open(IO_ReadOnly)) + if (!layoutFile.open(IO_ReadOnly)) return false; //Check if document is well-formed - if (!tqlayoutDocument.setContent(&tqlayoutFile)) + if (!layoutDocument.setContent(&layoutFile)) { - tqlayoutFile.close(); + layoutFile.close(); return false; } - tqlayoutFile.close(); + layoutFile.close(); return true; } diff --git a/klettres/klettres/klettres.h b/klettres/klettres/klettres.h index cff0d88c..54ec92fb 100644 --- a/klettres/klettres/klettres.h +++ b/klettres/klettres/klettres.h @@ -62,10 +62,10 @@ public: TQStringList m_languageNames; /** *Load the xml file - *@param tqlayoutDocument the xml file + *@param layoutDocument the xml file *@return bool true if the xml document is found and well formed, false otherwise */ - bool loadLayout(TQDomDocument &tqlayoutDocument); + bool loadLayout(TQDomDocument &layoutDocument); ///Number corresponding to the selected language: 0 is Czech, 1 is Danish, 2 is English (default), 3 is French, 4 is Dutch, 5 is Slovak //uint selectedLanguage; ///Action that sets up the Language menu diff --git a/klettres/klettres/soundfactory.cpp b/klettres/klettres/soundfactory.cpp index 6a2a0ebf..fdddd5de 100644 --- a/klettres/klettres/soundfactory.cpp +++ b/klettres/klettres/soundfactory.cpp @@ -78,7 +78,7 @@ void SoundFactory::loadFailure() KMessageBox::error(klettres, i18n("Error while loading the sound names.")); } -bool SoundFactory::loadLanguage(TQDomDocument &tqlayoutDocument, TQString currentLanguage) +bool SoundFactory::loadLanguage(TQDomDocument &layoutDocument, TQString currentLanguage) { TQDomNodeList languagesList, alphabetList, @@ -90,7 +90,7 @@ bool SoundFactory::loadLanguage(TQDomDocument &tqlayoutDocument, TQString curren soundNameElement; TQDomAttr nameAttribute, fileAttribute; - languagesList = tqlayoutDocument.elementsByTagName("language"); + languagesList = layoutDocument.elementsByTagName("language"); TQDomAttr codeAttribute; //check if the sound files match current language languageElement = (const TQDomElement &) languagesList.item(0).toElement(); diff --git a/klettres/klettres/soundfactory.h b/klettres/klettres/soundfactory.h index e6105db7..032ad0ca 100644 --- a/klettres/klettres/soundfactory.h +++ b/klettres/klettres/soundfactory.h @@ -65,7 +65,7 @@ public: * Call that when you read the language from Config and when the language changes * or when the level changes */ - bool loadLanguage(TQDomDocument &tqlayoutDocument, TQString currentLanguage); + bool loadLanguage(TQDomDocument &layoutDocument, TQString currentLanguage); ///The language document TQDomDocument m_layoutsDocument; diff --git a/klettres/klettres/timerdlg.ui b/klettres/klettres/timerdlg.ui index afbe9b63..089399a8 100644 --- a/klettres/klettres/timerdlg.ui +++ b/klettres/klettres/timerdlg.ui @@ -238,7 +238,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui index 420aed33..c2d8b98a 100644 --- a/kmplot/kmplot/FktDlgData.ui +++ b/kmplot/kmplot/FktDlgData.ui @@ -417,7 +417,7 @@ <slot access="protected">slotHelp()</slot> <slot>slotNewPrime()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index d4239cef..50fdc6d8 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -63,13 +63,13 @@ class KmPlotIO; bool MainDlg::oldfileversion; -MainDlg::MainDlg(TQWidget *tqparentWidget, const char *, TQObject *tqparent, const char *name) : DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( tqparent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(tqparentWidget) +MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *tqparent, const char *name) : DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( tqparent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(parentWidget) { // we need an instance setInstance( KmPlotPartFactory::instance() ); - kdDebug() << "tqparentWidget->name():" << tqparentWidget->name() << endl; - if ( TQString(tqparentWidget->name()).startsWith("KmPlot") ) + kdDebug() << "parentWidget->name():" << parentWidget->name() << endl; + if ( TQString(parentWidget->name()).startsWith("KmPlot") ) { setXMLFile("kmplot_part.rc"); m_readonly = false; @@ -82,14 +82,14 @@ MainDlg::MainDlg(TQWidget *tqparentWidget, const char *, TQObject *tqparent, con } fdlg = 0; coordsDialog = 0; - m_popupmenu = new KPopupMenu(tqparentWidget); - view = new View( m_readonly, m_modified, m_popupmenu, tqparentWidget ); + m_popupmenu = new KPopupMenu(parentWidget); + view = new View( m_readonly, m_modified, m_popupmenu, parentWidget ); connect( view, TQT_SIGNAL( setStatusBarText(const TQString &)), this, TQT_SLOT( setReadOnlyStatusBarText(const TQString &) ) ); setWidget( view ); view->setFocusPolicy(TQ_ClickFocus); minmaxdlg = new KMinMax(view, m_parent); view->setMinMaxDlg(minmaxdlg); - m_quickEdit = new KLineEdit( tqparentWidget ); + m_quickEdit = new KLineEdit( parentWidget ); m_quickEdit->setFocus(); TQToolTip::add( m_quickEdit, i18n( "Enter a function equation, for example: f(x)=x^2" ) ); setupActions(); @@ -99,7 +99,7 @@ MainDlg::MainDlg(TQWidget *tqparentWidget, const char *, TQObject *tqparent, con m_recentFiles->loadEntries( m_config ); // Let's create a Configure Diloag - m_settingsDialog = new KConfigDialog( tqparentWidget, "settings", Settings::self() ); + m_settingsDialog = new KConfigDialog( parentWidget, "settings", Settings::self() ); m_settingsDialog->setHelp("general-config"); // create and add the page(s) @@ -785,12 +785,12 @@ KmPlotPartFactory::~KmPlotPartFactory() s_instance = 0L; } -KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *, const TQStringList & ) { // Create an instance of our Part - MainDlg* obj = new MainDlg( tqparentWidget, widgetName, tqparent, name ); + MainDlg* obj = new MainDlg( parentWidget, widgetName, tqparent, name ); emit objectCreated( obj ); return obj; } diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h index 8609de0e..ed6e1b14 100644 --- a/kmplot/kmplot/MainDlg.h +++ b/kmplot/kmplot/MainDlg.h @@ -74,11 +74,11 @@ class MainDlg : public KParts::ReadOnlyPart, virtual public MainDlgIface public: /** Constuctor. - * @param tqparentWidget tqparent widget for this part + * @param parentWidget tqparent widget for this part * @param tqparent tqparent object * @param name name of this dialog */ - MainDlg(TQWidget *tqparentWidget, const char *, TQObject *tqparent, const char *name); + MainDlg(TQWidget *parentWidget, const char *, TQObject *tqparent, const char *name); /// Cleaning up a bit. virtual ~MainDlg(); /// This class needs access to private members, too. @@ -221,7 +221,7 @@ class KmPlotPartFactory : public KParts::Factory public: KmPlotPartFactory(); virtual ~KmPlotPartFactory(); - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/kmplot/kmplot/editderivativespage.ui b/kmplot/kmplot/editderivativespage.ui index 7c23ecb4..f8693ecc 100644 --- a/kmplot/kmplot/editderivativespage.ui +++ b/kmplot/kmplot/editderivativespage.ui @@ -268,7 +268,7 @@ <tabstop>lineWidthDerivative2</tabstop> <tabstop>colorDerivative2</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui index 3a7fccb4..e7ecf01d 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -897,7 +897,7 @@ Example: f(x)=x^2</string> <slot>slotHelp()</slot> <slot>customRange_toggled( bool )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmplot/kmplot/editintegralpage.ui b/kmplot/kmplot/editintegralpage.ui index f5b03006..694edf46 100644 --- a/kmplot/kmplot/editintegralpage.ui +++ b/kmplot/kmplot/editintegralpage.ui @@ -281,7 +281,7 @@ <tabstop>lineWidth</tabstop> <tabstop>color</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp index a51b5395..5b364731 100644 --- a/kmplot/kmplot/kmplotio.cpp +++ b/kmplot/kmplot/kmplotio.cpp @@ -210,12 +210,12 @@ bool KmPlotIO::save( const KURL &url ) } -void KmPlotIO::addTag( TQDomDocument &doc, TQDomElement &tqparentTag, const TQString tagName, const TQString tagValue ) +void KmPlotIO::addTag( TQDomDocument &doc, TQDomElement &parentTag, const TQString tagName, const TQString tagValue ) { TQDomElement tag = doc.createElement( tagName ); TQDomText value = doc.createTextNode( tagValue ); tag.appendChild( value ); - tqparentTag.appendChild( tag ); + parentTag.appendChild( tag ); } bool KmPlotIO::load( const KURL &url ) diff --git a/kmplot/kmplot/kmplotio.h b/kmplot/kmplot/kmplotio.h index 09112bbd..04425ed2 100644 --- a/kmplot/kmplot/kmplotio.h +++ b/kmplot/kmplot/kmplotio.h @@ -60,11 +60,11 @@ class KmPlotIO private: /** Esay way to add a tag to the Dom tree * @param &doc The document. - * @param tqparentTag The tqparent tag to support encapsulated tags. + * @param parentTag The tqparent tag to support encapsulated tags. * @param tagName The Name of the tag. * @param tagValue The data between the opening and cloding tag. */ - void addTag( TQDomDocument &doc, TQDomElement &tqparentTag, const TQString tagName, const TQString tagValue ); + void addTag( TQDomDocument &doc, TQDomElement &parentTag, const TQString tagName, const TQString tagValue ); /// Reads axes parameters from the node @a n. /// @param n Node containing the options. void parseAxes( const TQDomElement &n ); diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp index 2b10f31c..9ccf7b5a 100644 --- a/kmplot/kmplot/parser.cpp +++ b/kmplot/kmplot/parser.cpp @@ -962,7 +962,7 @@ int Parser::parserError(bool showMessageBox) "Syntax error").tqarg(TQString::number(errpos)), "KmPlot"); break; case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Missing tqparenthesis").tqarg(TQString::number(errpos)), "KmPlot"); + "Missing parenthesis").tqarg(TQString::number(errpos)), "KmPlot"); break; case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n" "Function name unknown").tqarg(TQString::number(errpos)), "KmPlot"); diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui index c26b5e8d..366f7d8d 100644 --- a/kmplot/kmplot/qconstanteditor.ui +++ b/kmplot/kmplot/qconstanteditor.ui @@ -193,7 +193,7 @@ <slot>newNewConstantSlot()</slot> <slot>varlist_doubleClicked( TQListViewItem * )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui index 577c0f31..85e9236d 100644 --- a/kmplot/kmplot/qeditconstant.ui +++ b/kmplot/kmplot/qeditconstant.ui @@ -131,7 +131,7 @@ <Q_SLOTS> <slot>txtVariable_lostFocus()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui index 0ec4b6fa..41fa84c4 100644 --- a/kmplot/kmplot/qeditparametric.ui +++ b/kmplot/kmplot/qeditparametric.ui @@ -531,7 +531,7 @@ Example: sin(t)</string> <Q_SLOTS> <slot>slotHelp()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui index ccdae895..e582734b 100644 --- a/kmplot/kmplot/qeditpolar.ui +++ b/kmplot/kmplot/qeditpolar.ui @@ -395,7 +395,7 @@ Example: loop(angle)=ln(angle)</string> <Q_SLOTS> <slot>slotHelp()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kmplot/kmplot/qminmax.ui b/kmplot/kmplot/qminmax.ui index efc122e5..98996444 100644 --- a/kmplot/kmplot/qminmax.ui +++ b/kmplot/kmplot/qminmax.ui @@ -138,5 +138,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/qparametereditor.ui b/kmplot/kmplot/qparametereditor.ui index 3a733e64..18d7dce4 100644 --- a/kmplot/kmplot/qparametereditor.ui +++ b/kmplot/kmplot/qparametereditor.ui @@ -181,5 +181,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/settingspagecolor.ui b/kmplot/kmplot/settingspagecolor.ui index 3a8bd02e..ba35f0c5 100644 --- a/kmplot/kmplot/settingspagecolor.ui +++ b/kmplot/kmplot/settingspagecolor.ui @@ -455,5 +455,5 @@ <tabstop>kcfg_Color8</tabstop> <tabstop>kcfg_Color9</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/settingspagecoords.ui b/kmplot/kmplot/settingspagecoords.ui index b32c489a..65d78d92 100644 --- a/kmplot/kmplot/settingspagecoords.ui +++ b/kmplot/kmplot/settingspagecoords.ui @@ -751,7 +751,7 @@ <tabstop>radioButton14</tabstop> <tabstop>kcfg_GridLineWidth</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui index 0b6f5ba9..7564d04a 100644 --- a/kmplot/kmplot/settingspagefonts.ui +++ b/kmplot/kmplot/settingspagefonts.ui @@ -119,7 +119,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontcombo.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kmplot/kmplot/settingspageprecision.ui b/kmplot/kmplot/settingspageprecision.ui index 7b0aec87..3ad5d990 100644 --- a/kmplot/kmplot/settingspageprecision.ui +++ b/kmplot/kmplot/settingspageprecision.ui @@ -268,7 +268,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kmplot/kmplot/settingspagescaling.ui b/kmplot/kmplot/settingspagescaling.ui index 729625c4..3b0cd872 100644 --- a/kmplot/kmplot/settingspagescaling.ui +++ b/kmplot/kmplot/settingspagescaling.ui @@ -411,5 +411,5 @@ <tabstop>kcfg_YScaling</tabstop> <tabstop>kcfg_YPrinting</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/sliderwindow.ui b/kmplot/kmplot/sliderwindow.ui index 3dc6dbf2..c54384a2 100644 --- a/kmplot/kmplot/sliderwindow.ui +++ b/kmplot/kmplot/sliderwindow.ui @@ -83,5 +83,5 @@ <slot>setNum(int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp index 7e12bafc..a44602f0 100644 --- a/kpercentage/kpercentage/kanswer.cpp +++ b/kpercentage/kpercentage/kanswer.cpp @@ -68,7 +68,7 @@ KAnswer::KAnswer( TQWidget *tqparent ): KDialog( tqparent, "answer", TRUE ) canvas_view->setBackgroundPixmap( bgp ); /////// - // begin tqlayouting + // begin layouting /////// mainLayout = new TQHBoxLayout( this ); mainLayout->setDirection(TQBoxLayout::LeftToRight); @@ -103,7 +103,7 @@ KAnswer::KAnswer( TQWidget *tqparent ): KDialog( tqparent, "answer", TRUE ) rightLayout->addSpacing( 20 ); /////// - // end tqlayouting + // end layouting /////// connect( ButtonOK, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp index db4a8875..f9608601 100644 --- a/kpercentage/kpercentage/kpercentage.cpp +++ b/kpercentage/kpercentage/kpercentage.cpp @@ -108,7 +108,7 @@ KPercentage::KPercentage( const char *name ) : connect( button_close, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); //////// - // begin tqlayouting + // begin layouting //////// TQVBoxLayout *main_layout = new TQVBoxLayout( this, 20, 20, "main_layout" ); main_layout->setResizeMode( TQLayout::FreeResize ); @@ -145,7 +145,7 @@ KPercentage::KPercentage( const char *name ) : main_layout->addStretch(); //////// - // end tqlayouting + // end layouting //////// //////// diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp index e1966ba3..3d49e68a 100644 --- a/kpercentage/kpercentage/kpercentmain.cpp +++ b/kpercentage/kpercentage/kpercentmain.cpp @@ -119,7 +119,7 @@ KPercentMain::KPercentMain( TQWidget *tqparent, const char *name ) : label_count->setBackgroundOrigin( TQDialog::ParentOrigin ); ////// - // begin tqlayouting + // begin layouting ////// TQVBoxLayout *main_layout = new TQVBoxLayout ( this, 0, -1, "main_layout" ); main_layout->setMargin( 20 ); diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui index 6e475863..30abaeb3 100644 --- a/kstars/kstars/addcatdialogui.ui +++ b/kstars/kstars/addcatdialogui.ui @@ -350,7 +350,7 @@ <tabstop>CatalogName</tabstop> <tabstop>CatalogURL</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui index 3f1613fc..89092759 100644 --- a/kstars/kstars/addlinkdialogui.ui +++ b/kstars/kstars/addlinkdialogui.ui @@ -149,5 +149,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui index 4b461a39..4f4399f9 100644 --- a/kstars/kstars/ccdpreviewui.ui +++ b/kstars/kstars/ccdpreviewui.ui @@ -425,7 +425,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/contrastbrightnessgui.ui b/kstars/kstars/contrastbrightnessgui.ui index 8a348f79..22b23b67 100644 --- a/kstars/kstars/contrastbrightnessgui.ui +++ b/kstars/kstars/contrastbrightnessgui.ui @@ -118,7 +118,7 @@ <slot>setValue(int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index 2c442d48..91ac6a79 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -990,7 +990,7 @@ void DetailDialog::centerTelescope() sp.set (ksw->map()->clickedPoint()->ra(), ksw->map()->clickedPoint()->dec()); if (useJ2000) - sp.aptqparentCoord(ksw->data()->ut().djd(), (long double) J2000); + sp.apparentCoord(ksw->data()->ut().djd(), (long double) J2000); RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second())); DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec())); diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui index 8bbb82c6..e665d099 100644 --- a/kstars/kstars/details_data.ui +++ b/kstars/kstars/details_data.ui @@ -590,7 +590,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui index d65b94d9..51dd7e3c 100644 --- a/kstars/kstars/details_database.ui +++ b/kstars/kstars/details_database.ui @@ -48,7 +48,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui index 849e44bc..352d4b5b 100644 --- a/kstars/kstars/details_links.ui +++ b/kstars/kstars/details_links.ui @@ -176,7 +176,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kstars/kstars/details_log.ui b/kstars/kstars/details_log.ui index 34b826b1..ea1ac9d8 100644 --- a/kstars/kstars/details_log.ui +++ b/kstars/kstars/details_log.ui @@ -73,5 +73,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui index 9a6293db..940b16a2 100644 --- a/kstars/kstars/details_position.ui +++ b/kstars/kstars/details_position.ui @@ -909,7 +909,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui index 0ed1405c..4a7b5be8 100644 --- a/kstars/kstars/devmanager.ui +++ b/kstars/kstars/devmanager.ui @@ -426,7 +426,7 @@ <slot>close()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui index 6c739367..d00c90ee 100644 --- a/kstars/kstars/fitsheaderdialog.ui +++ b/kstars/kstars/fitsheaderdialog.ui @@ -113,5 +113,5 @@ <slot>close()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 600b34a5..7fbce4e5 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -97,7 +97,7 @@ void FocusDialog::validatePoint() { Point = new SkyPoint( ra, dec ); double epoch0 = getEpoch( fdlg->epochName->text() ); long double jd0 = epochToJd ( epoch0 ); - Point->aptqparentCoord(jd0, ks->data()->ut().djd() ); + Point->apparentCoord(jd0, ks->data()->ut().djd() ); TQDialog::accept(); } else { diff --git a/kstars/kstars/focusdialogdlg.ui b/kstars/kstars/focusdialogdlg.ui index ecab250b..4484e1be 100644 --- a/kstars/kstars/focusdialogdlg.ui +++ b/kstars/kstars/focusdialogdlg.ui @@ -204,7 +204,7 @@ <Q_SLOTS> <slot>checkLineEdits()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui index fd50aa4a..31df9717 100644 --- a/kstars/kstars/fovdialogui.ui +++ b/kstars/kstars/fovdialogui.ui @@ -182,7 +182,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/histdialog.ui b/kstars/kstars/histdialog.ui index 6b456224..2711b215 100644 --- a/kstars/kstars/histdialog.ui +++ b/kstars/kstars/histdialog.ui @@ -332,7 +332,7 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index 667bff39..6fd1a362 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -607,5 +607,5 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui index e527ed92..14bb6a94 100644 --- a/kstars/kstars/imgsequencedlgui.ui +++ b/kstars/kstars/imgsequencedlgui.ui @@ -483,7 +483,7 @@ <tabstop>stopB</tabstop> <tabstop>closeB</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/indi/LICENSE b/kstars/kstars/indi/LICENSE index fbb61ee9..c4b38a7e 100644 --- a/kstars/kstars/indi/LICENSE +++ b/kstars/kstars/indi/LICENSE @@ -257,7 +257,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure tqlayouts and accessors, and small macros and small inline +structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 2b97db7e..0481ecfc 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp @@ -611,7 +611,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UntqmaskIrqs(); +// UnmaskIrqs(); if ( ret ) { // We were successfull @@ -746,7 +746,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UntqmaskIrqs(); +// UnmaskIrqs(); return ret; } diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h index 62f50421..afe23774 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.h +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h @@ -272,7 +272,7 @@ public: // void MaskIrqs(); // Restore default IRQ tqmask -// void UntqmaskIrqs(); +// void UnmaskIrqs(); // Starts flushing the camera (which should be the normal idle state) // If Rows is non-negative, only the specified number of rows are flushed, @@ -357,7 +357,7 @@ public: // 1 or CMOS: Complementary Metal-Oxide-Silicon Camera_CoolertqStatus m_CoolertqStatus; // Last known cooler status. - unsigned int m_IRTQMask; // Set of IRQs tqmasked on user request // 0: Off + unsigned int m_IRTQMask; // Set of IRQs masked on user request // 0: Off // 1: Ramping to set point // 2: Correcting // 3: Ramping to ambient diff --git a/kstars/kstars/indi/celestrongps.cpp b/kstars/kstars/indi/celestrongps.cpp index 5eb7fe81..e8c67553 100644 --- a/kstars/kstars/indi/celestrongps.cpp +++ b/kstars/kstars/indi/celestrongps.cpp @@ -316,7 +316,7 @@ void CelestronGPS::ISNewNumber (const char *dev, const char *name, double values JD = UTtoJD(tp); IDLog("We recevined JNOW RA %f - DEC %f\n", newRA, newDEC);; - /*aptqparentCoord( (double) J2000, JD, &newRA, &newDEC); + /*apparentCoord( (double) J2000, JD, &newRA, &newDEC); IDLog("Processed to RA %f - DEC %f\n", newRA, newDEC);*/ //eqNum.np[0].value = values[0]; @@ -637,7 +637,7 @@ void CelestronGPS::ISPoll() currentRA = targetRA; currentDEC = targetDEC; - /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; eqNum.np[1].value = currentDEC; @@ -693,7 +693,7 @@ void CelestronGPS::ISPoll() currentRA = GetRA(); currentDEC = GetDec(); - /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; diff --git a/kstars/kstars/indi/indicom.c b/kstars/kstars/indi/indicom.c index 6b648f99..15b02c8e 100644 --- a/kstars/kstars/indi/indicom.c +++ b/kstars/kstars/indi/indicom.c @@ -63,7 +63,7 @@ void updateAstroValues( double jd ); void nutate(double *RA, double *Dec); void aberrate(double *RA, double *Dec); void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec); -void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec); +void apparentCoord(double jd0, double jdf, double *RA, double *Dec); void getSexComponents(double value, int *d, int *m, int *s); double K = ( 20.49552 / 3600. ); @@ -370,7 +370,7 @@ void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec) *RA = ( *RA + 360.0 ); } -void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec) +void apparentCoord(double jd0, double jdf, double *RA, double *Dec) { *RA = *RA * 15.0; diff --git a/kstars/kstars/indi/indicom.h b/kstars/kstars/indi/indicom.h index 6f59a63d..47526cad 100644 --- a/kstars/kstars/indi/indicom.h +++ b/kstars/kstars/indi/indicom.h @@ -175,7 +175,7 @@ void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec); \param RA a pointer to a double containing the Right ascension in hours. The function stores the processed Right ascension back in this variable. \param Dec a pointer to a double containing the delination in degrees. The function stores the processed delination back in this variable. */ -void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec); +void apparentCoord(double jd0, double jdf, double *RA, double *Dec); /*@}*/ diff --git a/kstars/kstars/indi/lilxml.c b/kstars/kstars/indi/lilxml.c index 4d52aaf2..1fec3989 100644 --- a/kstars/kstars/indi/lilxml.c +++ b/kstars/kstars/indi/lilxml.c @@ -296,14 +296,14 @@ nextXMLAtt (XMLEle *ep, int init) /* return tqparent of given XMLEle */ XMLEle * -tqparentXMLEle (XMLEle *ep) +parentXMLEle (XMLEle *ep) { return (ep->pe); } /* return tqparent element of given XMLAtt */ XMLEle * -tqparentXMLAtt (XMLAtt *ap) +parentXMLAtt (XMLAtt *ap) { return (ap->ce); } diff --git a/kstars/kstars/indi/lilxml.h b/kstars/kstars/indi/lilxml.h index 1b638f5b..b9d1da4e 100644 --- a/kstars/kstars/indi/lilxml.h +++ b/kstars/kstars/indi/lilxml.h @@ -133,12 +133,12 @@ extern XMLAtt *nextXMLAtt (XMLEle *ep, int first); /** \brief Return the tqparent of an XML element. \return a pointer to the XML element tqparent. */ -extern XMLEle *tqparentXMLEle (XMLEle *ep); +extern XMLEle *parentXMLEle (XMLEle *ep); /** \brief Return the tqparent of an XML attribute. \return a pointer to the XML element tqparent. */ -extern XMLEle *tqparentXMLAtt (XMLAtt *ap); +extern XMLEle *parentXMLAtt (XMLAtt *ap); /* access functions */ /** \brief Return the tag of an XML element. diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp index afe1b952..5c91f1c3 100644 --- a/kstars/kstars/indi/lx200generic.cpp +++ b/kstars/kstars/indi/lx200generic.cpp @@ -562,7 +562,7 @@ void LX200Generic::ISNewNumber (const char *dev, const char *name, double values IDLog("We received J2000 RA %g - DEC %g\n", newRA, newDEC); IDLog("We received J2000 RA %s - DEC %s\n", RAStr, DecStr); - /*aptqparentCoord( (double) J2000, JD, &newRA, &newDEC); + /*apparentCoord( (double) J2000, JD, &newRA, &newDEC); fs_sexa(RAStr, newRA, 2, 3600); fs_sexa(DecStr, newDEC, 2, 3600); @@ -1406,7 +1406,7 @@ void LX200Generic::ISPoll() case IPS_BUSY: getLX200RA(¤tRA); getLX200DEC(¤tDEC); - /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; eqNum.np[1].value = currentDEC; diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui index ab96b65a..cd8917e4 100644 --- a/kstars/kstars/indiconf.ui +++ b/kstars/kstars/indiconf.ui @@ -405,7 +405,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index 9d724b56..962192cb 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -87,12 +87,12 @@ const char * indi_std[NINDI_STD] = ** INDI Device: The work-horse. Responsible for handling its ** child properties and managing signal and changes. *******************************************************************/ -INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *tqparentManager, TQString inName, TQString inLabel) +INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inName, TQString inLabel) { name = inName; label = inLabel; tqparent = menuParent; - tqparentMgr = tqparentManager; + parentMgr = parentManager; gl.setAutoDelete(true); @@ -183,7 +183,7 @@ int INDI_D::setAnyCmd (XMLEle *root, char errmsg[]) return (-1); } - tqparentMgr->checkMsg (root, this); + parentMgr->checkMsg (root, this); return (setValue (pp, root, errmsg)); } @@ -634,7 +634,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[]) pp->timeout = ap ? atof(valuXMLAtt(ap)) : 0; /* log any messages */ - tqparentMgr->checkMsg (root, this); + parentMgr->checkMsg (root, this); pp->addGUI(root); diff --git a/kstars/kstars/indidevice.h b/kstars/kstars/indidevice.h index 1ebcefa2..80d589ce 100644 --- a/kstars/kstars/indidevice.h +++ b/kstars/kstars/indidevice.h @@ -72,7 +72,7 @@ class INDI_D : public KDialogBase Q_OBJECT TQ_OBJECT public: - INDI_D(INDIMenu *tqparentMenu, DeviceManager *tqparentManager, TQString inName, TQString inLabel); + INDI_D(INDIMenu *parentMenu, DeviceManager *parentManager, TQString inName, TQString inLabel); ~INDI_D(); TQString name; /* device name */ @@ -97,7 +97,7 @@ class INDI_D : public KDialogBase bool INDIStdSupport; INDIMenu *tqparent; - DeviceManager *tqparentMgr; + DeviceManager *parentMgr; enum DTypes { DATA_FITS, DATA_STREAM, DATA_OTHER, DATA_CCDPREVIEW }; diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index d3eacae9..248007af 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -66,12 +66,12 @@ XMLEle * findEle (XMLEle *ep, INDI_P *pp, const char *child, char errmsg[]) /******************************************************************* ** INDI Element *******************************************************************/ -INDI_E::INDI_E(INDI_P *tqparentProperty, TQString inName, TQString inLabel) +INDI_E::INDI_E(INDI_P *parentProperty, TQString inName, TQString inLabel) { name = inName; label = inLabel; - pp = tqparentProperty; + pp = parentProperty; EHBox = new TQHBoxLayout(0, 0, KDialog::spacingHint()); label_w = NULL; diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h index 09571062..5961c204 100644 --- a/kstars/kstars/indielement.h +++ b/kstars/kstars/indielement.h @@ -91,7 +91,7 @@ class INDI_E : public TQObject Q_OBJECT TQ_OBJECT public: - INDI_E(INDI_P *tqparentProperty, TQString inName, TQString inLabel); + INDI_E(INDI_P *parentProperty, TQString inName, TQString inLabel); ~INDI_E(); TQString name; /* name */ TQString label; /* label is the name by default, unless specefied */ diff --git a/kstars/kstars/indigroup.cpp b/kstars/kstars/indigroup.cpp index 61d79061..e535c228 100644 --- a/kstars/kstars/indigroup.cpp +++ b/kstars/kstars/indigroup.cpp @@ -28,9 +28,9 @@ ** belong to a group, whether they have one or not but how the group ** is displayed differs *******************************************************************/ -INDI_G::INDI_G(INDI_D *tqparentDevice, TQString inName) +INDI_G::INDI_G(INDI_D *parentDevice, TQString inName) { - dp = tqparentDevice; + dp = parentDevice; name = inName; diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h index 22a7d2ca..0b7651d5 100644 --- a/kstars/kstars/indigroup.h +++ b/kstars/kstars/indigroup.h @@ -28,7 +28,7 @@ class TQVBoxLayout; class INDI_G { public: - INDI_G(INDI_D *tqparentDevice, TQString inName); + INDI_G(INDI_D *parentDevice, TQString inName); ~INDI_G(); TQString name; /* Group name */ diff --git a/kstars/kstars/indihostconf.ui b/kstars/kstars/indihostconf.ui index 7f1df321..e91f64bf 100644 --- a/kstars/kstars/indihostconf.ui +++ b/kstars/kstars/indihostconf.ui @@ -186,5 +186,5 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index e47a83e6..dbdbca94 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -49,11 +49,11 @@ /******************************************************************* ** INDI Property: contains widgets, labels, and their status *******************************************************************/ -INDI_P::INDI_P(INDI_G *tqparentGroup, TQString inName) +INDI_P::INDI_P(INDI_G *parentGroup, TQString inName) { name = inName; - pg = tqparentGroup; + pg = parentGroup; el.setAutoDelete(true); @@ -193,9 +193,9 @@ void INDI_P::newText() indistd->newText(); if (guitype == PG_TEXT) - pg->dp->tqparentMgr->sendNewText(this); + pg->dp->parentMgr->sendNewText(this); else if (guitype == PG_NUMERIC) - pg->dp->tqparentMgr->sendNewNumber(this); + pg->dp->parentMgr->sendNewNumber(this); } @@ -308,7 +308,7 @@ void INDI_P::newSwitch(int id) if (indistd->newSwitch(id, lp)) return; - pg->dp->tqparentMgr->sendNewSwitch (this, id); + pg->dp->parentMgr->sendNewSwitch (this, id); } @@ -379,10 +379,10 @@ void INDI_P::newBlob() if (sending == false) { sending = true; - pg->dp->tqparentMgr->startBlob (pg->dp->name, name, TQString(timestamp())); + pg->dp->parentMgr->startBlob (pg->dp->name, name, TQString(timestamp())); } - pg->dp->tqparentMgr->sendOneBlob(el.at(i)->name, data64_size, format, data64); + pg->dp->parentMgr->sendOneBlob(el.at(i)->name, data64_size, format, data64); fp.close(); delete (data64); @@ -393,7 +393,7 @@ void INDI_P::newBlob() if (!sending && !valid) return; else if (sending) - pg->dp->tqparentMgr->finishBlob(); + pg->dp->parentMgr->finishBlob(); if (valid) state = PS_BUSY; diff --git a/kstars/kstars/indiproperty.h b/kstars/kstars/indiproperty.h index 7e98af14..af4eb261 100644 --- a/kstars/kstars/indiproperty.h +++ b/kstars/kstars/indiproperty.h @@ -36,7 +36,7 @@ class INDI_P : public TQObject Q_OBJECT TQ_OBJECT public: - INDI_P(INDI_G *tqparentGroup, TQString inName); + INDI_P(INDI_G *parentGroup, TQString inName); ~INDI_P(); TQString name; /* property name */ @@ -73,7 +73,7 @@ class INDI_P : public TQObject void addGUI(XMLEle *root); /* Set Property's tqparent group */ - void setGroup(INDI_G *tqparentGroup) { pg = tqparentGroup; } + void setGroup(INDI_G *parentGroup) { pg = parentGroup; } /* Find an element within the property */ INDI_E * findElement(TQString elementName); diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp index f01551c7..ff9f1ad8 100644 --- a/kstars/kstars/indistd.cpp +++ b/kstars/kstars/indistd.cpp @@ -375,7 +375,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d if (streamWindow) { //sNotifier->disconnect(); - //dp->tqparentMgr->sNotifier->disconnect(); + //dp->parentMgr->sNotifier->disconnect(); streamWindow->enableStream(false); streamWindow->close(); @@ -566,7 +566,7 @@ void INDIStdDevice::updateLocation() { for (unsigned int i=0; i < drivers->devices.size(); i++) { - if (drivers->devices[i]->mgrID == dp->tqparentMgr->mgrID) + if (drivers->devices[i]->mgrID == dp->parentMgr->mgrID) { if (drivers->devices[i]->deviceType == KSTARS_TELESCOPE) { @@ -767,7 +767,7 @@ void INDIStdDevice::timerDone() if (useJ2000) { sp.set(currentObject->ra(), currentObject->dec()); - sp.aptqparentCoord( ksw->data()->ut().djd() , (long double) J2000); + sp.apparentCoord( ksw->data()->ut().djd() , (long double) J2000); } // We need to get from JNow (Skypoint) to J2000 @@ -821,7 +821,7 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN { for (unsigned int i=0; i < drivers->devices.size(); i++) { - if (drivers->devices[i]->mgrID == stdDev->dp->tqparentMgr->mgrID) + if (drivers->devices[i]->mgrID == stdDev->dp->parentMgr->mgrID) { if (drivers->devices[i]->deviceType == KSTARS_TELESCOPE) { @@ -926,7 +926,7 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN sp.set (ksw->map()->clickedPoint()->ra(), ksw->map()->clickedPoint()->dec()); if (useJ2000) - sp.aptqparentCoord(ksw->data()->ut().djd(), (long double) J2000); + sp.apparentCoord(ksw->data()->ut().djd(), (long double) J2000); RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second())); DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec())); diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui index 337dab7e..53d6871f 100644 --- a/kstars/kstars/kswizardui.ui +++ b/kstars/kstars/kswizardui.ui @@ -843,7 +843,7 @@ button to proceed. </p> <data format="PNG" length="1110">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000041d49444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d09a6c508138cb8c13d647141163de49043bca9f1628eb9294810f24f88c15b728b07617358888785d980427290b4a8d00b19a8821da8228cf42316ac87eed9247ac95c9aeaeef9eaabdffb5ebf85f178ccfcf7f5b79fec07a7280a08a008f25ceb7c29e5da573716e65a0be3f198ef6f5ededff9b9e1b34faf90882092a1ea21428b9220ffbf46054055b19386ba6970ae6665b5e0d2c5eb0b066067bbe1f21757c88f5504eff0c192189081303a5582b16854fccce2fe041f00cdd0a8103b874556405476b62d972ec2c2b90ff3fd8df5cb946549d80b34aea15ccaa94625450e2d0e558b460b7371a734b5e027251a155545678ab62d7eea90b4c504078908c107acb354cb251b1f8f08b1c18631aabbb4d18211404804f22545863561d2f060fb34aa8a18d0086204e72c46a32292e1a796f278c1da7a859d8da9a737506db04d0a24103d8949480b214d3bbee952a05c1d536f9d2684160c744f048311543d459eb1b65ee1754cedae13a64abd5d6127053c9d0281f22d4f75c6a2118a5c09272d7ab740638bf4ef2dd2174032d0d8d04c6fe19c32bedd8bc65e342aa3f785e2784bfd6bc1bd9db24b05505616a4edd67d5a8c1801a03a9962754c504bf34b8986acfb9be91cac7d54315a15541b36b134f74bd2dc53940115a5381e087bc25c6f71be831a8baa234cc1ee3eeb74ed83116beb2b8849d108a3730e8ce27e2bfb82419a7b407ac7c222fd0e6280a8078ce64e47ef54ac9d5be9aaae0162e0de568a44a18d3df90845d919c4f01463406340a44f40efb43a99b371618488e2670d1a2d7ee6f1d3be39342104e937ed85fb86599c33e9ee0be9a004946259d8b858909880d59aa00daa0d3280b5f39e34074c4b3a5434029a76a9e9f5cc0163b5c80024158a1cfc4cb1d3061d5834066cb0a403c008599a70f6bc27b8d03106ea3ae91987278c5b143b015547224ab5e24185cd9b81665273e7b6e7cecd82ddbf8098002de94049737bc09828cf3036f31c3735c8b0e98eb704672f348c7f7c93cd1fb2ae905119ff54e0dff3542b0e9dd983dcea2cc5eea6cf303e74ec687af5c41b6fa38f5e203c7ec8e1238ef85831a214afef21060ea781ec68247b65c6916353cc8b73d1ae79354606af2a930709aa118da1636c274dd7e3774b884a79aa6b5711a538d33cf9c01c1c9b83bc6a1f55c91ccb23b05b1deb43a7decdaffefd2862f61366aa8449c69e33642f012f2bb208fa98eeda1f3346f076c8eeef19475e9be115423364f78f84105a8643d34d90cfbfdcd8cf872589a45dc7f54cf3134a36f4e495c23f9da8db15bccb708d4014f2ca512cb5d4f7c13e84300d5cff6eb39b202bab053bdb9674f0648609427d0f8402ddeac30f4fcd3ced3efc3b422d406c09b340bedc1571e1bfc3d44dc281634c5fe5e758e7395cfbe6d6c130fd17d92372d2cb00c6470000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index cb8d6baa..b00d5ba0 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -122,7 +122,7 @@ LocationDialog::LocationDialog( TQWidget* tqparent ) AddCityButton = new TQPushButton( i18n ( "Add to List" ), CoordBox, "AddCityButton" ); -//Pack the widgets into the tqlayouts +//Pack the widgets into the layouts RootLay->addWidget( CityBox, 0, 0 ); RootLay->addWidget( CoordBox, 0, 0 ); diff --git a/kstars/kstars/newfovui.ui b/kstars/kstars/newfovui.ui index 1bb66ce1..649c04e9 100644 --- a/kstars/kstars/newfovui.ui +++ b/kstars/kstars/newfovui.ui @@ -921,7 +921,7 @@ Circle, Square, Crosshairs, Bullseye.</string> <tabstop>ShapeBox</tabstop> <tabstop>ColorButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/opsadvancedui.ui b/kstars/kstars/opsadvancedui.ui index 7e6210a0..86527bf2 100644 --- a/kstars/kstars/opsadvancedui.ui +++ b/kstars/kstars/opsadvancedui.ui @@ -478,7 +478,7 @@ <tabstop>kcfg_HideCLines</tabstop> <tabstop>kcfg_HideGrid</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>timestepbox.h</includehint> <includehint>magnitudespinbox.h</includehint> diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui index fb2478e7..28866b7a 100644 --- a/kstars/kstars/opscatalogui.ui +++ b/kstars/kstars/opscatalogui.ui @@ -593,7 +593,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>magnitudespinbox.h</includehint> <includehint>magnitudespinbox.h</includehint> diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui index ae70c8b5..94cc9e70 100644 --- a/kstars/kstars/opscolorsui.ui +++ b/kstars/kstars/opscolorsui.ui @@ -285,5 +285,5 @@ <tabstop>AddPreset</tabstop> <tabstop>RemovePreset</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/opsguidesui.ui b/kstars/kstars/opsguidesui.ui index 408d95dc..40075880 100644 --- a/kstars/kstars/opsguidesui.ui +++ b/kstars/kstars/opsguidesui.ui @@ -261,5 +261,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui index 0ef4065d..dc872a3b 100644 --- a/kstars/kstars/opssolarsystemui.ui +++ b/kstars/kstars/opssolarsystemui.ui @@ -569,7 +569,7 @@ <tabstop>kcfg_FadePlanetTrails</tabstop> <tabstop>ClearAllTrails</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>magnitudespinbox.h</includehint> diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp index d6c515fc..7d06c5fb 100644 --- a/kstars/kstars/skymapdraw.cpp +++ b/kstars/kstars/skymapdraw.cpp @@ -232,7 +232,7 @@ void SkyMap::drawTelescopeSymbols(TQPainter &psky) { { indi_sp.setRA0(raDMS); indi_sp.setDec0(decDMS); - indi_sp.aptqparentCoord( (double) J2000, ksw->data()->ut().djd()); + indi_sp.apparentCoord( (double) J2000, ksw->data()->ut().djd()); } if ( Options::useAltAz() ) indi_sp.EquatorialToHorizontal( ksw->LST(), ksw->geo()->lat() ); diff --git a/kstars/kstars/skypoint.cpp b/kstars/kstars/skypoint.cpp index 2272d978..eadfe6c5 100644 --- a/kstars/kstars/skypoint.cpp +++ b/kstars/kstars/skypoint.cpp @@ -329,7 +329,7 @@ void SkyPoint::precessFromAnyEpoch(long double jd0, long double jdf){ } /** No descriptions */ -void SkyPoint::aptqparentCoord(long double jd0, long double jdf){ +void SkyPoint::apparentCoord(long double jd0, long double jdf){ precessFromAnyEpoch(jd0,jdf); diff --git a/kstars/kstars/skypoint.h b/kstars/kstars/skypoint.h index 44fa551f..7c6a0b4a 100644 --- a/kstars/kstars/skypoint.h +++ b/kstars/kstars/skypoint.h @@ -299,7 +299,7 @@ public: *@param jd0 Julian Day which identifies the original epoch *@param jdf Julian Day which identifies the final epoch */ - void aptqparentCoord(long double jd0, long double jdf); + void apparentCoord(long double jd0, long double jdf); /**Determine the effects of nutation for this SkyPoint. *@param num pointer to KSNumbers object containing current values of diff --git a/kstars/kstars/statform.ui b/kstars/kstars/statform.ui index ff4489de..6af173cc 100644 --- a/kstars/kstars/statform.ui +++ b/kstars/kstars/statform.ui @@ -176,5 +176,5 @@ <tabstop>meanOUT</tabstop> <tabstop>stddevOUT</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/streamformui.ui b/kstars/kstars/streamformui.ui index e68920fc..5e222427 100644 --- a/kstars/kstars/streamformui.ui +++ b/kstars/kstars/streamformui.ui @@ -119,7 +119,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui index 2185b33a..bcff2bd6 100644 --- a/kstars/kstars/telescopepropui.ui +++ b/kstars/kstars/telescopepropui.ui @@ -251,7 +251,7 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui index eaafdb01..fa67eea5 100644 --- a/kstars/kstars/telescopewizard.ui +++ b/kstars/kstars/telescopewizard.ui @@ -617,7 +617,7 @@ Enter the port number your telescope is connected to. If you only have one seria </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="0"/> +<layoutdefaults spacing="6" margin="0"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/thumbnaileditorui.ui b/kstars/kstars/thumbnaileditorui.ui index 7ef5cf4e..d9ac4452 100644 --- a/kstars/kstars/thumbnaileditorui.ui +++ b/kstars/kstars/thumbnaileditorui.ui @@ -94,5 +94,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui index 9cc4a640..591f7cdc 100644 --- a/kstars/kstars/thumbnailpickerui.ui +++ b/kstars/kstars/thumbnailpickerui.ui @@ -302,7 +302,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui index 0e65e27c..5df8d691 100644 --- a/kstars/kstars/tools/altvstimeui.ui +++ b/kstars/kstars/tools/altvstimeui.ui @@ -526,7 +526,7 @@ <tabstop>latBox</tabstop> <tabstop>updateButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui index 55ca0b52..1da77198 100644 --- a/kstars/kstars/tools/argchangeviewoption.ui +++ b/kstars/kstars/tools/argchangeviewoption.ui @@ -133,7 +133,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui index df9c7e1b..9228373b 100644 --- a/kstars/kstars/tools/argexportimage.ui +++ b/kstars/kstars/tools/argexportimage.ui @@ -255,7 +255,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argloadcolorscheme.ui b/kstars/kstars/tools/argloadcolorscheme.ui index a4d27169..1e7d1732 100644 --- a/kstars/kstars/tools/argloadcolorscheme.ui +++ b/kstars/kstars/tools/argloadcolorscheme.ui @@ -23,5 +23,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui index 7860ab48..ea505d2c 100644 --- a/kstars/kstars/tools/arglooktoward.ui +++ b/kstars/kstars/tools/arglooktoward.ui @@ -155,7 +155,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argprintimage.ui b/kstars/kstars/tools/argprintimage.ui index b729376e..362e8289 100644 --- a/kstars/kstars/tools/argprintimage.ui +++ b/kstars/kstars/tools/argprintimage.ui @@ -54,5 +54,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui index afd93264..9e8465ad 100644 --- a/kstars/kstars/tools/argsetactionindi.ui +++ b/kstars/kstars/tools/argsetactionindi.ui @@ -113,7 +113,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsetaltaz.ui b/kstars/kstars/tools/argsetaltaz.ui index b063d029..1c373ebb 100644 --- a/kstars/kstars/tools/argsetaltaz.ui +++ b/kstars/kstars/tools/argsetaltaz.ui @@ -136,7 +136,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i <tabstop>AzBox</tabstop> <tabstop>AltBox</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui index a35e5df4..ba6eed5a 100644 --- a/kstars/kstars/tools/argsetccdtempindi.ui +++ b/kstars/kstars/tools/argsetccdtempindi.ui @@ -114,7 +114,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui index 0990d8cb..e2e2f2e2 100644 --- a/kstars/kstars/tools/argsetcolor.ui +++ b/kstars/kstars/tools/argsetcolor.ui @@ -218,7 +218,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui index fc563339..dbb9aff4 100644 --- a/kstars/kstars/tools/argsetfilternumindi.ui +++ b/kstars/kstars/tools/argsetfilternumindi.ui @@ -117,7 +117,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetfocusspeedindi.ui b/kstars/kstars/tools/argsetfocusspeedindi.ui index bb50b9b1..07c37429 100644 --- a/kstars/kstars/tools/argsetfocusspeedindi.ui +++ b/kstars/kstars/tools/argsetfocusspeedindi.ui @@ -84,7 +84,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui index a4cd4f0c..63d2e9c3 100644 --- a/kstars/kstars/tools/argsetfocustimeoutindi.ui +++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui @@ -114,7 +114,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui index 17639d55..31e7cf34 100644 --- a/kstars/kstars/tools/argsetframetypeindi.ui +++ b/kstars/kstars/tools/argsetframetypeindi.ui @@ -108,7 +108,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index bafe7f63..5318e530 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -191,7 +191,7 @@ <Q_SLOTS> <slot>slotFindCity()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsetgeolocationindi.ui b/kstars/kstars/tools/argsetgeolocationindi.ui index 521873c8..127d7b8f 100644 --- a/kstars/kstars/tools/argsetgeolocationindi.ui +++ b/kstars/kstars/tools/argsetgeolocationindi.ui @@ -161,7 +161,7 @@ <data format="PNG" length="1114">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsetlocaltime.ui b/kstars/kstars/tools/argsetlocaltime.ui index 0f2a3187..ef8a5c95 100644 --- a/kstars/kstars/tools/argsetlocaltime.ui +++ b/kstars/kstars/tools/argsetlocaltime.ui @@ -101,5 +101,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui index 39646bcd..8472c2d0 100644 --- a/kstars/kstars/tools/argsetportindi.ui +++ b/kstars/kstars/tools/argsetportindi.ui @@ -71,7 +71,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsetradec.ui b/kstars/kstars/tools/argsetradec.ui index 8739b86f..e47fd936 100644 --- a/kstars/kstars/tools/argsetradec.ui +++ b/kstars/kstars/tools/argsetradec.ui @@ -136,7 +136,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system. <tabstop>RaBox</tabstop> <tabstop>DecBox</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui index d7e5f254..3aea9afe 100644 --- a/kstars/kstars/tools/argsetscopeactionindi.ui +++ b/kstars/kstars/tools/argsetscopeactionindi.ui @@ -108,7 +108,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argsettargetcoordindi.ui b/kstars/kstars/tools/argsettargetcoordindi.ui index cc1a263d..a047a74b 100644 --- a/kstars/kstars/tools/argsettargetcoordindi.ui +++ b/kstars/kstars/tools/argsettargetcoordindi.ui @@ -161,7 +161,7 @@ <data format="PNG" length="1114">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui index 24b3abaf..344ebd59 100644 --- a/kstars/kstars/tools/argsettargetnameindi.ui +++ b/kstars/kstars/tools/argsettargetnameindi.ui @@ -139,7 +139,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsettrack.ui b/kstars/kstars/tools/argsettrack.ui index 2e89d82c..b6467496 100644 --- a/kstars/kstars/tools/argsettrack.ui +++ b/kstars/kstars/tools/argsettrack.ui @@ -78,5 +78,5 @@ If unchecked, then Tracking will be forced off, even if an object has been cente </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui index ec4e78d5..7a9d5f6a 100644 --- a/kstars/kstars/tools/argsetutcindi.ui +++ b/kstars/kstars/tools/argsetutcindi.ui @@ -110,7 +110,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui index 1a54a7ca..d09a9ce5 100644 --- a/kstars/kstars/tools/argshutdownindi.ui +++ b/kstars/kstars/tools/argshutdownindi.ui @@ -68,7 +68,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui index 83b2138d..7b6d0a78 100644 --- a/kstars/kstars/tools/argstartexposureindi.ui +++ b/kstars/kstars/tools/argstartexposureindi.ui @@ -116,7 +116,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui index e528db2e..8f014162 100644 --- a/kstars/kstars/tools/argstartfocusindi.ui +++ b/kstars/kstars/tools/argstartfocusindi.ui @@ -110,7 +110,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui index c058ad42..540441b0 100644 --- a/kstars/kstars/tools/argstartindi.ui +++ b/kstars/kstars/tools/argstartindi.ui @@ -117,7 +117,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui index 3468a7b3..f998c4be 100644 --- a/kstars/kstars/tools/argswitchindi.ui +++ b/kstars/kstars/tools/argswitchindi.ui @@ -122,7 +122,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argtimescale.ui b/kstars/kstars/tools/argtimescale.ui index f1421941..cd55da63 100644 --- a/kstars/kstars/tools/argtimescale.ui +++ b/kstars/kstars/tools/argtimescale.ui @@ -90,7 +90,7 @@ <data format="XPM.GZ" length="2926">789c9d95594f32591086effd15c4ba3393fae895ee4ce6824540141011b7c95cf406a202caa6f065fefb549faaea0b24996fc623cb937aeb3d55754e871f67a587eb6ee9ecc7c96a1dada74929798e96a5b374339bedfefceb8f9f27a7b65da27fcb724bf6e96f27a783752929f516f32c070402289b3fc39d8203c3136157e276c1260eac0f0ade0907927f2d9c58261f929cad72be0cef8535ff5959e277c201ef0fa02cf1ae7022f9efca12ff301ca81e87c21a5f32db5acf95b0eebfcdd92e2be3a5b0fa7986435bfd6e981d99278c0ae6795c288b3e2b98e3036157d8f839961308af985df51b1b0e9dc0098ddf5a3811fd7dceaee52a370d475e28f9b7ca1c07539f67173c144e65be2fcae2d763f62d89df2acb7cc282393e57b6b9ff58d893fca632c7d1ccc78bbcd48b4c7cc2ec4bfdf0aa2cfbf50be6fa2c65d9af2aacfd2c94e53cccf9fa7645eb7794a59ebdb027fe5565895f09cb7e981a267f9febaf3117fab6702af599e7a5e2049e6dce1377c25affa6608e4786e34a58894dfc8b59f5f890731087e28f2de648fbdb16ccfd6c9465bf7365c732f12f61ed3f5016fd4a59f4e6790fddd00a5d137f638eb4bfa532df5ffc148ea4be5ac17c5ea9b2ecd72b98efff403893fa1accb12d5c5696fd4d7f6152c41f95c53f2a98f56b6597fbf3857da9b75e30fb5584b59fa78239de5596fd3e0be6fdccf311b99115f1fcdaccb12fe77927ac7e2365f1c382793e63e14cfccdf3132571e69b1f07e83327d23fbac2bee4d785d57f2a9c89de9c6fecaa1fce98135bf845b9e2189e2a07e6fee287b0cfcf3bce9525ff5d38927a1bcca9cc1b66ca528ff93d89d338e3f9e182b9c86f31a752ff609d2f847f5f83b5ea31c218137a4f8fac0cc738e10cd6d3b7189f718a2ff88a6f38c339ad05adfcf31d3f7089ab037d42ea356e708b9ff8853bdc6395de6b58c706ad736c1ee823f2de608b146dbcc08e8976f012afb04b3975ec1de853aa2457f749d5c16b1ce00d0ecdf75b1ce1dd11fd1b55d236cef7f8808ff88465b4d02676d03da29f51dd9e513fa28f150c3004246d07002288bfe9e7d45f0712f22635a490d15ef730361e3b389c67aedf2390ea3157e73dc333e9a6f042d13ebc7ed32f6882405d3ee1c678030ee10d6630a76f162c8ee8f37adeb14c0aaa0b3e68b725ac80a2b039a29f630db6e46bc127d5fd45de4b5226b0833d8ea07a445f871ae96dacc218ead08073c835136842eba8be016db830e77a419f21aca143f76c025b9ae7e5813ea35bd5a0731fd1c4877a7f614fde57d085deb7f31ad31dccf54fd087883ab7a88f6baabb45fdf760003707fa09ddd826f66048af1826f00a0bb3aa7009b73082bb03fd2faeffa7fff58cfffcbcfffdfbc93f7f7d62d7</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>timestepbox.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argwaitfor.ui b/kstars/kstars/tools/argwaitfor.ui index 149e5a1a..77ea5077 100644 --- a/kstars/kstars/tools/argwaitfor.ui +++ b/kstars/kstars/tools/argwaitfor.ui @@ -81,5 +81,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui index c29269ad..82876087 100644 --- a/kstars/kstars/tools/argwaitforkey.ui +++ b/kstars/kstars/tools/argwaitforkey.ui @@ -85,7 +85,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui index 78556490..5d1ea8e8 100644 --- a/kstars/kstars/tools/argzoom.ui +++ b/kstars/kstars/tools/argzoom.ui @@ -86,7 +86,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp index 96cdbd02..be58f46d 100644 --- a/kstars/kstars/tools/modcalcangdist.cpp +++ b/kstars/kstars/tools/modcalcangdist.cpp @@ -30,7 +30,7 @@ //#include <kapplication.h> ..already included in modcalcapcoord.h -modCalcAngDist::modCalcAngDist(TQWidget *tqparentSplit, const char *name) : modCalcAngDistDlg(tqparentSplit,name) { +modCalcAngDist::modCalcAngDist(TQWidget *parentSplit, const char *name) : modCalcAngDistDlg(parentSplit,name) { ra0Box->setDegType(FALSE); ra1Box->setDegType(FALSE); diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index f35a716a..77b92b4b 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -667,7 +667,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index 53f15753..6def95fa 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -37,7 +37,7 @@ //#include <kapplication.h> ..already included in modcalcapcoord.h -modCalcApCoord::modCalcApCoord(TQWidget *tqparentSplit, const char *name) : modCalcApCoordDlg(tqparentSplit,name) { +modCalcApCoord::modCalcApCoord(TQWidget *parentSplit, const char *name) : modCalcApCoordDlg(parentSplit,name) { showCurrentTime(); ra0Box->setDegType(FALSE); @@ -111,7 +111,7 @@ void modCalcApCoord::slotComputeCoords(){ SkyPoint sp; sp = getEquCoords(); - sp.aptqparentCoord(jd0, jd); + sp.apparentCoord(jd0, jd); showEquCoords( sp ); } @@ -309,7 +309,7 @@ void modCalcApCoord::processLines( TQTextStream &istream ) { jd = KStarsDateTime(dtB,utB).djd(); jd0 = dt.djd(); sp = SkyPoint (raB, decB); - sp.aptqparentCoord(jd0, jd); + sp.apparentCoord(jd0, jd); ostream << sp.ra()->toHMSString() << sp.dec()->toDMSString() << endl; } diff --git a/kstars/kstars/tools/modcalcapcoord.h b/kstars/kstars/tools/modcalcapcoord.h index e258e585..7ed8f3e5 100644 --- a/kstars/kstars/tools/modcalcapcoord.h +++ b/kstars/kstars/tools/modcalcapcoord.h @@ -47,7 +47,7 @@ public: SkyPoint precess (dms ra0, dms dec0, long double j0, long double jf); /**Apply precession, nutation and aberration corrections to coordinates. */ - SkyPoint aptqparentCoordinates (dms r0, dms d0, long double j0, long double jf); + SkyPoint apparentCoordinates (dms r0, dms d0, long double j0, long double jf); /** Process Lines **/ // void processLines( const TQFile * f ); diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index 90c8e0f3..eb635c5d 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -855,7 +855,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index 0175edc7..a227c577 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -36,7 +36,7 @@ #include <kmessagebox.h> -modCalcAzel::modCalcAzel(TQWidget *tqparentSplit, const char *name) : modCalcAzelDlg (tqparentSplit,name) { +modCalcAzel::modCalcAzel(TQWidget *parentSplit, const char *name) : modCalcAzelDlg (parentSplit,name) { showCurrentDateTime(); initGeo(); @@ -197,7 +197,7 @@ void modCalcAzel::slotComputeCoords() if(radioApCoords->isChecked()) { sp = getEquCoords(); - sp.aptqparentCoord(jd0, jd); + sp.apparentCoord(jd0, jd); dms lat(getLatitude()); sp.EquatorialToHorizontal( &LST, &lat ); showHorCoords( sp ); @@ -488,7 +488,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { ostream << decB.toDMSString() << space; sp = SkyPoint (raB, decB); - sp.aptqparentCoord(jd0, jdf); + sp.apparentCoord(jd0, jdf); sp.EquatorialToHorizontal( &LST, &latB ); ostream << sp.az()->toDMSString() << space << sp.alt()->toDMSString() << endl; diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index 1abe9d8b..5ab69991 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -1058,7 +1058,7 @@ <slot>slotElChecked()</slot> <slot>newSlot()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp index 66a41bef..b4b1ebe9 100644 --- a/kstars/kstars/tools/modcalcdaylength.cpp +++ b/kstars/kstars/tools/modcalcdaylength.cpp @@ -30,7 +30,7 @@ #include <kapplication.h> -modCalcDayLength::modCalcDayLength(TQWidget *tqparentSplit, const char *name) : modCalcDayLengthDlg(tqparentSplit,name) { +modCalcDayLength::modCalcDayLength(TQWidget *parentSplit, const char *name) : modCalcDayLengthDlg(parentSplit,name) { showCurrentDate(); initGeo(); show(); diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index 253ae12a..bf48ef2e 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -639,7 +639,7 @@ <slot>slotComputePosTime()</slot> <slot>slotClearCoords()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp index 2f009378..0d8271ab 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.cpp +++ b/kstars/kstars/tools/modcalceclipticcoords.cpp @@ -35,7 +35,7 @@ #include <kmessagebox.h> -modCalcEclCoords::modCalcEclCoords(TQWidget *tqparentSplit, const char *name) : modCalcEclCoordsDlg(tqparentSplit,name) { +modCalcEclCoords::modCalcEclCoords(TQWidget *parentSplit, const char *name) : modCalcEclCoordsDlg(parentSplit,name) { equRadio->setChecked(TRUE); raBox->setDegType(FALSE); diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index cc71d0ea..3430d683 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -903,7 +903,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index 3abbc019..5978b44e 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -33,8 +33,8 @@ #include <tqcheckbox.h> #include <tqradiobutton.h> -modCalcEquinox::modCalcEquinox(TQWidget *tqparentSplit, const char *name) - : modCalcEquinoxDlg (tqparentSplit,name) { +modCalcEquinox::modCalcEquinox(TQWidget *parentSplit, const char *name) + : modCalcEquinoxDlg (parentSplit,name) { showCurrentYear(); show(); } diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index be5a6eb4..860e6ca6 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -565,7 +565,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp index 1f371d42..07344fbd 100644 --- a/kstars/kstars/tools/modcalcgalcoord.cpp +++ b/kstars/kstars/tools/modcalcgalcoord.cpp @@ -34,7 +34,7 @@ #include <kmessagebox.h> -modCalcGalCoord::modCalcGalCoord(TQWidget *tqparentSplit, const char *name) : modCalcGalCoordDlg(tqparentSplit,name) { +modCalcGalCoord::modCalcGalCoord(TQWidget *parentSplit, const char *name) : modCalcGalCoordDlg(parentSplit,name) { equRadio->setChecked(TRUE); raBox->setDegType(FALSE); diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index f6d44e49..e1741cb4 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -914,7 +914,7 @@ <slot>slotGalLongCheckedBatch()</slot> <slot>slotRunBatch()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index 1cda2504..10f2aba0 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -37,7 +37,7 @@ #include <kmessagebox.h> -modCalcGeodCoord::modCalcGeodCoord(TQWidget *tqparentSplit, const char *name) : modCalcGeodCoordDlg(tqparentSplit,name) { +modCalcGeodCoord::modCalcGeodCoord(TQWidget *parentSplit, const char *name) : modCalcGeodCoordDlg(parentSplit,name) { static const char *ellipsoidList[] = { "IAU76", "GRS80", "MERIT83", "WGS84", "IERS89"}; diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index 883c29fe..bb74be14 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -800,7 +800,7 @@ <slot>slotYCheckedBatch()</slot> <slot>slotZCheckedBatch()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 4bacb940..4f027e86 100644 --- a/kstars/kstars/tools/modcalcjd.cpp +++ b/kstars/kstars/tools/modcalcjd.cpp @@ -32,7 +32,7 @@ #define MJD0 2400000.5 -modCalcJD::modCalcJD(TQWidget *tqparentSplit, const char *name) : modCalcJdDlg(tqparentSplit,name) { +modCalcJD::modCalcJD(TQWidget *parentSplit, const char *name) : modCalcJdDlg(parentSplit,name) { showCurrentTime(); show(); diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index b772d5ed..f06bff52 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -499,7 +499,7 @@ <slot>slotComputeTime()</slot> <slot>showCurrentTime()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index 7324fbb2..9354f7a0 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -38,7 +38,7 @@ #include <tqradiobutton.h> -modCalcPlanets::modCalcPlanets(TQWidget *tqparentSplit, const char *name) : modCalcPlanetsDlg (tqparentSplit,name) { +modCalcPlanets::modCalcPlanets(TQWidget *parentSplit, const char *name) : modCalcPlanetsDlg (parentSplit,name) { showCurrentDateTime(); showLongLat(); raBox->setDegType(FALSE); diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 97d93923..91defd27 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -1370,7 +1370,7 @@ <slot>slotRunBatch()</slot> <slot>slotPlanetsCheckedBatch()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index df2d1424..05ef4718 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -31,7 +31,7 @@ #include <kfiledialog.h> #include <kmessagebox.h> -modCalcPrec::modCalcPrec(TQWidget *tqparentSplit, const char *name) : modCalcPrecDlg(tqparentSplit,name) { +modCalcPrec::modCalcPrec(TQWidget *parentSplit, const char *name) : modCalcPrecDlg(parentSplit,name) { ra0Box->setDegType(FALSE); rafBox->setDegType(FALSE); diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index 81bbab3e..3811922b 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -742,7 +742,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index e925b2b5..126fdb7d 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -32,7 +32,7 @@ #include "simclock.h" #include "libkdeedu/extdate/extdatetimeedit.h" -modCalcSidTime::modCalcSidTime(TQWidget *tqparentSplit, const char *name) : modCalcSidTimeDlg (tqparentSplit,name) { +modCalcSidTime::modCalcSidTime(TQWidget *parentSplit, const char *name) : modCalcSidTimeDlg (parentSplit,name) { showCurrentTimeAndLong(); show(); diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui index bc1702be..3e9a7d9a 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -860,7 +860,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index 9b352d58..27acb57b 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -37,7 +37,7 @@ #include <kmessagebox.h> -modCalcVlsr::modCalcVlsr(TQWidget *tqparentSplit, const char *name) : modCalcVlsrDlg (tqparentSplit,name) { +modCalcVlsr::modCalcVlsr(TQWidget *parentSplit, const char *name) : modCalcVlsrDlg (parentSplit,name) { showCurrentDateTime(); initGeo(); diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index 93abbae9..e036bb17 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -1187,7 +1187,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index 67e0ad74..a50165ac 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -430,7 +430,7 @@ void ObservingList::slotSlewToObject() sp.set (ks->map()->clickedPoint()->ra(), ks->map()->clickedPoint()->dec()); if (useJ2000) - sp.aptqparentCoord(ks->data()->ut().djd(), (long double) J2000); + sp.apparentCoord(ks->data()->ut().djd(), (long double) J2000); RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second())); DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec())); diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index 1a8a3545..57a1403b 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -554,7 +554,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index 2e961160..27f5ccf6 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -1012,7 +1012,7 @@ select from a region on the sky.</string> <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui index 8466789a..4a9e11e3 100644 --- a/kstars/kstars/tools/optionstreeview.ui +++ b/kstars/kstars/tools/optionstreeview.ui @@ -130,7 +130,7 @@ <slot>accept()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kstars/kstars/tools/planetviewerui.ui b/kstars/kstars/tools/planetviewerui.ui index 53badeb8..4b506acb 100644 --- a/kstars/kstars/tools/planetviewerui.ui +++ b/kstars/kstars/tools/planetviewerui.ui @@ -151,7 +151,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>timestepbox.h</includehint> diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index f0c48979..7b6d8feb 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -627,7 +627,7 @@ <slot>slotRemoveFunction()</slot> <slot>slotRunScript()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="4"/> +<layoutdefaults spacing="6" margin="4"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui index e6b68af7..fb176c14 100644 --- a/kstars/kstars/tools/scriptnamedialog.ui +++ b/kstars/kstars/tools/scriptnamedialog.ui @@ -149,7 +149,7 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui index 18740d80..2bdeb50e 100644 --- a/kstars/kstars/tools/wutdialogui.ui +++ b/kstars/kstars/tools/wutdialogui.ui @@ -552,7 +552,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/ChangeLog b/ktouch/ChangeLog index f8d02b6a..6225920b 100644 --- a/ktouch/ChangeLog +++ b/ktouch/ChangeLog @@ -13,7 +13,7 @@ color scheme includes now keyboard and slide line colors, new option to have common slide line colors in configuration (request: #90548) - * Bugfix: several keyboard tqlayouts were wrong (showing the + * Bugfix: several keyboard layouts were wrong (showing the wrong colors and were therefore misleading), a few have been already fixed and the others temporarily removed from the install section of the make files @@ -33,7 +33,7 @@ (bug report: * Feature: default keyboard is selected based on KDE locale (requests: #54379, #99947) - * Feature: quick select lists of training lectures/keyboard tqlayouts are now + * Feature: quick select lists of training lectures/keyboard layouts are now sorted alphabetically * Bugfix: trailing spaces are removed from lines when lecture is read (bug: #107080) @@ -55,7 +55,7 @@ * Bugfix: fixed false error on reading single-level-lectures (bug: #120414) * Feature: lines with spaces at the end are trimmed (whitespace removed) * Feature: line length limit increased to 300 (request: #116838) - * Added: added new/fixed keyboard tqlayouts + * Added: added new/fixed keyboard layouts (requests: #40962, #85584, #119670) 2006-03-27 Andreas Nicolai <andreas.nicolai@gmx.net> @@ -240,7 +240,7 @@ (new version) * ktouch 0.60 is out * new features: - Change between different keyboard tqlayouts. Supported keyboard's is English, German and Norwegian. + Change between different keyboard layouts. Supported keyboard's is English, German and Norwegian. 2000-05-09 Haavard Froeiland <haavard@users.sourceforge.net> diff --git a/ktouch/ktouch.lsm b/ktouch/ktouch.lsm index 9bd6c444..ab0235d1 100644 --- a/ktouch/ktouch.lsm +++ b/ktouch/ktouch.lsm @@ -7,7 +7,7 @@ Description: A education program to learn to touch-type. It provieds fingers on the keyboard. It also shows the user which finger to move to press the next key. It automatically adjusts to different levels depending on the speed. It has support - for different keyboard tqlayouts(languages). + for different keyboard layouts(languages). Keywords: touch typing education training Author: haavard@users.sourceforge.net (Haavard Froeiland) Maintained-by: ghorwin@users.sourceforge.net (Andreas Nicolai) diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index dbd10eef..1f2a7501 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -608,7 +608,7 @@ void KTouch::init() { //kdDebug() << "[KTouch::init] populating file lists..." << endl; updateFileLists(); // create lists with default lecture/keyboard/examination files/colour scheme files //kdDebug() << "[KTouch::init] " << m_lectureFiles.count() << " lectures available" << endl; - //kdDebug() << "[KTouch::init] " << m_keyboardFiles.count() << " keyboard tqlayouts available" << endl; + //kdDebug() << "[KTouch::init] " << m_keyboardFiles.count() << " keyboard layouts available" << endl; //kdDebug() << "[KTouch::init] " << m_examinationFiles.count() << " examination files available" << endl; if (Prefs::currentLectureFile() == "default") { @@ -654,7 +654,7 @@ void KTouch::init() { // Creates the tqlayout and GUI setup for a practice session void KTouch::initTrainingSession() { - //kdDebug() << "[KTouch::initTrainingSession] setting up tqlayouts and widgets for new training session..." << endl; + //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 // keyboard grow according to their vertical stretch factors (see last argument in the constructors // of TQSizePolicy) @@ -710,7 +710,7 @@ void KTouch::setupActions() { // *** Settings menu *** KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); - // Setup menu entries for keyboard tqlayouts + // Setup menu entries for keyboard layouts m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts"); m_keyboardLayoutAction->setMenuAccelsEnabled(false); m_keyboardLayoutAction->setItems(m_keyboardTitles); diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui index d512bb02..0be9d5f2 100644 --- a/ktouch/src/ktouchcoloreditor_dlg.ui +++ b/ktouch/src/ktouchcoloreditor_dlg.ui @@ -792,7 +792,7 @@ <slot>updateClicked()</slot> <slot>colorSchemeChanged(TQListBoxItem * item)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui index 7fa7b07f..14c1c6bb 100644 --- a/ktouch/src/ktouchkeyboardeditor_dlg.ui +++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui @@ -389,7 +389,7 @@ <slot>removeBtnClicked()</slot> <slot>keySelectionChanged(QListBoxItem*)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/src/ktouchkeys.cpp b/ktouch/src/ktouchkeys.cpp index 6f45d40a..83efa572 100644 --- a/ktouch/src/ktouchkeys.cpp +++ b/ktouch/src/ktouchkeys.cpp @@ -68,7 +68,7 @@ void KTouchNormalKey::paint(TQPainter& p) const { p.setPen( colorScheme.m_frame ); textColor = colorScheme.m_text; }; - KTouchBaseKey::paint(p); // call the tqparents paint() function + KTouchBaseKey::paint(p); // call the parents paint() function p.setPen(textColor); p.setFont( m_font ); diff --git a/ktouch/src/ktouchkeys.h b/ktouch/src/ktouchkeys.h index c429790d..df19b56d 100644 --- a/ktouch/src/ktouchkeys.h +++ b/ktouch/src/ktouchkeys.h @@ -123,7 +123,7 @@ class KTouchControlKey : public KTouchBaseKey { public: /// Constructor KTouchControlKey(const TQChar& keyChar, const TQString& keyText, int x, int y, int w, int h); - /// Extends the tqparents paint routine (draws the text or other fancy stuff). + /// Extends the parents paint routine (draws the text or other fancy stuff). void paint(TQPainter& p) const; }; // ------------------------------------------------------------------------------------ diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui index 7a4ae7dd..a4e8f989 100644 --- a/ktouch/src/ktouchlectureeditor_dlg.ui +++ b/ktouch/src/ktouchlectureeditor_dlg.ui @@ -664,7 +664,7 @@ <slot>setModified()</slot> <slot>fontBtnClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klistview.h</includehint> diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui index e9a522bc..f878335f 100644 --- a/ktouch/src/ktouchopenrequest_dlg.ui +++ b/ktouch/src/ktouchopenrequest_dlg.ui @@ -278,7 +278,7 @@ <slot>radioBtnChanged()</slot> <slot>browseBtnClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui index 45b43dbe..53c87079 100644 --- a/ktouch/src/ktouchprefcolorslayout.ui +++ b/ktouch/src/ktouchprefcolorslayout.ui @@ -504,7 +504,7 @@ <tabstop>kcfg_ErrorBackgroundColor</tabstop> <tabstop>kcfg_CurrentColorScheme</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui index 18610f2e..95c44ed6 100644 --- a/ktouch/src/ktouchprefgenerallayout.ui +++ b/ktouch/src/ktouchprefgenerallayout.ui @@ -334,7 +334,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> </includehints> diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui index 1de77d3c..1c25d804 100644 --- a/ktouch/src/ktouchprefkeyboardlayout.ui +++ b/ktouch/src/ktouchprefkeyboardlayout.ui @@ -135,7 +135,7 @@ <Q_SLOTS> <slot>fontChooseBtnClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> </includehints> diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui index 7db29ca4..c2928dc0 100644 --- a/ktouch/src/ktouchpreftraininglayout.ui +++ b/ktouch/src/ktouchpreftraininglayout.ui @@ -321,7 +321,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index b1870b7b..1e54adbc 100644 --- a/ktouch/src/ktouchslideline.cpp +++ b/ktouch/src/ktouchslideline.cpp @@ -237,7 +237,7 @@ void KTouchSlideLine::resizeEvent ( TQResizeEvent * ) { KD_DEBUG( "[KTouchSlideLine::resizeEvent]" << endl ); // required input member variables: none - // when the widget is resized, the whole tqgeometry is tqinvalidated, so we do: + // when the widget is resized, the whole tqgeometry is invalidated, so we do: // 1. recalculate and store the tqgeometry of the sliding lines // 2. resize the font // 3. recreate the sliding lines (this is done from the resizeFont() function diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui index ef913462..568ed7ef 100644 --- a/ktouch/src/ktouchstatistics_dlg.ui +++ b/ktouch/src/ktouchstatistics_dlg.ui @@ -1277,7 +1277,7 @@ <data format="PNG" length="1525">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af4000005bc494441545885b596416823d719c77f0e0a8c0e0b12b860810533a0057bd88035642133908087e4a29ea2b087684fb1c9253db57b6b4ba125c9a15d07127613ca3a7bc93a812e524f514a4b9f601b3f85763d0e6d7676a1c623b0f00c8989442ca281085e0e23c9abeccab10dd1e5cfa7ff7fbef7f17fdffbde9b9152729a9ff3c7b2e249601e683f84df01518c7cab3e739a7c4f9c76f1e5175cd45f42767f2f27f0da1fae41ea34d9ce500003b86c97a10fc63963022b4f9560f053178046bd558734888e98c00f831aa0fdc4050cc0d61d36bedac0c81a63fcedfdd779bf179ec981999336a1f3ebb262a0b1fc2b93d75ffc0d624fd09d8d119f49c24c4cf77e4cfc5e07882106f94eed44cd78620734ad84fe4a96f8e90e6bff5b030dea77ebc4f3314431994517ede52cdacb39e8c5274d7bf2be8d6341743b4dfa1c68cf77a8b56a68058dce4e8ca643bc23a00df15f4378d03d7101277640bef9e18cf8ddfb33c1bb45d29fe4585d588528a654709385ff0ff1ed101e4448294f3c0b4e75726dc7517d60b53547358ac9bd92a3f185a0fb51cceaed80abbd98e6291687a103eb37d6d55cacaba59eadec595bf57b4ad9b3f651dcedabddc6be626e0ee4d75c7ee31a57e7aee0ffa98fd62873ed992b5cfdfb3ebcbd8efd9cab36ffe54d7eff50bea5595b6d363695e3382ab1564a565e7d4d6dca2da5be566aebdf09def3ee25f110d7ff7c4ba94b2b6acbdb52eacba16ef707fa7da5fe79a1a8befdeff0bb7d95e87f90ef5b5f29fb695b49298f7ac02958c82f2456c682cfc12c98f8918f55302102d77091c458058bfedd3eb9410eb123b0162c8812bd17f9b8291722b0e64daa8d2a967ec48ff3b58f36ff0948e697d7f6710a0e1f3ff818162088024cdd248802d041ec099c94461005a40b69bcae87bbe08ef9200ab0741381205d003ff271175dfcb63fe647f9d2058807c3a39a6cc18a52df28a57695524aa97b7e82a358ed2ab57f675fa94b9547fe9f405f29b564abcd3b5bc7ea36ef6ca92bcf5c39da020d0dbf1d8001e15e88b998e028c6001148483dfaff04164010e3e8d6b13a47b7900379b4053160160c082197cf3d16ddf30e92e97c2e9f4b7a85a4077e4cf7480f84510839e81ff61f8bb5ed3ace603adf3fec431e0402e67f44a71ff5402a712026d3cd50fdac8a356b210291747d20710c07bfe763e78ad0af430b36b63770f2ce981781a0b458421c087e0e543fade2165c6adbb5313fca572a96a8efd493d332728001d477ea94164af8b14fe562053ff6295f2ce3c73ece9c43fd7e1d7a1d444b502e9627f8cac50a5ed7c39977905188756821db72821fe9655b621d5ad4bb7560781dafdf5857cebc8377e0e1ea2ea225707407d99238f30ea22558fc6a91dcce4d4ab3650492d200825e17139b6ae63e2e207a5d8c94cbdaf990d24209d112b8ba8b6ccb713e5777b9d9b849fd6f75a4943353df03b73eb8a5aefff23a5ed7c39ab7f0da93281e48363ed8c05ab2f8c5a5d547f8116efca3caf5f7d6587b6bedb177c4d4dbb074e125e8825518262b587090c4fe818f7bc1219bc95259aee01ff85873c9c41bf123fd65fb25346dfa536d6a018d9648cef5e7024333f0a364a2f9918fa92763d5c646b69b98ba49f56e150a933c3ac8c89bbaf8b1052ceb2e7e04aeeea2451aa66e8e67fa089b3471f5e4dc97164af82d7f82274aee98e3de8ac73a6016202024fd429a200ae13c04ed214621a4a01949380f91d6c57cca3ce287e8b5bd635f1dc738604304869183bd2938887175673abf47721b9ecd8126e4210c3b9087ce101f8eedd432b22da7f2e4939e38bb0321e47259e84076880fc7cd4183e26c110e1fcf7308e69c79ac03536b6bb41a38070eb54f6ad8039bc6a0c1726a99e6a089abb9f83ff301a86dd7707b2eb5ffd4c6bc9d4af4e54c192f7dc61e28668a881d41e56285201fb0f2ec0a413ea0f26c053f978ce7ce4107e349032ff226f891de3be761680651144d2d60ea245cbfb1aea270fa870c407c2a282e15c966b25365e141c8f6ddeda94ff5ef018e80fecc25cb29330000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>ktouchchartwidget.h</includehint> diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui index 62e31df5..3721f578 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -356,5 +356,5 @@ <slot>startKTouch()</slot> <slot>stopKTouch()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/kverbosview.cpp b/kverbos/kverbos/kverbosview.cpp index 62739c89..ba277ead 100644 --- a/kverbos/kverbos/kverbosview.cpp +++ b/kverbos/kverbos/kverbosview.cpp @@ -78,7 +78,7 @@ KVerbosView::~KVerbosView() KVerbosDoc* KVerbosView::getDocument() const { - KVerbosApp *theApp=(KVerbosApp *) tqparentWidget(); + KVerbosApp *theApp=(KVerbosApp *) parentWidget(); return theApp->getDocument(); } diff --git a/kverbos/kverbos/qerfassen.ui b/kverbos/kverbos/qerfassen.ui index 568753ff..42489cfe 100644 --- a/kverbos/kverbos/qerfassen.ui +++ b/kverbos/kverbos/qerfassen.ui @@ -2792,5 +2792,5 @@ und in die Liste aufgenommen wird. <slot>slotWeiter()</slot> <slot>slotZurueck()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qlernen.ui b/kverbos/kverbos/qlernen.ui index d9b269eb..42efac62 100644 --- a/kverbos/kverbos/qlernen.ui +++ b/kverbos/kverbos/qlernen.ui @@ -1017,5 +1017,5 @@ The user learns with this GUI.</comment> <slot>slotU()</slot> <slot>slotWeiter()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qresult.ui b/kverbos/kverbos/qresult.ui index 78da29a8..48b9b087 100644 --- a/kverbos/kverbos/qresult.ui +++ b/kverbos/kverbos/qresult.ui @@ -271,5 +271,5 @@ <Q_SLOTS> <slot>slotDlgEnde()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qverbedit.ui b/kverbos/kverbos/qverbedit.ui index 054a3fb0..76f4f411 100644 --- a/kverbos/kverbos/qverbedit.ui +++ b/kverbos/kverbos/qverbedit.ui @@ -192,5 +192,5 @@ und können bearbeitet werden.</comment> <slot>slotDelete()</slot> <slot>slotDlgEnde()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qverbosoptions.ui b/kverbos/kverbos/qverbosoptions.ui index 7537c689..6f0344b5 100644 --- a/kverbos/kverbos/qverbosoptions.ui +++ b/kverbos/kverbos/qverbosoptions.ui @@ -1224,5 +1224,5 @@ Zeiten geübt werden sollen und welche nicht.</comment> <slot>slotDlgEnde()</slot> <slot>slotCancel()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui index 7de990b8..6fe8b52a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui @@ -138,5 +138,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui index 78b92683..e64f19a2 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui @@ -268,5 +268,5 @@ <tabstop>block1</tabstop> <tabstop>expire1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui index 4ef9eddd..d64fb69a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui @@ -182,7 +182,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui index 372d147e..937e8a75 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui @@ -143,5 +143,5 @@ <tabstop>ps_new</tabstop> <tabstop>ps_del</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index 36f61b00..27280504 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -814,12 +814,12 @@ void LanguageOptions::enableLangWidgets() { if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { - TQStringList tqlayouts; + TQStringList layouts; TQDataStream stream(replyData, IO_ReadOnly); - stream >> tqlayouts; - tqlayouts.prepend(TQString()); + stream >> layouts; + layouts.prepend(TQString()); d_kbtqlayout->clear(); - d_kbtqlayout->insertStringList(tqlayouts); + d_kbtqlayout->insertStringList(layouts); } } } diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui index 7f9771f2..12b3b98e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -344,7 +344,7 @@ <tabstop>b_lang_kde</tabstop> <tabstop>b_lang_iso1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui index da0c00a4..142ee7f5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui @@ -207,7 +207,7 @@ <tabstop>SkipButton</tabstop> <tabstop>DownButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui index c2d0a0e0..3250b83e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui @@ -563,7 +563,7 @@ <tabstop>kcfg_ShowMore</tabstop> <tabstop>kcfg_IKnow</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui index 85ad4a57..788ff271 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui @@ -294,5 +294,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui index 3365725d..9c6b18e6 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui @@ -520,7 +520,7 @@ <includes> <include location="global" impldecl="in declaration">kcolorbutton.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui index 3477bcd8..04bb8a38 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui @@ -54,5 +54,5 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui index ffdaa6e3..cd5b426b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui @@ -588,5 +588,5 @@ <tabstop>thirdM_plural</tabstop> <tabstop>thirdN_plural</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui index 91c77051..e189b5bc 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui index aeb647f2..7ee368cc 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui index 7d6c157c..7a4aff84 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui @@ -182,5 +182,5 @@ <tabstop>e_license</tabstop> <tabstop>e_remark</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui index f48d5475..d5207579 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui index 3fc06267..bca2b89d 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui index ebc2f962..47ffa311 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui @@ -142,5 +142,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui index 3dea3260..b5cea508 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui @@ -225,5 +225,5 @@ <tabstop>remark_line</tabstop> <tabstop>para_line</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui index 44c2bf8c..428e902f 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui @@ -475,5 +475,5 @@ <tabstop>b_usageDlg</tabstop> <tabstop>c_active</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui index be339d37..d01d74bf 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui @@ -316,5 +316,5 @@ <tabstop>qcount_line</tabstop> <tabstop>bcount_line</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui index e7aa3073..07540e46 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui @@ -213,5 +213,5 @@ <tabstop>mc4Field</tabstop> <tabstop>mc5Field</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui index b03ecaa6..8c1e580b 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui @@ -383,5 +383,5 @@ <tabstop>thirdM_plural</tabstop> <tabstop>thirdN_plural</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index 22c75a4e..0bf3e6aa 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -182,7 +182,7 @@ void kvoctrainApp::slotFileOpen() if (queryExit() ) { TQString s; - KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, tqparentWidget(), i18n("Open Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, parentWidget(), i18n("Open Vocabulary File")); loadfileFromPath(url, true); } slotStatusMsg(IDS_DEFAULT); @@ -222,7 +222,7 @@ void kvoctrainApp::slotFileOpenExample() if (queryExit() ) { TQString s; s = locate("data", "kvoctrain/examples/"); - KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, tqparentWidget(), i18n("Open Example Vocabulary File")); + KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, parentWidget(), i18n("Open Example Vocabulary File")); loadfileFromPath(url, false); if (doc) doc->URL().setFileName(TQString()); @@ -244,7 +244,7 @@ void kvoctrainApp::slotFileMerge() slotStatusMsg(i18n("Merging file...")); TQString s; - KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, tqparentWidget(), i18n("Merge Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, parentWidget(), i18n("Merge Vocabulary File")); if (!url.isEmpty() ) { @@ -592,7 +592,7 @@ void kvoctrainApp::slotFileSaveAs() if (entryDlg != 0) commitEntryDlg(false); - KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { TQFileInfo fileinfo(url.path()); @@ -644,7 +644,7 @@ void kvoctrainApp::slotSaveSelection () if (doc->getEntry(i)->isInQuery() ) seldoc.appendEntry(doc->getEntry(i)); - KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h index 335402a9..cfcc7f3b 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.h +++ b/kvoctrain/kvoctrain/kvt-core/langset.h @@ -64,7 +64,7 @@ class LangSet int indexShortId (TQString shortId) const; int indexLongId (TQString longId) const; int indexPixMapFile (TQString PixMapFile) const; - // doesn't make sense for keyboard tqlayouts since there is no 1-to-1 relation to languages + // doesn't make sense for keyboard layouts since there is no 1-to-1 relation to languages void setShortId (const TQString & shortId, int index); void setShortId2 (const TQString & shortId2, int index); diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp index c5f01f62..671d8899 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.cpp +++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp @@ -73,14 +73,14 @@ TQString KVTNewStuff::downloadDestination(KNS::Entry * entry) if (KStandardDirs::exists(file)) { - int result = KMessageBox::warningContinueCancel(tqparentWidget(), + int result = KMessageBox::warningContinueCancel(parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") .tqarg(file), TQString(), i18n("Overwrite") ); if (result == KMessageBox::Cancel) return TQString(); } - KMessageBox::information(tqparentWidget(), + KMessageBox::information(parentWidget(), i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>") .tqarg(file), TQString(), diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui index 84ccb0fd..6aaf00a9 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui @@ -336,7 +336,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui index 4c3aab52..42653ef9 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui @@ -80,7 +80,7 @@ <property name="title"> <string></string> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -339,7 +339,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui index cbe36379..edcb7c2e 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui @@ -436,7 +436,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui index c88f5bbb..8b84c852 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui @@ -410,7 +410,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui index 37505b61..c39377c7 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui @@ -340,7 +340,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui index 8be670ab..0ca0d685 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui @@ -541,7 +541,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui index 38b4d83d..db44fed9 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui @@ -214,5 +214,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui index 996f3a41..e1fcff46 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui @@ -82,5 +82,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui index 258dad1a..10d6c095 100644 --- a/kwordquiz/src/dlglanguagebase.ui +++ b/kwordquiz/src/dlglanguagebase.ui @@ -240,5 +240,5 @@ <data format="XPM.GZ" length="29827">789cdd9c5b532bb992a8dff7afe8d87adb31a1c1601b3b4e9c0783c10603b6b9c3c43ce85a36b631e03b13e7bf9f943253948d59cdea5e3dd3319b702f3eaa4a522a2fca94cafbdffff5db7de7fcb77ffdfb3f265335ed9bdf4c4fbdfdf62f3b1b8d56fff19ffff7bffef1cfc2cece6fe153aa947fdbfde7bffde39f62f99bf94decc4ff45ae26ae045653e6025e5f1017f17e2513e3fd1366ba7f4e5ca1fb8f13e3fd7bcc78bf3d4f8cd7793c069ff72f89e3754dfd1768fcb64e4ce3d327912b69bcb3c4d8fe1133f6efde1363fba7c43c7e9118afdf31d3f31789f1fa0b318ddf5e24c6fee7cc345f156496c71d24c6f60e99b17db12226f904c957a0f1ea2131f56f7460688dfa736d64ee2f1b33e3753320e6f6f97e6a5f7488a97d5547de657bf2c4f47ccf12d3f32e8ebf50e1fbd53d31ddef9b89515e47ccfa50c4d47f16e77b37f5a70bc43c1f2362ba5f64c87b3cde77627ade548859defdc855be3f9b27467d5e11b3bd9d1373ff07c4d4bff3c8456acfc4fbf70a7cbf1a10b3feee13637fd7c8fcbce825c6eb6fc4341e3b4a1caffb2366d2f79298fab7515f7b697cba45ccf36312a37e2e98c99ea7c43c7fddc438be0531ebc3248ed73394af5a2ad17862fc2816f8793721e6f9dc4f8cf25d30e378b4412eb1bd9d258ef79b17661a7f8d98fa77d5c4f1fe9e24aed2f89f12c7eb5621972dcd6f8c7745552ad1785e89e97eb360a6eb15e4728138f65fda2d59f47f7fc2bc5b8de39b22970bd4de09333dbf434cfd672a31de7fc7bc8bf26a6292cff3f396e6b71859b1bd0b4b4cface9e91cb85bd42ec7f9798e64f1d3253fcaf11d37c8832335ef77bc4dcff03333d7f9818e3e58019e551288fdaa7f9300789f1fe1a33de9f758959ffa3c4d87f8f199fb7515fe55df61777835caeeea17e14318dcf1d33d37c779871befc5be2f87cd640e6f1ab62626c6fc68cedd923621a9fdf65c6eb3d474cfa7565665a5f1433dd6f8869fc59d4775925ffed27c6f11499c9fece90d378de99d17e7d8d19e5b737c4341ef7c88cf78b0362d2bf1689f1fe2133cdc77d62ec6f8a5ca1f95337cca4ffa89ffd3d66bb4c1c9f57cc349ffe3e315e7f20a6f1660b66942f8bf6baafd99e8c424ef79f3193ff3c13b33dbf26c6fbb17f5d2579b23b661a9f4b1cefd77d66b2b7d87e656f9ffc4f3d31533cd4c434dfaa815c617faa12933cba8e9cfa7b63c6fec49098e64bbf33e375d727a6f9502d661aaf4f8cf2e378358fcfe278358fcf0f89697c599999aedf25467dec13737c6e3293bf4f99c95e70fcba4afa106fcc38be9e42566c3f17cc64efcdc4689fa7c4ec1f7566b29f7ee278dd9602c3f24ae3f30b66b2df4962ec7f9798fd859fa7f1eb5be6928aedcd98cbb17e702fc86c6fb6cd8cfde93d6496372b31d3784f88491ef39018fb77cc45b4ff15b1a2e787ccc538be8cef77d89fb965c6fb8564c6f60ccd87dea5f86798c95fca89317e3f3393fd92fcba4cf9c93c31fa0fc9a715b57f9f18f573c94cf617e349d5b07ff7047295ecd7b59869bd386426fd30737ef1c48cf78b0131d9835789513f381f86e7d78c8969fecc9c19e74ff591613e707ecf98f17a56481cc76769fc3c5f3d9f18ed6fc14cf9c90d338e57de31637fca30537f9ab984f5ed0931cdbfda498cfa7966c6fee469e2785d72ff8afcf32171ec5fce881db62f6b89f1f91533b57f9018fb7f6746f9cc5562948fe435649f729c18db1f3053fbf3c4389f9298e65b1c27c6f5fd9199e2fb1131cd8f8dd75591d73b3121a678944d99697eae89d99e9ac464cfe21c19127ab4873133c6137d8fac77517fbe414cfab667cca86f9bae937d09667c3e5b12933e759199fc87db637d3e3053fb6f89b1fd7d666cdfec1093be6d8199fc799c18d78f1633f56f13637ce931e37ccaabc4e87f65661c9f4bedd3f8d2f3383ebb8b9cece73d31da4fc64cf6534f8cd74f98c9ffda89713c7d668a87cf89713e69bc6c7fd226c6f60533f5af13e3f523665a4f1689713d34cc940f5412e37a4bf361c8ffe579626c7fc24cfda7fb495f5d66ea8fc74bf1c0f37cb0ff9f25c6e76f98c91fe37aa80ce7431ee73f748ff1e09298fcc10c89693c42103bbc6eabc86c1fee9c19edc39f25c6f511c76b589ffa8331de8c9929be1698c9de4462b4b73e33f903c9c3fad4978951be3233c583d3c4b8de3798c9febb89713ce97e5abfd3fd349e0e33d9ff1d31e9dbb03cacef97c4980f5e3053bef49e18ed798f99f2f171628c8f57cc383eb99318c73763c6f1a97d62b21fbb9718ede59a99e2f35d62b4df0a33e98fe79fe287b9488cf118e3b9b1e4ffd63393bd1f31537e10f5ab8b9c6f9b4b64b657fb424cf3632c33cd4f62ca176b89d11e9969bc593531fac73e32afff2e2366fdbc22b33d6434bee4af57cc643f3566b29fb7c4713cbacc4cebcf3c318ef78198e65f6b66f2a7476692ff3a31f63f62a6f16689b17d816cd91f3bccb4be7613a37ccce43f16e5b59c8f659298c73f60c6f9d73d621a9fbd64a6eb536443eb89bf41b6ec6f31df3625cecffd71e2785d1c22737cc9f69929bf4f4ccf3f3163ff66454cf2a92133f9db8819edcb1788d91f7789c9bffc6d62ccbf2533e98bc66f69bd543e31fa478798f3d54b66f2cf2233ce574f13933d8958ff18cbf2bb2633d9e36b629cdf6762b26fcdf797717ed401f3fe5e9cdf2231fb9f4f8cfd9d32533c7f60a6e75f13eb383fe7c41c8fee9829bf1925c67874cb4cf1fb3e31eabfc74cfe963163ffa281ccf32f0a89b1fd4366da6f9089717c27cc141fca89317e5f33d3fec25162bc3e25e67ca59918fb5f32d3fab1488cf6f1ce4cf9fc1333daa7dc27e67c649418dbe7fb697d12b789b1fd1e33c5e7c7c4387eb22f4bf62e1e1263feb0c34ced937e1ccd6f16d7275b4af1f09c19f5638ac49c5f4c12a3bf5f32a3fde80e72d24f8399f6af1e99291e9e3053fede62a6fe0f13c7f6cd1931e947779929ff2825c6f5ea8099e2f52c31c623c54cf6719518e3c92b338d779719f5ab6e1363bc3d67a6f14e8959ffcf8951ff4366b22f9718aff37c90fef53c31ea9fe79bfc5fb513a37c4b668a37c7ccb83ee807669287e793f35b93388ea7cbf2707dab12e378b97dae6fdb89315fe0f9a778e15e1363bce2f975b4bf41f23bae671a89b13fcf4ce3e927c6eb4566ca27687e1dd7c737cc145fea89d13fd01e1cdb83b7cc149f2789e378dd8019edd9d599d19e5d2171b48f2c5dafe0f52762ae577712a33e2f98297f3a488cf6f0c84cfb352f89713eaf99697de7f152fc7715661c8ff1c4a4efec28319e8765cca45fee9fd783cbc4986f707f144f6c9119f56d4acc688fd92a31daeb0d338d17edd5b13d985d66b287d7c4680f17cc148f2a89d1dfaf9969fca93dd27f6a8ffc69c48ce3975566f2a766628c0f7bccb4fef1755e5fde1263fde498a97e1a3393ff2c1363be6499c93eaf98291f3c25e6fac733533e19e3992b27fdec2446fd08661cbf5d25467bee30933da7f6aa268ebf85ccf3e7e689b17dc74cfabf4d8cf94f8f19fb57a5c4680f6fccd8bfa813f37ed21333d56b85c4987f9d32533d9e98e4ab3063fbbe9a385eb78698d7ef6766b2af3d66aaafae13e3f832665a6f3b89717c9299f235969feb8d1533d517717d71ce703cc5eb8ef5e10f985531de3f4276bb2a5ecf7688393f3862a67a7bc14cf3a113e37cbd1173fd639829bec4facc97395e76a752fc551fa9d67ed7e193d8484b9f5fd257b4adbf4c92dff9b024f6d7b4f70bf46273f3fb33a3b37f3fbd6c93647394e1df5f35e2bf542fbf2bdd97f705ff711ffef33faf976f48f3f57dead749f2d7e8a5fb850ffdc80affbe7af949e9fe667a913efe9bc1a727fbc04f72107c81d694644d72087ff7f019c5fb07c0bdbf975ee4b31cc3e8b2f8fb531ca100895ee42b48865264f0f70c7eefc1dff0f77e9422fb75baff157a916f7202a31bc3ef93a01f906a1cad27483895b3a40f9426e8692e17f059ca157c7e9934bfcc5fde499249f7c337de41aaf06f2de88c22f0813c9475f8f7481e477db1b5fd3df462e3881b2049187553d672d7344950877fc3e84f401fa7b205bc8cf786e7cefe56ebfe398ce83c5ad710467e01236ec9b6ecc8aebc9457f25adec85b7927efe5837c943bb2007fdf957bb208f77a78aef4b7cac71ab22cf741925759915518e9a390420825b430c20a277cfc7122133dd1174f62208662249ec518ee1f8a975f23c937f5f2d53af0b1468cc08b5bb22b5ec59b9888298c7a26e662113f0bb14c3f8bf8b7b9588977511307e2109ea9831ec10a49c77f62bdf9865ea07571049fe3d81bd5201051df055896688a13b914a7a225cec4b9b810ed385efe597ef1b320a93aa20bfabb1457e21ae25a13dabb81d817e21c4407710b3ef524ee7e9d5ec25c897b71241ec4a3d841494401e2d29bac895d99893d5114255116fba212475fa59fed52d0552595883c176da594564659880e4d39863e7ac1974012ad9c14caff6abd8034c71b7fafc985ca544ff5d5931a901c4b58e27f24c987a4511efa5bb4399067a846b2aa9e21c6853c2244795869d5f3aff517d0c9b178483e029605bd2dd458bda857f5066321bb49a3fbd14f554dd4544d493b3325d43c3ebd520bb594776aa5de6155653f8cbaf9657a818f785cf3f67dd0494bd5d4813a54f5a00f18ddd1b7e4d8ae1f904c1d470feaa806b864531e515f13ca80be55b77e6f7d011b6649cad2a81379a14e554b9db187f03c7fe1f15bac2ed922cb328d770469ced5856aab0e4497719466f4dddcfa67d697d08aea424b2d90e4525dc551a3657df6908d79cf4704b02a815a041b93f1e9656a01a29bba5637ea569c82df8c5557dd7d773fe1a7d67d6cc9c92ef4754f92a007e0983ecbb1ce7949513b22d74a2e5eab2bf5a01ec529f41956e15fa897b89e044d3fab1dd04941edc21abe483d2f29ba92ad241d6cae26acc563b5b7666dc71bfac4c8d65145555265d150fb30f231c74e5805c49fd24b584f2cc4ae9aaa8075dda024a489bc7682241335c9594b55556141aa5316d3d1f2432a904992ce3017f8b056fc4ba685565ac38a8c33fa8c151fac6b7f228ec1a0438d31910ea2f0255817dbcd5a9ccd6963a1aa30af57daa862783b437b657426ce744ff7f5931e88773d8c630ff391a233fb4fa2851ee967d5830c47c55a35dbac41377de75b7aa9c15c8ce5428fc5103d3ecdfd7a4c8a72e81798d157fda6277a2a5a6aac67b2ade77a0159ca1ee4cd5dbdd42bfdae6bfa4085f95feac3a0d10d6f8a57c45c1fe8ba3e8af91a57dba1a25bf75ff3337ad1c790393addd04d6d3806873ef5893e4149a09b53d4876ee9337d2eaff4856eeb8e7ad65d7d09f973a8d0c6a1b681d834d057fa5adf80be6e216f9e518b47fa2e274fb23b68ef5e3f40bd730855dc7194e6e58feb25aef3bbfa51bde81d584f72512748425a89feaa0b7a57c3dceba22e41ef43b08a67a82d3f624f19227aa875ac5cc2dabeabcb7a5f5770b54dfeb74c5eb8040d2fc3571e20da54e4819190af85aaee625d920f69be938f858cc508a362af148df2b1c7e8208931c6aa82713233dea44f9468147339aaa031af83d5f7c0f44cdf3c09a95b66c0313145c565eaa76d8672cf8c623d7a0075a9a6b3834f113ae9656bcca63b67e6d98cd535e5e9eb768d51b96a5eccab7933d24ce2fd50ff834e50922154070f297f08f57d2d4a86fff6cccccccd4261ce508dfa11498ee839666956fadabc83242e561b5f783fe96573059a446f1fc949b00add3535f5847d7dac886a167a0a3ad1d21c9843358679d39b3d40ef022439377588454f513763f8d4a22787dda7913932c7a6619a20cd32facc7a061167cb9c9853d33267716f67b231d60d7fd996190449a4870ce2192aad92395f8b5e791bab286d56e6c2b421428ce28e44b2006aeb1cd6ee71c8504d07ee299aaeb93457e65a1e74a7e606fe36d073736bee82377eca50638fe6de3c9847b363a6a600d270dbb88bf8298e6d6606618fcbec823453b952a1d2aa444baef2eaf8517b983d53d4637d15ade7431f79ddf8e073308aa6ac87b7ebccbea998aa7c901df08166ccec07166eb14accc5664683b20cac5605d071668dd94927216add23d6fc85e7318b1174640ae15fd386ea773f579d2c28178c2b80b5d68967b0ae41da59f29f62ff4436ac87bf1fd8ccf620b10c7b011d5db37dfb04d2bc8963b8766207766847719d5d7efa59887dfbac1b20cd4b58ff7fbceeaf9dfc3c7de43c52e9b11d07ade00a927c3efaaa1ed917fb0a92d450276091bc139bcf041b7206f3af55d3bed90948829e3db3533b338f760ecf9c419e756a17ba4f99dea78c4e55edd2ae62eefc65ccddaa97b07b3dc18ccebe8b5763a25672d105d76968bf665fed01659e0d90e4637f381f3143ae7b20eaa08743a88617316fdb130b5bb747f2c1cce44a3cc0b34dfb2e1fe18e799226c902f3b8b0c7b62177ed1c2c3fe688bfab17d4c5906a39a8ef4cc93643f457722d8b3c8a73756d4feca96dc50861d0c369377c4d2f100b05e8e40c74d20e966acfd554dfd90bf8fddeb66d07fc26cc1ef467bbf6529d7f96255a77c75ea99a3c8c96ffc957d6d7fd9c957155ba5215f16cafd76331b40cd970885ff6c6deca4c75ed5dac311a3133ef51be142428f3ec80ee1eec7dc85762865f4d2b53b0b44358ffe7200db4a19c7db08f49331b3e0356b6630b1cc368cc5fe4c9492f7df2e42164758f621abd3d9f2be1ef993e8798efedee9a4e794d6ed8bd58837aa96d112429814e3eea938fea07565fd33465b10795f7be9cd8b2dd17595a29f39a99db8a69e86e5c63dee32a9c93ea533e96f40277865a5be89990b1e5cd1a31645fafb6aa4b90a97c3ea77f97fb4eca1246023d77c229d189f9c1346a784135d931c9e39d7606f22c68432fd4a37e8558365fd74ab48b4c7bc8c74cca29e2783fac6dab5e9e409a303a50b9103193cd6985f2f30e64f517b05ef82d156cc349e7c07f208ad8a229839f743e2a2dca1de72926423eecbccb541667f3c2f520afab6fca12fb9cb9be7b42bde4c7fba55ec2d503b0b2f0bb961da152afec2bd3188ff7dd40b7e5d0649f6b71bb07d612f6fd57622cafdc3066d74bf0f50ffb9ca79dc11043ea6ee49ec1a7c2e8408ff60daaa46d7a9943a5d98816f6bc9ebd6cd74bd45a5891a25e6457e8f5ac38ca125a357aaa3b21275ecbeae913a3f3ca94dcd8bd400db9998d522e4cffadea27fbe05e61d584100715f1917b7393cd5c1c23a79bca4b5b60bd7c1dc7727ad1f235daba06cf375bf402fdbb999bbb45981ff0c6cdf5246425076ee9c610a3861fa3a21c283fd30bb7720a3cff5a2fe4b1087dcee4b1aa294d7a495eeadea306175055c85817fd60dd5fd34ba8afa771f7e84ad88df989b2e8175783eab71be209ccd370a352e863de65db411277c092e42a131a254872e884aa88c7986bf8b827aaa19a7b43bbdcf0d2853a7775d0dff067f4029f19fc5e7747b9dd2392258ea20215ae82ea37647ac34fad9ec88e29839fcca224dbcf2e62d5e38e21c635e4aa8b15b48d35e7d0f45d33643a1f15265927e44cf2c19d44bd64f1acfad3fa928f075137c3384763092b97f01bd10433b18e3b956d58e38335854aeb3c663d0d5ce365d509885d2bc13b636bbb983196cd43eeeb5aee2cf85cdc91005b804a6d126b9b96bc83c8b74c5979925fdd9ba26975b12eaa6fadf7795d0927a4fcbb8d91f97e8b2c31f228036b35546ae2184660696f71164efaec813b57c53816cea6f33b97f05f0711cdb55dc7ee9b47f9eebae2d15dca41771a33d449b05077055139e9efe3c7ad20133aa0b1ba6dfb30b91a10d7151f77d6b2303fb41bb66ee7b0bae90cbc15b246f28fb168baebb85f5385de4a6ef5a90ac9af5093e87137ee56d5dc5d8c83e3a893a6bb8f33d8326592654333e05f0fb2dd455faeaf4bb2a9972e9f1484753f6430f7e02f9f6559424f67e23aec5cc75385b00317768dea02f4e51ee339df3cae279feb449446461b9b99a2b3f210ea977dd0ef4d9046d6c46d58fbb7cb02337be676a22724bd7c11c738bfc57727825e1ec4fb3659445bf7e41ef45c0ef956acdb9b908936210a4fd06b697f683d766db6b252455780356c27ae47e1ac32ccc891dbd5ab64a36bb2e811d4b0a817f53beb3ee7c7b1b604b94fd48be86d89420b2d755f5eca5af0f4601d50b3d76d16d69390ad802413cc56482b1ff6f5b1d66056d67133f562baf1c415779b2012e886dbd3bcd7bc66db6a60dff42cc52ffb398e7dd2cb285acd4a2ecc9b2b26efcdc7d3857e925db8ef1cee1bc0480650e7f45d89b2faf5dde5f52a31c5d890f902b5ddb1bc852aac089e3fc57c415eba72ccd8d253bc0feff65d45174356f9bbf918eb2554541aaad1035970d5cf356b388fd303bd04cb6a80ad8fe0031924f8498724c99fc66ca97863b54d11117e9faba5975e885b9a49a50a7a27d6b19bb2406e0eb37b22b3cd68fcb55e50d3d1bbba1ef746aa187d30878a678b99b935a3b8f73596debe9bfde8271388b7391b671bd377318bcbd72e6ba702f6c86b6f42cd08ba29bbba1ead9db655e933b74b6f21220db79f8d7dd4fb1bfe12f69e56e6d13b5bc7fa85f6c379077be6bd1e530d39f099a9048bc12c3a9e76e54e95e339f152cdd662dac78a13ac69e67b50b7847d9615d43b7d5a29391395342b2bdf975d5dfaeafd8c5cbdcfefded9f8864ef834f5c23f855a8c4f2592ed40ffbae607a615f622bb5373e587d1c226246bb49de417b032c67deefc89eb5a2c09b5b2d27ea0c67ea44efd33dbc2872c61f7024672664a7ebc916d6de865631f70104f6efa216715cfa2966c378dc1bfc0680fb4f3afe05323f0fc6b37d6b5b0c742abcab1205d60ecf56ffe2dd6c81f275f6b9131ec63e82158da4497e1334a15f2878d85385113ad6861298649b7a99794a97fbc13d983cf24be7bb4eba77882951f43d47ad5cffcdcf4c23b2bea59766cc72fe219de9cf69f78c7bee29756f8957f0fb26edb95e04a135aacf9038821959caf7d686eee0ff5b53cc4f31789a7c0f54f7ae1bc46939cc1f333e9a16637f6ddd771d721d999e0f5c11ff9636f82bfc0e7d46676668fe2f972ae6684ace3d837e4a57983357e462be0b695339c1c2d7dd39fc43dd28d739110f9dcca9faa8adaa1fd314b39d9d77ac9cb697d0ba459aa82e8867ed0ced28a1ea2da4c57cc13e8700455d4523d9b47a8235b71f6298aaa7b77e8432efceecfc3d7c4409af6b60a2044f2584fe457a0b56c1fb472211f3d6456f62ef9f78ff4b2fe0d8f916f439ef4e23b601ded0f59282e4f54b0e00e7863db7721ab1ccb377f691e4dc31eaa2a595aac4f689d9ec9437fe5afddf1a777cad8cec239f4514e53496bd1eb2a6ee66ffc2dccda738a63fa4bbd6c56541c2b4ecc61f046f04f8acbd1226847595d9bb90e6f633dc0fd2559d373f09bbbb88fe2f5933b5395304350379a503b7aa1bdbfcfedc17cb6b5ed36b8506f1a72f0b882e77712d7dea2ffc679a5b3affe219e594c5916b0df2a67bb66cf09ff28e790659e8134e12ca5ec779cf73bf2ce2d630419407d3296fb90a1f4e59e2ff8dd8fda19e3dec6cfa6dec0977c3883ae4306cb3bbce1ec33bfbb28be755e5917d7e2cc435e06abdd3445fc2aed2a877876a75756ca23b10b2a6fcacc977cd9efbb67a8db17e17dd798b3ed40a61376dd8bbee2abf6d0d653cdf9f5cf8225d30799cc449c0dbfbe37f1653eb65d2f433f162da762cd9bab0ef3eb76a6326d0771ad811a53edc8a2ca4c3b9e9486dddc90c94f20030dbb7f509f78235ecd01f8dafcd38ede7689c2be585821cbbe15ebaab59344f9e95cec87d23475db3e4334db7c03b19ade355c596587194470d9c45a24beb33f044f7d0b6fd1a9b07b0ed2844c14da3b947bfac61e85d528bc79f1a53e88322827322f67be05d1a8b97ebef3937a31f64e77b3cc2e537db45157847c0b6257176a9a4758cd2e624f633a459ac47797f7d549ace54d3cdd10ba64fa59cfd7a096c6e8bee527bdc3d4cefa100b75f0f650c7e623d3d7f5cb171febba66c738dfc89ed25efdc6592faddcce1e660379073d9f440f1d8993a8a3463a01b771dfed5966ee241b66a3ec3937ff9fb413a4c9c6d94bf62adb21fac6d1f7ff9c5e606d78b685ec2d9bc4b76116b9d17ff82f9ed0cfd57936b50df908955a2beeebe8f8b6bb8ff56788412ba84fca7aae4eb399af65f3ad922cd6fedbce16e05f7d23e1799fde87d9f256dc77fcc578f9220ad9325b65ef6a90ab3ff23d7f44d3b9b0e624abf9335552b5ecc0f4e3feceb15ed8a2dc93bb90070ff47b16d6ac4a3a0d597c9221af9faaae6575d9056942b634e62c78d3d2bef59e523d3b0afbc6309f2a3ba67713319be1774af27e1462a854f7ea5c9baca1dfac537d796f1fe4bdaf674da5cd0948d149d5da3427cb57710cf20b3dc84ed408e2e2383ba59d3eb76969df8a63ad78cef22e87fa316b6567319a2e37eae0cdea2afe80ddad445bd5e1e71eb2ce4ed4447edc5fbfc79cff09963803dd9c9b0be814cf5edcdafbb1df5e5f401f257ce7283bd20df5e8665861c4ba3d9f9b6fd6599b59227b7435f72ee3276fdf9aab85b7af86aeacdad945fefb327f607d71591bdfa0323bbaa31b59c70d7521b6ff92deb85aef7b9d271be3de26f12249b34533f1cc0f32bc2cf8cc4bfe74e4e7e258770a95d685be0ce72c419aec28bbccaef4339d5d2fb6d589e84ff9357543675f672f5ffc3d444955cdaeb39bdcfefecfaf2f229ee4b910014c16562cd1d03abbcdee742bd8ffefbcc10f95bf12f49ee88fa58857b3f117511a2481787f0fb1307eef89e3d8cfea257b100dc8b1c27adeb4bbaa9b3dca10db76b282ae6eafad7e67a6d7bd9f779a16712d79a16f9dacc92166a097cc7b5980f885ebcba7b7bbbea9974fe791615e4c2bdb356533343f8ea8db24d894a58adffb81bcab9fbd668bfc9bbf51b332aec1fd6c2fec5ca4efc37cfd5edf0fb3984f92f4219e1ccb1331565956d43be6dee01abae9bb5bb29d8d484eebab3ed022737ae66cc8a1437d0355e941bcba024916ea02f2f093f056fcb631fd09bd34e33996867cf7d4ed42942e65a5ac0cb1a0c2bb16f86eac3a72ef9b6febe2fe6c7c6f96bf9b54516f7e2f937a9c85330367faaea207f1ad82397a7cf8b642667443dce2fbb49bb3fc33feb22e114683f87dbd2358870f8c5465f3a8c6d9be7b145dc87cd7ab926d5181f759e6c2f90b7b08d5ef6516fa9885730350fb557612a599c71385916dda816e403416a2f9a331fe91eff1c9b7b8af99c5ef4c424e200ae13d7f7f9555ec5b56758fb692befbb6593ba6efbea9ab9eec899e928f3d0d757c1dea9b5069851abe674047e2b5677a36e8047237f093b0731e74124ebabe1ad71ffa7e2546c566fc06ee0a2276219c27c3fa7302faa9b9b96968effa5ab829d8f9b91ea97bb7722b750fbf0ddcbe7eb54bdfb7676eaeaf55c58fc15275a8e042a5456f0365d0ee9e6af75c4f66f7fe35fa89a0b759c59f5bf7373ffa38be27abe3bb62606de6cc14ac811a72d8f3fe5cae40aaba7bd20d79a94e5d5d3e98228cfc419c99a23f035f284bb048736c5aba84ef06c0487bf1dcba194f5e076657865df7233fca6ecc28eeba0e3667f20fc7b1cf5616f69b47f13bdf427ad44bd8b732bba6907a809a076cfcd49d98963dd0ed5ea6db7a6e5aaee1c7f45e398f084f4b86b1ca0adf210fb9f038ec208691cb66fc17bfb91ddeb3ed7f8e487f5c2f5f44eb8fbfe1db37e96debb559c0b7afb7b5f5e9adc32d7b765bfbff53fef22349c2e73d274d7aa76833b26fb779948af623d7fefefbffdf187f462f5b4686dfec58d7454695537dcb7bf8fc3e26ee41e6f6b5a9d212b93d6e9ddf21def6f9febaff03bd6cfe7dcd8ae0f73ad781db6680f720d7f20aaab4481fbf4e2f5b6b85fca836e6ec2b2bfafc779450ffc8fabe691bdfd4cb57954fbea5b5f381ef49a293e56dd1d79a8e7e20d14fc7b1af3cfc47d6f7831eb75c5faf45c2bde5dcfddbfa4dedfa56aff74bf5f2390ead7be997a3c9dfbf16d5736dfe6016e09e5e0f329f3f9027ffde7dbfeaf3ddfe7ecdbafff7fcfcd5ffbf70ff9d9fff557af97fffe71fff1f2192a73f</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui index 96177775..6a06876b 100644 --- a/kwordquiz/src/dlgrcbase.ui +++ b/kwordquiz/src/dlgrcbase.ui @@ -173,7 +173,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>krestrictedline.h</includehint> <includehint>krestrictedline.h</includehint> diff --git a/kwordquiz/src/dlgsortbase.ui b/kwordquiz/src/dlgsortbase.ui index a7ede5a3..c9c4ed7b 100644 --- a/kwordquiz/src/dlgsortbase.ui +++ b/kwordquiz/src/dlgsortbase.ui @@ -139,5 +139,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/flashviewbase.ui b/kwordquiz/src/flashviewbase.ui index 1c74163d..a6eca621 100644 --- a/kwordquiz/src/flashviewbase.ui +++ b/kwordquiz/src/flashviewbase.ui @@ -548,5 +548,5 @@ <data format="XPM.GZ" length="29635">789cdd9c59536349b2a0dffb579475bcb58dc5456841b2b17910082476891daedd87588f401202b4736dfefb7884bb878e1632c9aaec99b2694c957c9c25c2c3f73847fd1ffffae3a17dfec7bffee31fa3b11a3f9b3f4c577dfcf12f3b190c16fff95fffebbffff1cfc2cece1fe153de2bfdb1fbcffff18f7f8af91fe60fb113ff17b996b81a588d990b787c465cc2f3954c8ce78f98e9fc297195ce3f4a8ce71799f17c7b92188ff37c0c5eef7b89e3714de31768feb64e4cf3d3c791ab69be93c478ff43661cdfa5e338be3e21e6f98bc478fc9e99ae3f4e8cc7df8869fef634318e3f65a6f5aa22b33c6e9618ef77c08cf7170b62924fd0fc0b345fdd27a6f18d0e0c77a3f1dc09328f9765cc78dcbc10f3fd2f89e9fea24d4cf7570de45db6274f4cd7674562bade45fb2a54f97cf5404ce7fb7a6294d711b33e14318d9f7503efa6f1748198d763404ce78b0cb9c8f3fd24a6ebcd1e31cb8b5ce3f3b3d7c4a8cf6b62b6b773621e7f9f98c6771ab944f73367818b053e5ff588597ff78971bc1b64be5e7413e3f10f629a8fed258ec7fd9c99f43d23a6f1ad899ce6a74f89797d4c62d4cf0533d9f39898d7af9318e73723667d98c4f17846e395cb349f68ffa5025fef86c4bc9ebb8951be2633ce471be432dbdb59e278be1932d3fcebc434be2b25c6f93d12d768fe2f89e3712b90f72cad2fce4f95cb349f77623adf4c99e97815b952208ef1b0bc5bb6e8ff7e9f79b716e7f7865c29d0fd5acc74fd0e318defcb89f1fc3be65d5c6f1aaf42f2f91b624bf247ff2ec3fc8a8578ff5d625a1f75c04cf17d4e4cf28a0a33cde79e98eeefaf98e9facfc4180f7bcc385fa591f7485e534f8ce727c6f3b31631ebf739318e6f98f17a17e35d05d6a318d7db5689693eaece8cf777a7ccb83ebe9f385e9f2d9079beaa9418eff7ce4cfad827a6f9f83b669287af277db90233e50bc54ce7ef12f37a467fa82479fd8819edcb8f99511e7b454cf777b7cc78bed82726fd699118cfef32937c378971bc57e42aad87ba65a6f9477bda2b32db69e278bde2e3b43ebe93188f3f12d37cb32133e92be6a33dcdf15c58628a674621a7eb0f98c91f5e89d93edf13e3f917c835922f3b67a6f98ac4f17cfdcc4ceb1ff55d2da6f8dc404ee77f30e3f9a24f4cf2eb4f663cee1c31c9a34e99693d5462d44fb4ffaa4ef1fb3931eaf78919f59fe17c748de41789c91f769015ebef8299e43d4c8ce31f10b37dce98f1fc4c25467963fd512bf1fdb31b66f2e72362bade3c24c6eb1d7309f5bb205674fd0b7349c5f9d4881d8e676e99f17c2199f17ee60359ef92ff4a66b287a7c418ef5f9849bf6fc415ca97e3c4e83fc7c48aee7f9d18fdfd9499f415ebc99aa972beeb21b3bce69598e431136694473d23c3fc50de33663c9e7512c7f5b22d629a7f564e8cf63462a6f9f1fd2ab83ef29e19c7538619c7f315e632f63fc7c4b41e6a2731aed72b338e274f12c7e3f29699ec73c9717c49eba11dde5fd613e3f50b66baff7e621cff9319e5335789513e92d790bdc86162bc7f8f99ee3f4d8cf509ad87a1f5164789315f3c31533d7448ccf612f5ab4a55cae7ea8599ced7c414ff5513b9c6f9b94a4cf6a51f90f52eeac77f12933eed3133ead33612a3fd4866bc3e7b23267de91233e5e72633e9eb9199ee9faea7fb1799f1fee68998f46979fea44fff9218ebab13661a5f24467fb6cc684ff23a31fa579919e7e77a89717e1933cecf923cc93e3e13a37d64cc641f8dc478fc9899fceb3231cea7cb4cf1e73531ae678598ec4bdac4787fc14ce3ebc478fc9019c7d7b3c4b85e3566ca4f85c418dff788c9bfe57962bcff8899c6ef26467db599693c9687fcddb788d9bfcf12e3f537cc94df513ec3fe601532fb83cf8839dede32d3f17662bc7f8598fb872633f9f70733d547683f86edc9b598293e1e268ef6941d21b3fef565628c3f43668ab70566f29fbdc4689f5d66f21f4f4cfad75789319e5498717c719218f3719399fca59318e793cea7fc7a9418e773ce4cfe724d4cf6617698c93ede12a37e0e99697d6789d1fe8bcc540f0e13633e4ce3e1fc641a8fe63762c6f9295e4fb237fb9418f323eb87e28fb84f8cf65e6526fd65cc54ef9c2746ff217bb3142fac6326fb6b3093fc51ffbac4f6e7df99e9f89271fc5d62ee07769849bf77cc7b3ade6fc85c2dc6f3fbc88aea677bc64ce3d1f9acffec9898f4e3cf98c95eeacc642fef89a33e748599f2d35b62f4974b625a6fad99c97f9e98c91e6e12e3f803669aaf4c8cf56409d9b2ffb599a9feb8488cf29d1093bff8180fb4ad513f92e17caca2f8e38e98293fcd9969fda7c4bc7ff1c24cfed923e6fcba9718f5394636949f3cced75af6c7a86f53e6fe4d8c88a9becffacc246f8798fbaf4f62924f9c23ab32cedf0e98d17e4409d972bd502026fdba983f8de57eca6b6445fb2bea0a5957f07ea6474cf141086287c77dcc7fb6ccfd94e920f3fdec2bb2a6f5329699ec2531d9ff3471942f1b11937d650f8971fe3bc81c4f9d21e6f815edc93a8ee7be48ac70fd32c38ce3e92e31dddf5e32e3711be7eb2adc2ff945e2a86f7180ccf69cdd3153bfb5c74cd73b66bcbf9913937dab3e33c5d70133adff2d31c7df5d628aa7fe3231c6a33233adff11b2a37a4af9c4180fe97ac7fdca3933c563bc9f63f9dc0133c59bb7c4e80f7d628a5fbac58cf2ab7de65a29aedf3531db8b4f8ce31d3253fd78c34cd73f2736713d8e88793dae98a91ee926c6fc72c74cf9f82131ea5730533ccd98717cd144e6f51585c478ff0366ea1f64629c5f8399ec793731e6e31b66daeff84c8cc7c7c45cafb612e3f87366aa07668951ff0b66ead79e99d1fee41e31d7a383c478ff1766b297bbc478ff8c99f603ae13e3fcc9be1cd9b3784c8cf1688799ee4ffaf1b4be599c8f07ff20fd9c33a37e4c9198ebc54162f4e72b66b41fdd464efad967a6fdb02766ca7775668ac7e97c1a7fc9f1fee69498f4a33bcc949fca8931be2e98291f4f1263bc51cc641f1789315ebc33d37caf9851bfea2e31c6cb0633cd7744ccfa7f4d8cfaef33937db9c4789ce525fdeb6962d43faf37f9bfba4c8cf2cd9929de1c32637cd78fcc240faf27f73726719c4f67cc4cf3558971be47cce40f178931bfa5eb69bd0789315e3d3053fd41ebe9b99f6d26c6f13c33cde739311e2f3153fea3f97adeffb865a6f8729018fd23e633efa17e89f66e3e9153fd7082ccf6e22533c5ef51e278bdcb98a9de5830a3bdbbfbc4d17eb229b3c2e39e98ebadbbc4a8ef0b66aa07c689d15e9e9869bfee2d31d69be7cc54afa5f1703eaec88cf3318e98ec219b25c6f5ab3093fe1f99295f5c25c67ae29999fac9fbc4981f7798d13e4c8919ed377b4f8cc70533aeafbe4d8cebdb64a6f5ed306b1be59f309b723c7e86ccf6670acc647fef89d1fe2e9829fe5513637cb961a6f5d84d8cc74f99297f7f24467bec33e37ac81a33f9732b31d60f5d665c0f554e8cfa7d65c6f5c81cb389eb21f87e9c0f3f12637dcce773ff3e64a6fda24662acdf2c33f5c385c4988fae99a99e6f3253fd7dcc4cfabc67c6f9fbddc4f1b8d5c49c5f07cca48f2233d5ebd789d13e3d33e5c3e3c438df4366daef607d90ffd80933d95b3531d65fe41fde53fdf4c24cfeba488cfebac78cf7eb8ca5f8777da45af95d874f62232d7d7ecb58d116fe6d92fce4c392d8df73bfdfa0179b5bdf5f999dfdfbe9659b24ebb30cfffeae19ff5bf5f253e9be3c2ff88f5bfacfff7bbd7c439aafcf53bf4f927f8f5e3a5ff8d08facf0efab975f94ee6fa617e9e3bf197cbaf219f845f6822f504e49d624fbf0770f9f413cbf07dcfd7be945beca21cc2e8bbfbfc4190a90e84dbe83642845067fcfe0f72efc0d7f7f8e5264bf4ff7bf432ff2438e607643f87d14f403520da3f50409c77292f481d2043d4de50c3e73b980cf6f93e6b7f9cb274932ea2c7de313a40affd683ce2802efcb03d9807f0fe551d4175bdbdf432f36ceb809928459b7643d774c93040df837ccfe18f471224f81e7f1dc70ddd9df2aef9fc38ccea375f561e61730e3537929dbb223afe4b5bc91b7f24edecb07f9289fe48e2cc0df77655196e05c0fd795ff56f5585356e41e48f22eabb206337d125208a184164658e1848f3f4e64a22b9ec58be889be1888573184f3fbe2edf748f24dbd7c9507963962005e7c2a3be25d7c889118c3ac27622a66f13313f3f4338b7f9b8a85f81475b12f0ee09a06e811ac9074fc17f2cd37f402771787f0398aa3510f0211f5538065899638967371224ec599381717e232ce977fe65ffccc48aab6e880feaec4b5b881b8d682fbdd42ec0b710ea283b8039f7a11f7bf4f2f61adc48338148fe249eca024a20071e943d6c5aecc445194445954c49ea8c6d9d7e867bb1474544925224fc5a5524a2ba32c4487961cc218dde04b2089564e0ae57fb75e409aa3b5bfd7e54c65aaab9ed58bea911c7348f13f926429699487fe166d0ee4e9ab81aca9578871a18e08511e32ad7afdbdfe023a39128fc947c0b260b4991aaa37f5ae3e602e643769763ffaa9a9911aab316967a2849ac6ab176aa6e6f25e2dd4276455f6c3a89bdfa617f888a7156fdf039d9caabada5707aa11f401b33bfc961cdbf50392a9a3e8416dd504976cc9431a6b4415d0b7fad6efe517b06196a4228d3a9617ea449daa33f6105ee72f3c7e8bd5255b6459c6f18c20cdb9ba5097aa0dd16518a5197cb7b6fe95fc12eea23a70a75390e44a5dc759a3656d7ac8dabae723025895402d828dc978f53cdd01a29bba51b7ea4e9c80df0c5547dd7f773fe197f23edec9c90e8cf54092a007e09c36e558e5bca4a81d91bb4b2e5eab6bf5a89ec4098c19b2f06fd44bcc2741d3af6a07745250bb90c36769e4394557b295a483f56cc25a3c52c5156b3b5ad32746b6b62aa9b2aa88a6da83990f39764216107f492f219f58885d755505ebba4549481379ed0449466a94b3969aaa41426a5015d3d6722915c8244967580b2cad15ff9269a195d6909171455fb1e383bcf617e2184c3af41823e9200a5f8175b1ddacc4d99c3666aa06eb7aad8d2a69ab9df6cae84c9ce9ae7ed62fba273e753fce3dac478aceec3f89667aa05f55172a1c157bd56cbd075df79d6fe9a50e6b3194333d147df4f8b4f6ab3129caa1df6045dff5871ee9b13855433d91977aaa6750a514a16eeee8b95ee84f5dd7fb2aacff5c1f048dae79533c22a67a5f37f461acd7b8db0e1dddaaff9a5fd18b3e82cad1e9a66e69c331388ca98ff5314a02c39ca03ef4a93ed3e7f25a5fe84bdd56afbaa3afa07e0e1dda30f436109b7afa5adfe85bd0d71dd4cd13bae3a1becfc993ec0eeef7a01fa1df39802eee284af3f6e7f512f3fcae7e526f7a07f2492eea0449482bd15f7541ef6a587b5dd26518bd0f56f10abde532f65420a2875ec7ca39e4f65d5dd17bba8ad936f9df3c79e11c343c0f5f8980685395fb4642bd16baba8b554996d27ca71e0b158b1146c551291ae5638fd1411263c29b4dd0bf64c619cf9f28d120d672d441635d07d977df64a66b9e85d4a7e68563628a8af334cea5e9c9a2e9c77e741ffa524dcf0e362274d2cbd6984d674eccc0bcaa1baad357ed1aa372cd0ccd9b7937d27cc4f347a08fd7e8ade1f349b55c9020f4f7f52819fedb35633331538535432dea472439a2e7989999eb1bb300495cec36bef07ed2cb7a061a456f1fc851b00add319fea05c75a6644350923059d6869ea665f0d61ddf4fa0830ba0049cecd01c4a297a89b217cead193c3eed3c034cca139324d90661e7d66b58288ab655ae6d89c98d3b8b7335a9beb9abf6cab0c8224d24305f10a9d56d99cad44afbc8d55953673736e2e20420ce28e44b200bad739e4ee61a850cd259c53326dd33157e65aee77c6e606fed6d353736bee82376e54a87144736f1ecca3793223b303d2f0bd711771238ead5706618fcb14409ab15ca8d06955a325d7383b2e7b0fb36b8a7aa8afa3f52cf591d78d0f3e07b368c9862999b2a9983d53958fb20d3ed08a957dcfd42c9c24a662bda241595eac025f7432b3da3ca527216ad52356fc85d7318b11746076c2bfe602badfbd5c7732a35a3066006bac15af605dbdb4b3e43762ff4836ad83bfef5b6f33282cc35e405bd76d177ac913f9218ee0d8b17db62fb617f3ec7ce36726f66c5f37419ab790ff7f9cf7579efcbc2c6b1ea9f4d00e82563083249f8fbeaa07f6d5063fa9a34ec0227927365f0936e504d65fab967db3ef20097af6c47ed89179b463b8e60ceaac133bd1cf54e96d5474aa66a7fa36d6ce5fc6dcad7a09bbd723ace8ec4cbc1b13b5928b2e98a7e1fe733bb40baa3c9b20c9727f381f3143adbb2f1ab66b3fa11b9ec5baad2866b66ef7e5a3012b168f706dcbcee4139c314dd22459601d67f6c036e4ae1d83e5c71af1a77a415df4a99783fece94ec6188fe4aae54918771ad6eec916dda568c10063d9c76c357f402b150804e8e412797c152ed891aeb7b7b0abf3fd8337b0e7e13560fc6b317f6529d6fca12adbb6ddbaa2e0fa2e56ff8ca6adecf591977a50b5515afb6b31a8be1ce500d87f865af2c547caa63af638fd18c957997eaa5204185570774f7686f42bd122bfc5aca4cc1d23e21ff4f411ab88772f6d6de25cdacf98c9dda7bfbc0318ce6fc459d9cf4f24c9edc87aaee498ca3b7e76b25fc3dd3e710f39d7d5cd129e7e4a67d8a3da897daee802405d0c9b23f59763f907d4dd39445113aef3d39b2bbb628b29429f39a99da9239d29d98633e6316ce49b5518f25bdc099a1d7167a2264bcf37a8f18aaaf775bd665a854461b9deba7dcb31559c648a0a776cf56453bd607e3a8e119f56447248fb73527a1ce827be8997ad2ef10cba6ab5a897691690ff5984935459cefd2dab6eae505a409b3534ec0ff261485b953c1fabc0d55fd05e40bb7a5836dda8a53e03f1045ec8e29839fb4979d16d58ed31413a11e76da1995c5d5bc7010e6a1f25b93258e3971ce79d44b7ebe5fea251cdd072b0bbf6bd9866c3015b9ec45bd13c47b97e94bd987ea71a317b74f602d61df7f2186f2da7563753d075f5fdae734ed0c8618d270cfee057c2acc2ee8f10dbaa46d7a9942a7d98c16f6ba5abd6cd74bd45ac848512fb223f46a551c650977357aacdba1265ea9eae913a3f3c2945ccff5a1875caf46a916a6ffd6f48bbd7503c89a10e2a0233e74af6eb85e8b63e4746ff20abc9ff4f2751ccbe945cbf768eb1a3cdf6cd10b8cefdedd871b85f5016f5ccf27a12a817ce27a3674c369565403e5577ae6c6b60a9e7fa367f248843127f248d59526bd242f7531c3aa992a401f936dcffd5bf512faeb71dc3dba16766d7da22cfacd4da1fbed847802ebd45feb149eb1eeb26741129724c97526344b377673bba7aae229d61a3eee896ae8e63ed02ed7bc74a6cedd02f4d7ff15bdc06702bf37dc676ef7886489b3a84287aba0fb3550e9f537ee7a2cdba6ec62ffebbe7a7611bb1e57b77b6e5f2e3ad841dbd873f64dd71d844a67d961927542cd241f5d23ea258bcfaa37f24b3e1e44ddf4e31a0d25642ee1d7a20956626d77282f21c7076b0a9dd679ac7a9a98e3650da2f03b542bbc33b6b28b1963d934d4beeec83583cfc51d09b005e8d446b1b73995f710f9e6a92a4ff2ab075334271dec8b1a5bfb7dce2be10929ff6e63647ed8224b8c3cca40ae864e4d1cc10c2ced2d4ec2933ebb702d558a73e16a3abf7309ff75c7605d27eed416cda3fc7467e2c99dcb5e671c2bd451b05077015139e96ff903de751ce25d9ceb321b6cd14bec404dccd5226a11d68776c356ed1cb29bcec05ba16a24ff188a96bb8cfb353518ade0c61b5d483e438da2c7b55d47d5dd558c83c3a89396bb8e2b786aca24cb9a66c0bf6ee465077db9b12ac9ba5e3afca420e4fd50c13c80bf6cca328791cec44dd8b98e4f15c20e5cd8356a08d097bb8dcff9a6319f6cf689288d8c36f66e8a4ec803e85ff640bfb7411a59177721f76f970556f6ccdd454f487af9228e717d8bef4e04bd3c8acf6db2884bdd954518b912eaadd8b7b7a0126d41147e47afa5fda1d5d8b57e97852ab97bc8613b311f85679561450edd835e241b5d91450fa08745bda89fe47dae8f636f09721fab37d1dd1285665aea677925ebc1d3837540cfdeb03ee49350ad802423ac56482b4bfb5ae61aaccadaee5dbd99767ce28abb4d100974d33d6ade6b5eb16dd5b36f7a92e297dd8c631b7a1944ab59c89979774fc97bf3f174a65f6407ce3b87f37a30931ef4395db74355fdeaeef26a9798626ca87c812e5d5dde41175602cf1f63bd20af5c21566ce92ade8777bbaea84ba1aafc693dc67a091d95866e745f165c69b3670dcfe3744fcfc1b29a60eb03f84066043f699324f9a7315b3aded86d534484dfa76aeecaae22ee6825952ae89dd8c7aecb02b539ac6e03abfd7549b6eb05351dbdabe3f6623551c3e88335547cb698995bd38f7b5f43e9edcc54a29f8c20dee66c9c6d4cdfc72a2edfbbac3c15b0fbaeea6aa16704dd54dc420f569eb6d5e833b5532f2122f5b73f1b5bf6fb6bfe12f69e16e6d10b5bc7fe85f6c379077be2951e520fd9f3da0499675845c7a75db9a7caf139f15c4d5662da32e3046b9a78037d4bd86759e8a9739429b91295b42a0b6f654797bf7a3f23d7eff3bb7736bea1133e2d3df3e12d96f48c27d90e8cafebde9b93b017d9199b2b9f450b1b91acd176925f40668cfbdcf927ae2bb124f4ca4a7baf86beab4efc33dbc25296b07b0133393325ffb2566dade9656d1fb0179fdc3c879a55bc8a7ab2dd3407df83d9ee6b27c26e75d8a9bb763d5d0f7b2c94558e04e90263afeffb7eec91974fbe562263d8c7d07dbbef07ba029f41ea90973616e2441dc63ba6fa8fbb932df518f52bfc4e64173ea3f8eed1ae7fc52758f93944add7fcd0bf992cbcb3a25e65db9efbf7f80c6f4afb4fbc635ff51f90a63b7e1464ddb62bc19d26dc71ec271043aa395f5b6a6eeaa7fa461ee0f317894f811b1b7ae1ba46939cc1f333f0e80af488333fc35d87646782f3839ffb85ab057f81cf89f57664f7e3f3e55ccf085547dd7fca2b1372fc3b65c06d99333c399afbbadf8f7ba46bcf4542e473637fa0aa6a87f6c72cd5645feb252fa7f50d9066ae0aa213c6413b4b193d44b589ae9a67d0e100baa8b97a358fd0471ec5d5a728aa1edcdc1f422dfce98f9c70f72eee906d4a132279ec27f21968a5da07ad34e5937f817ee93af9f78ff4b2fa0d8f816f419df4e68fc13a2e97b2505c1ea960c16df0c60b7f0255e5507ef853f3688eeca7aa91a5c5fe84f2f4441ef8337feeea1bef94b19d85e7d087394d25ad45afabba777fe12f61d55e531cd35fea65bda3e258716cf68337827f525c8e16413bcaeac64c74781beb11ce2fcbba9e82dfb4e33e8ad72faea9aa6185a06f34a177741508569ddc1ecca6ad6db7c199fad05083c70c9edf495c798bfe1bcf2b9d1dfaabf8cc62ccb280fdd6b8da35bb76cf5fcb29549967204d789652f6374efb1be8a81a3182f4a03f19ca3da8509e65d1dffabb65ef8c716fed675d6fe04bfe1eeabf0654b0bcc31b9e7de67717c5b79e5736c48d38f3e0d390edc629e2d7685739c4b3b65e989a3c14bbb6225a32f38ffec9efb817e8db67e17dd758b3ed40a51376dd4bbee077ed67ccc03f7af36fe931a1fadbf7455f8aabe157f726beacc7b6eba5ef5fc4a9adc69e37d71de6f3b62ffb8a7d8eb9067a4cb5234b2a3317f14969d8cd0d95fc082ad0b0fb07fd89ab897753075f9b6eece86d9728ec8b85bdea8a6fc4be6ae549a2dc782ef643695afad2f64567a573a708434f4a1756d817bf07f56e0b7b91f8ce7e1f3cf523bc45077fdb0bd2844a14ee77208bfad6ee876c14debcf8521f44beea6b662027be01d1a8b5fa7ce717f562ecb5ee64d24e537fb4d657847a0b6257077a9a27c8661771a4213d451ac57797f7d471ece54d7cba2174d97433e1c76e4cd17dcb4f7a87e93253100b75f0f6d0c7e623d3d7fdcb171febcecc93acf9cf4ca7bdfab567bd94b99dfdcc8cbc87918fa3870ec471d451333d01b771dfed5566ae91d9cc653eb7fe1bda09d26459d6cd9ee56588be71f6cf7f4d2f901b5eed43f692f5e2db30b3dcec97fe3bc3aca2ceb3be6dc827e8d44ee3be8e8e6fbbfbd87f8618b480fea4a2a7ea241bf871f6fad5de59eebf97d910fcab6b245cefd3fb305bde8afb8ebf1827df44217bcbdeb30fd5cbf51ff99197d1742aac6965237fa8caaa9e8d4d37eeef1ce999dd9145b90b75b0d79fd9440fe21b8ee97d870d3f59eaa7a6ebd95476409a502d0db90a5eb7b46fbda7d4c86661df18d65365737a3711ab197ea724ef4721864af5a0ceb5c916fac35af52c1fecad7cf0b3ec5369d30229daa95b1be764f92a8e417da17b595d0d202e0eada69d3eb76e69df8a63a7f139cba7eceba76c3f3b88d174bed607af7757f107ec6e212e55037e1ea0ea6c474de4e7fdf57bccf99f50274c40370d730e83e2b317b7f27eecb7f30be8a38cef1c6533dd544fee1d3b8cd8b7e76bf3f53e6bbd4a648faee5de65dcf0f6adb55a78fbaaef0aea323bcc7f5fe64fe417971de11b54e649b775336bbaae2ec4fbbfa537ae56c75ee5d1dabcb7493c4bd26cd14c7ce607155ed6029f79cb3f1df9b538d61943a775a1afc27396204d36cb8eb313fd4acfae67dbfa44f4a77c4e5dd3d9d7d5cb177f0f5152d5b2d3ec2cb7bfffebf945c427792e4400e343c6124dad552b3bd7a7c1fe7ff2063f74fe4ad07ba23f96221ecdb22fa2344802f1fe026261fcde13c7b15fd54b76299a5063857cdeb28faa93b521e335fc71d6d1b5edbdd54f567ad5fb79a76916734997be75b2228798805e32af6401e217e6978db7bbbea9978de791615dcc497665caa6677e56ed6e4ab02e4b0dbff7e3ab99ca9eb361fecddfa8591973b08aefc4f6d3f761be7eafef8755cc8624cf59fc269b18aa2cbbd63be6debce0b86bbebba5da598be4945ff5be16bea6274e841a3af437d095a2340b9064a62ea00e3f0e6fc56f9bd35fd04b2b3ec7d250ef9eb80788d2e5ec26bb855850e55d0b7c37561dbac9fadbbab83f1bdf9be5ef2655d587bff7453d34e169af335d57d4bdf856c1143d3e7c5bc1efe9a6b8c3f769d757f957fc6555228c06f1fb7a879087f78d5415f3a886d99dbb151da87c57bb926d5181f759a6c2f9a6fd84eef7ca97e0be93f0dc00d47e9dd5a334d3f84461600fedb36e423416a2f5a339fe99eff1c98fb8af99c5ef4c424d200ae13d7f7f96dddbb7ecc1ddda52faeedb7aef98befba6aeb3c7ec29db914f597877b601fd4de8b4420f0f55a4866a32dbcd8a4127fa33f849d8390f3a094fbabe9ad79ffa7e2546c556fc06ee0222f64e789e0cf9e718f453771fe64887ff1f1be1dec0cecff5403d38e854d403fcd673bbfadd4ebdb5c7ee43dfa8aa7f014bd5a1830b9d16bd0d94c17d8b90e34b20ef45dcab9cc7151cc64eee2fe5fdf58f3e8aefc9eaf8ae18589b39353b56430fd9cfcafe482e40aa86f3ba29afd4895bc847538499df883353f487e00b15f9a486e6d09ce832be1b0033edc6e7d6adf8e4b5670a32ecba1ffa6e7666fa71d7b5b7be927f3a8e6d5a59d86f1ec4ef7c0be9512f61dfca14c2ef3402f43c60e327ae614eec425f66157da9a7e6c4edfb177aaf9c67844f4bfab1cb0adf210fb5f030ec208699cb56fc17bfb91ddeb37dde8c487f5e2f5f44ebe5dff0ed9bf4b6f5ca2ae0dbd7dbeeb5f1d6e1963dbbade3ff257ff99124e1f3999326bd53b41ed9b7db3c4a45fb912b7ffff9ff37c65fd1cb9699e1373b56759151e7d4d8f21e3ebf8f897b90b97d6deab4446e8f5be77788b77dbe9ff77fa097f5bfaf5811fcdee03e70db0af01ee44a5d419d16e9e3f7e9656baf909fd5da9a7d65459b7f4709f58facef9bb6f14dbd7cd5f9e4efb4f27ce07b92e864795bf4b5a2a31f48f4cb71ec2b0fff91f5fd60c42dc7577b91706e2577feb671d37d7d23dbfbad7ad98c43ab5efae56cf2e7af44f5dc3d7fb00a704eb60795cf9fa8937f76deeffa7c77bcdf93f7ff9e9f7ff7ff2fdcffcdcfff577af9dffff31fff075dc58bf2</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index bcef3211..b964e6af 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -173,7 +173,7 @@ class KWordQuizApp : public KMainWindow void slotVocabLanguages(); /** define vocabulary fonts */ void slotVocabFont(); - /** define keyboard tqlayouts */ + /** define keyboard layouts */ void slotVocabKeyboard(); /** define special characters */ void slotVocabChar(); diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index 568b23fd..799644f5 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -77,7 +77,7 @@ KWordQuizView::~KWordQuizView() KWordQuizDoc *KWordQuizView::getDocument() const { - KWordQuizApp *theApp=(KWordQuizApp *) tqparentWidget(); + KWordQuizApp *theApp=(KWordQuizApp *) parentWidget(); return theApp->getDocument(); } diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index 6aeca50d..c801b011 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -77,7 +77,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) if (KStandardDirs::exists(file)) { - int result = KMessageBox::questionYesNo(tqparentWidget(), + int result = KMessageBox::questionYesNo(parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") .tqarg(file), TQString(), @@ -85,7 +85,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) if (result == KMessageBox::No) return TQString(); } - KMessageBox::information(tqparentWidget(), + KMessageBox::information(parentWidget(), i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>") .tqarg(file), TQString(), diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui index 87a08caf..4e25f0c3 100644 --- a/kwordquiz/src/multipleviewbase.ui +++ b/kwordquiz/src/multipleviewbase.ui @@ -972,5 +972,5 @@ <slot>slotOpt2Clicked()</slot> <slot>slotOpt3Clicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 63efeb0d..f1ac84d8 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -542,7 +542,7 @@ <slot>slotFrameColorChanged(const QColor &)</slot> <slot>slotCardColorChanged(const QColor &)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kfontrequester.h</includehint> diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui index e4e0241d..a9c63062 100644 --- a/kwordquiz/src/prefcharacterbase.ui +++ b/kwordquiz/src/prefcharacterbase.ui @@ -402,7 +402,7 @@ <tabstop>lstCharacters</tabstop> <tabstop>btnCharacter</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kwordquiz/src/prefeditorbase.ui b/kwordquiz/src/prefeditorbase.ui index 9465f801..67b096a4 100644 --- a/kwordquiz/src/prefeditorbase.ui +++ b/kwordquiz/src/prefeditorbase.ui @@ -122,5 +122,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui index 5012a509..79f570db 100644 --- a/kwordquiz/src/prefquizbase.ui +++ b/kwordquiz/src/prefquizbase.ui @@ -287,7 +287,7 @@ <Q_SLOTS> <slot>slotAutoFlipClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp index 4d7a23b0..86157be9 100644 --- a/kwordquiz/src/qaview.cpp +++ b/kwordquiz/src/qaview.cpp @@ -292,7 +292,7 @@ void QAView::showQuestion(int i) picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); - //@todo handle keyboard tqlayouts + //@todo handle keyboard layouts } void QAView::slotApplySettings( ) diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index 02cf272b..9be1bee1 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -865,5 +865,5 @@ <Q_SLOTS> <slot access="private">slotCheck()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/wqquiz.cpp b/kwordquiz/src/wqquiz.cpp index 4e1fb4cc..db4c716c 100644 --- a/kwordquiz/src/wqquiz.cpp +++ b/kwordquiz/src/wqquiz.cpp @@ -564,11 +564,11 @@ int WQQuiz::kbAnswer(int i) /* WTQListItem *li = m_list->at(i); if (li->question() == 0) { - //@todo return m_table ->tqlayoutLeft(); + //@todo return m_table ->layoutLeft(); } else { - //@todo return m_table -> tqlayoutRight(); + //@todo return m_table -> layoutRight(); }*/ return 0; } diff --git a/libkdeedu/extdate/extdatetimeedit.cpp b/libkdeedu/extdate/extdatetimeedit.cpp index 23871cdb..78bc371b 100644 --- a/libkdeedu/extdate/extdatetimeedit.cpp +++ b/libkdeedu/extdate/extdatetimeedit.cpp @@ -517,12 +517,12 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) ::tqqt_cast<ExtDateTimeEdit*>(w) ) break; hadDateEdit = hadDateEdit || ::tqqt_cast<ExtDateEdit*>(w); - w = w->tqparentWidget(); + w = w->parentWidget(); } if ( w ) { if ( !::tqqt_cast<ExtDateTimeEdit*>(w) ) { - w = w->tqparentWidget(); + w = w->parentWidget(); } else { ExtDateTimeEdit *ed = (ExtDateTimeEdit*)w; if ( hadDateEdit && ke->key() == Key_Tab ) { @@ -533,7 +533,7 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) return TRUE; } else { while ( w && !::tqqt_cast<ExtDateTimeEdit*>(w) ) - w = w->tqparentWidget(); + w = w->parentWidget(); } } diff --git a/libkdeedu/kdeeduui/kdeeduglossary.cpp b/libkdeedu/kdeeduui/kdeeduglossary.cpp index ff108975..882b5007 100644 --- a/libkdeedu/kdeeduui/kdeeduglossary.cpp +++ b/libkdeedu/kdeeduui/kdeeduglossary.cpp @@ -41,25 +41,25 @@ Glossary::~Glossary() bool Glossary::loadLayout( TQDomDocument &Document, const KURL& url ) { - TQFile tqlayoutFile( url.path() ); + TQFile layoutFile( url.path() ); - if (!tqlayoutFile.exists()) + if (!layoutFile.exists()) { - kdDebug() << "no such file: " << tqlayoutFile.name() << endl; + kdDebug() << "no such file: " << layoutFile.name() << endl; return false; } - if (!tqlayoutFile.open(IO_ReadOnly)) + if (!layoutFile.open(IO_ReadOnly)) return false; ///Check if document is well-formed - if (!Document.setContent(&tqlayoutFile)) + if (!Document.setContent(&layoutFile)) { kdDebug() << "wrong xml" << endl; - tqlayoutFile.close(); + layoutFile.close(); return false; } - tqlayoutFile.close(); + layoutFile.close(); return true; } diff --git a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui b/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui index 3e198a0c..45ab6c3f 100644 --- a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui +++ b/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui @@ -106,5 +106,5 @@ </property> </widget> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> |