TDE
/
tdeedu
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeedu
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent dcb06497ea
commit 96698e12d1
351 changed files with 1594 additions and 1594 deletions
Show Stats Download Patch File Download Diff File

2
kalzium/src/kalzium.cpp
Unescape View File

@ -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();

12
kalzium/src/kalziumdataobject.cpp
Unescape View File

@ -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();

24
kalzium/src/kalziumtip.cpp
Unescape View File

@ -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();

2
kalzium/src/kalziumtip.h
Unescape View File

@ -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;

2
kalzium/src/molcalcwidgetbase.ui
Unescape View File

@ -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>

2
kalzium/src/moleculeparser.cpp
Unescape View File

@ -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.

2
kalzium/src/periodictableview.cpp
Unescape View File

@ -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;

2
kalzium/src/plotsetupwidget.ui
Unescape View File

@ -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>

2
kalzium/src/settings_colors.ui
Unescape View File

@ -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>

2
kalzium/src/settings_misc.ui
Unescape View File

@ -67,5 +67,5 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kalzium/src/settings_units.ui
Unescape View File

@ -163,5 +163,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kalzium/src/somwidget.ui
Unescape View File

@ -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>

2
kalzium/src/spectrum.h
Unescape View File

@ -145,7 +145,7 @@ class Spectrum
/**
* @return the tqparent element of this spectrum
*/
Element* tqparentElement()
Element* parentElement()
{ return m_parentElement; }
private:

2
kalzium/src/spectrumview.ui
Unescape View File

@ -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>

4
kalzium/src/spectrumwidget.cpp
Unescape View File

@ -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 );

2
kalzium/src/timewidget.ui
Unescape View File

@ -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>

2
kanagram/src/mainsettingswidget.ui
Unescape View File

@ -178,5 +178,5 @@
<tabstop>kcfg_hintHideTime</tabstop>
<tabstop>kcfg_useSounds</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kanagram/src/newstuffwidget.ui
Unescape View File

@ -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>

2
kanagram/src/vocabedit.cpp
Unescape View File

@ -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)

2
kanagram/src/vocabeditwidget.ui
Unescape View File

@ -224,5 +224,5 @@
<tabstop>btnClose</tabstop>
<tabstop>lboxWords</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kanagram/src/vocabsettingswidget.ui
Unescape View File

@ -113,5 +113,5 @@
<Q_SLOTS>
<slot>createNew()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kbruch/src/taskvieweroptionsbase.ui
Unescape View File

@ -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>

2
keduca/keduca/configdialogbase.ui
Unescape View File

@ -96,5 +96,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
keduca/keduca/keduca_part.cpp
Unescape View File

@ -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 );

2
keduca/keduca/keduca_part.h
Unescape View File

@ -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 );
/*

2
keduca/keducabuilder/kcontroladdeditbase.ui
Unescape View File

@ -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>

2
keduca/keducabuilder/kcontrolheaderbase.ui
Unescape View File

@ -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>

2
keduca/keducabuilder/keducaeditorstartdialogbase.ui
Unescape View File

@ -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>

2
keduca/libkeduca/kgallerydialogbase.ui
Unescape View File

@ -366,5 +366,5 @@
<slot>slotButtonAdd()</slot>
<slot>slotServerSelected(TQListViewItem*)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kgeography/Changelog
Unescape View File

@ -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

2
khangman/khangman/advanced.ui
Unescape View File

@ -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>

2
khangman/khangman/normal.ui
Unescape View File

@ -90,5 +90,5 @@ Default is no sound.</string>
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
khangman/khangman/timerdlg.ui
Unescape View File

@ -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>

6
kig/ChangeLog
Unescape View File

@ -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

24
kig/DESIGN
Unescape View File

@ -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.

4
kig/TODO
Unescape View File

@ -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.

12
kig/examples/figure_angle.fgeo
Unescape View File

@ -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"/>

32
kig/examples/figure_manyobjects.fgeo
Unescape View File

@ -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"/>

64
kig/examples/session_alotofthings.fgeo
Unescape View File

@ -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>

24
kig/filters/cabri-filter.cc
Unescape View File

@ -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.. )

2
kig/filters/drgeo-filter-chooserbase.ui
Unescape View File

@ -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>

202
kig/filters/drgeo-filter.cc
Unescape View File

@ -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 );
}

2
kig/filters/imageexporteroptionsbase.ui
Unescape View File

@ -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>

132
kig/filters/kgeo-filter.cc
Unescape View File

@ -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:

174
kig/filters/kseg-filter.cc
Unescape View File

@ -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:

2
kig/filters/kseg-filter.h
Unescape View File

@ -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:

2
kig/filters/latexexporteroptions.ui
Unescape View File

@ -63,7 +63,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
</includehints>
</UI>

56
kig/filters/native-filter.cc
Unescape View File

@ -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() );

2
kig/filters/svgexporteroptions.ui
Unescape View File

@ -55,7 +55,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
</includehints>
</UI>

2
kig/filters/tests/locus.fgeo
Unescape View File

@ -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>

30
kig/kig/kig_commands.cpp
Unescape View File

@ -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 );

6
kig/kig/kig_commands.h
Unescape View File

@ -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();

4
kig/kig/kig_part.cpp
Unescape View File

@ -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 );

2
kig/kig/kig_part.h
Unescape View File

@ -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()
);

2
kig/kig/kig_view.h
Unescape View File

@ -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;

14
kig/misc/argsparser.cpp
Unescape View File

@ -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;
}

14
kig/misc/argsparser.h
Unescape View File

@ -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

30
kig/misc/calcpaths.cc
Unescape View File

@ -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;
};

2
kig/misc/calcpaths.h
Unescape View File

@ -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 );

2
kig/misc/cubic-common.cc
Unescape View File

@ -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

20
kig/misc/object_constructor.cc
Unescape View File

@ -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;
}

8
kig/misc/object_constructor.h
Unescape View File

@ -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(

80
kig/misc/object_hierarchy.cc
Unescape View File

@ -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]],

2
kig/misc/object_hierarchy.h
Unescape View File

@ -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;

148
kig/misc/special_constructors.cc
Unescape View File

@ -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 );
}

18
kig/misc/special_constructors.h
Unescape View File

@ -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;

2
kig/modes/base_mode.cc
Unescape View File

@ -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...

60
kig/modes/construct_mode.cc
Unescape View File

@ -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 ) );

2
kig/modes/construct_mode.h
Unescape View File

@ -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 );

2
kig/modes/edittypebase.ui
Unescape View File

@ -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>

22
kig/modes/label.cc
Unescape View File

@ -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 )

2
kig/modes/macrowizardbase.ui
Unescape View File

@ -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>

32
kig/modes/moving.cc
Unescape View File

@ -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 );
}

2
kig/modes/moving.h
Unescape View File

@ -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();

2
kig/modes/textlabelwizard.cc
Unescape View File

@ -81,7 +81,7 @@ void TextLabelWizard::linkClicked( int which )
mmode->linkClicked( which );
}
void TextLabelWizard::retqlayoutArgsPage()
void TextLabelWizard::relayoutArgsPage()
{
select_arguments_pageLayout->activate();
tqrepaint();

2
kig/modes/textlabelwizard.h
Unescape View File

@ -35,7 +35,7 @@ public:
void reject();
void accept();
void retqlayoutArgsPage();
void relayoutArgsPage();
private slots:
void textChanged();
void linkClicked( int which );

2
kig/modes/textlabelwizardbase.ui
Unescape View File

@ -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>

2
kig/modes/typesdialogbase.ui
Unescape View File

@ -323,7 +323,7 @@
<slot access="protected">contextMenuRequested( TQListViewItem* i, const QPoint&amp; 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>

30
kig/objects/angle_type.cc
Unescape View File

@ -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;

4
kig/objects/arc_type.h
Unescape View File

@ -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;

42
kig/objects/base_type.cc
Unescape View File

@ -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() );
}

104
kig/objects/conic_types.cc
Unescape View File

@ -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();

22
kig/objects/conic_types.h
Unescape View File

@ -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,

12
kig/objects/cubic_type.cc
Unescape View File

@ -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 );

6
kig/objects/cubic_type.h
Unescape View File

@ -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;
};

70
kig/objects/intersection_types.cc
Unescape View File

@ -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 );

12
kig/objects/intersection_types.h
Unescape View File

@ -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;
};

12
kig/objects/line_type.cc
Unescape View File

@ -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 );

4
kig/objects/locus_imp.h
Unescape View File

@ -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

34
kig/objects/object_calcer.cc
Unescape View File

@ -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() )

44
kig/objects/object_calcer.h
Unescape View File

@ -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;

88
kig/objects/object_factory.cc
Unescape View File

@ -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(

10
kig/objects/object_factory.h
Unescape View File

@ -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;
/**

8
kig/objects/object_type.cc
Unescape View File

@ -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 );
}

18
kig/objects/object_type.h
Unescape View File

@ -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;

18
kig/objects/other_type.cc
Unescape View File

@ -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 );

8
kig/objects/other_type.h
Unescape View File

@ -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;

104
kig/objects/point_type.cc
Unescape View File

@ -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;

20
kig/objects/point_type.h
Unescape View File

@ -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;
};

184
kig/objects/polygon_type.cc
Unescape View File

@ -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;

22
kig/objects/polygon_type.h
Unescape View File

@ -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

4
kig/objects/special_calcers.cc
Unescape View File

@ -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 ) )

2
kig/objects/special_calcers.h
Unescape View File

@ -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;

66
kig/objects/tests_type.cc
Unescape View File

@ -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." ) );

16
kig/objects/tests_type.h
Unescape View File

@ -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;
};

28
kig/objects/text_type.cc
Unescape View File

@ -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;
}

6
kig/objects/text_type.h
Unescape View File

@ -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;

2
kig/scripting/newscriptwizardbase.ui
Unescape View File

@ -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>

22
kig/scripting/python_type.cc
Unescape View File

@ -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();
}

12
kig/scripting/python_type.h
Unescape View File

@ -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;

4
kig/scripting/script_mode.cc
Unescape View File

@ -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();

2
kiten/configdictionariesbase.ui
Unescape View File

@ -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>

2
kiten/configfont.ui
Unescape View File

@ -26,7 +26,7 @@
</widget>
</hbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontdialog.h</includehint>
</includehints>

2
kiten/configlearn.ui
Unescape View File

@ -157,5 +157,5 @@
<tabstop>kcfg_QuizOn</tabstop>
<tabstop>kcfg_GuessOn</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kiten/configsearching.ui
Unescape View File

@ -64,5 +64,5 @@
</widget>
</hbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

158
kiten/edict
Unescape View File

@ -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 @@
看板屋 [かんばんや] /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/

2
kiten/edict_doc.html
Unescape View File

@ -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>

4
kiten/learn.cpp
Unescape View File

@ -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);

2
klatin/klatin/klatinchoose.ui
Unescape View File

@ -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>

2
klatin/klatin/klatingrammarwidget.ui
Unescape View File

@ -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>

2
klatin/klatin/klatinresultsdialog.ui
Unescape View File

@ -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>

2
klatin/klatin/klatinsettings_vocabpage.ui
Unescape View File

@ -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>

2
klatin/klatin/klatinverbswidget.ui
Unescape View File

@ -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>

2
klatin/klatin/klatinvocabwidget.ui
Unescape View File

@ -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>

2
klettres/klettres/fontsdlg.ui
Unescape View File

@ -31,7 +31,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontdialog.h</includehint>
</includehints>

14
klettres/klettres/klettres.cpp
Unescape View File

@ -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;
}

4
klettres/klettres/klettres.h
Unescape View File

@ -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

4
klettres/klettres/soundfactory.cpp
Unescape View File

@ -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();

2
klettres/klettres/soundfactory.h
Unescape View File

@ -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;

2
klettres/klettres/timerdlg.ui
Unescape View File

@ -238,7 +238,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kactivelabel.h</includehint>
</includehints>

2
kmplot/kmplot/FktDlgData.ui
Unescape View File

@ -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>

18
kmplot/kmplot/MainDlg.cpp
Unescape View File

@ -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;
}

6
kmplot/kmplot/MainDlg.h
Unescape View File

@ -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();

2
kmplot/kmplot/editderivativespage.ui
Unescape View File

@ -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>

2
kmplot/kmplot/editfunctionpage.ui
Unescape View File

@ -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>

2
kmplot/kmplot/editintegralpage.ui
Unescape View File

@ -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>

4
kmplot/kmplot/kmplotio.cpp
Unescape View File

@ -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 )

4
kmplot/kmplot/kmplotio.h
Unescape View File

@ -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 );

2
kmplot/kmplot/parser.cpp
Unescape View File

@ -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");

2
kmplot/kmplot/qconstanteditor.ui
Unescape View File

@ -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>

2
kmplot/kmplot/qeditconstant.ui
Unescape View File

@ -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>

2
kmplot/kmplot/qeditparametric.ui
Unescape View File

@ -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>

2
kmplot/kmplot/qeditpolar.ui
Unescape View File

@ -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>

2
kmplot/kmplot/qminmax.ui
Unescape View File

@ -138,5 +138,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmplot/kmplot/qparametereditor.ui
Unescape View File

@ -181,5 +181,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmplot/kmplot/settingspagecolor.ui
Unescape View File

@ -455,5 +455,5 @@
<tabstop>kcfg_Color8</tabstop>
<tabstop>kcfg_Color9</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmplot/kmplot/settingspagecoords.ui
Unescape View File

@ -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>

2
kmplot/kmplot/settingspagefonts.ui
Unescape View File

@ -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>

2
kmplot/kmplot/settingspageprecision.ui
Unescape View File

@ -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>

2
kmplot/kmplot/settingspagescaling.ui
Unescape View File

@ -411,5 +411,5 @@
<tabstop>kcfg_YScaling</tabstop>
<tabstop>kcfg_YPrinting</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmplot/kmplot/sliderwindow.ui
Unescape View File

@ -83,5 +83,5 @@
<slot>setNum(int)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
kpercentage/kpercentage/kanswer.cpp
Unescape View File

@ -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() ) );

4
kpercentage/kpercentage/kpercentage.cpp
Unescape View File

@ -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
////////
////////

2
kpercentage/kpercentage/kpercentmain.cpp
Unescape View File

@ -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 );

2
kstars/kstars/addcatdialogui.ui
Unescape View File

@ -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>

2
kstars/kstars/addlinkdialogui.ui
Unescape View File

@ -149,5 +149,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/ccdpreviewui.ui
Unescape View File

@ -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>

2
kstars/kstars/contrastbrightnessgui.ui
Unescape View File

@ -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>

2
kstars/kstars/detaildialog.cpp
Unescape View File

@ -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()));

2
kstars/kstars/details_data.ui
Unescape View File

@ -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>

2
kstars/kstars/details_database.ui
Unescape View File

@ -48,7 +48,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>

2
kstars/kstars/details_links.ui
Unescape View File

@ -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>

2
kstars/kstars/details_log.ui
Unescape View File

@ -73,5 +73,5 @@
<data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/details_position.ui
Unescape View File

@ -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>

2
kstars/kstars/devmanager.ui
Unescape View File

@ -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>

2
kstars/kstars/fitsheaderdialog.ui
Unescape View File

@ -113,5 +113,5 @@
<slot>close()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/focusdialog.cpp
Unescape View File

@ -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 {

2
kstars/kstars/focusdialogdlg.ui
Unescape View File

@ -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>

2
kstars/kstars/fovdialogui.ui
Unescape View File

@ -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>

2
kstars/kstars/histdialog.ui
Unescape View File

@ -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>

2
kstars/kstars/imagereductionui.ui
Unescape View File

@ -607,5 +607,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/imgsequencedlgui.ui
Unescape View File

@ -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>

2
kstars/kstars/indi/LICENSE
Unescape View File

@ -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

4
kstars/kstars/indi/apogee/CameraIO_Linux.cpp
Unescape View File

@ -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;
}

4
kstars/kstars/indi/apogee/CameraIO_Linux.h
Unescape View File

@ -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

6
kstars/kstars/indi/celestrongps.cpp
Unescape View File

@ -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, &currentRA, &currentDEC);*/
/*apparentCoord( JD, (double) J2000, &currentRA, &currentDEC);*/
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, &currentRA, &currentDEC);*/
/*apparentCoord( JD, (double) J2000, &currentRA, &currentDEC);*/
eqNum.np[0].value = currentRA;

4
kstars/kstars/indi/indicom.c
Unescape View File

@ -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;

2
kstars/kstars/indi/indicom.h
Unescape View File

@ -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);
/*@}*/

4
kstars/kstars/indi/lilxml.c
Unescape View File

@ -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);
}

4
kstars/kstars/indi/lilxml.h
Unescape View File

@ -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.

4
kstars/kstars/indi/lx200generic.cpp
Unescape View File

@ -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(&currentRA);
getLX200DEC(&currentDEC);
/*aptqparentCoord( JD, (double) J2000, &currentRA, &currentDEC);*/
/*apparentCoord( JD, (double) J2000, &currentRA, &currentDEC);*/
eqNum.np[0].value = currentRA;
eqNum.np[1].value = currentDEC;

2
kstars/kstars/indiconf.ui
Unescape View File

@ -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>

8
kstars/kstars/indidevice.cpp
Unescape View File

@ -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);

4
kstars/kstars/indidevice.h
Unescape View File

@ -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 };

4
kstars/kstars/indielement.cpp
Unescape View File

@ -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;

2
kstars/kstars/indielement.h
Unescape View File

@ -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 */

4
kstars/kstars/indigroup.cpp
Unescape View File

@ -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;

2
kstars/kstars/indigroup.h
Unescape View File

@ -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 */

2
kstars/kstars/indihostconf.ui
Unescape View File

@ -186,5 +186,5 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

16
kstars/kstars/indiproperty.cpp
Unescape View File

@ -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;

4
kstars/kstars/indiproperty.h
Unescape View File

@ -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);

10
kstars/kstars/indistd.cpp
Unescape View File

@ -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()));

2
kstars/kstars/kswizardui.ui
Unescape View File

@ -843,7 +843,7 @@ button to proceed. &lt;/p&gt;
<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>

2
kstars/kstars/locationdialog.cpp
Unescape View File

@ -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 );

2
kstars/kstars/newfovui.ui
Unescape View File

@ -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>

2
kstars/kstars/opsadvancedui.ui
Unescape View File

@ -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>

2
kstars/kstars/opscatalogui.ui
Unescape View File

@ -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>

2
kstars/kstars/opscolorsui.ui
Unescape View File

@ -285,5 +285,5 @@
<tabstop>AddPreset</tabstop>
<tabstop>RemovePreset</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/opsguidesui.ui
Unescape View File

@ -261,5 +261,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/opssolarsystemui.ui
Unescape View File

@ -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>

2
kstars/kstars/skymapdraw.cpp
Unescape View File

@ -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() );

2
kstars/kstars/skypoint.cpp
Unescape View File

@ -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);

2
kstars/kstars/skypoint.h
Unescape View File

@ -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

2
kstars/kstars/statform.ui
Unescape View File

@ -176,5 +176,5 @@
<tabstop>meanOUT</tabstop>
<tabstop>stddevOUT</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/streamformui.ui
Unescape View File

@ -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>

2
kstars/kstars/telescopepropui.ui
Unescape View File

@ -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>

2
kstars/kstars/telescopewizard.ui
Unescape View File

@ -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>

2
kstars/kstars/thumbnaileditorui.ui
Unescape View File

@ -94,5 +94,5 @@
<data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/thumbnailpickerui.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/altvstimeui.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argchangeviewoption.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argexportimage.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argloadcolorscheme.ui
Unescape View File

@ -23,5 +23,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/tools/arglooktoward.ui
Unescape View File

@ -155,7 +155,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>

2
kstars/kstars/tools/argprintimage.ui
Unescape View File

@ -54,5 +54,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/tools/argsetactionindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetaltaz.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetccdtempindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetcolor.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetfilternumindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetfocusspeedindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetfocustimeoutindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetframetypeindi.ui
Unescape View File

@ -108,7 +108,7 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

2
kstars/kstars/tools/argsetgeolocation.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetgeolocationindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetlocaltime.ui
Unescape View File

@ -101,5 +101,5 @@
<data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/tools/argsetportindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetradec.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetscopeactionindi.ui
Unescape View File

@ -108,7 +108,7 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

2
kstars/kstars/tools/argsettargetcoordindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsettargetnameindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsettrack.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argsetutcindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argshutdownindi.ui
Unescape View File

@ -68,7 +68,7 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

2
kstars/kstars/tools/argstartexposureindi.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argstartfocusindi.ui
Unescape View File

@ -110,7 +110,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

2
kstars/kstars/tools/argstartindi.ui
Unescape View File

@ -117,7 +117,7 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

2
kstars/kstars/tools/argswitchindi.ui
Unescape View File

@ -122,7 +122,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

2
kstars/kstars/tools/argtimescale.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argwaitfor.ui
Unescape View File

@ -81,5 +81,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kstars/kstars/tools/argwaitforkey.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/argzoom.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalcangdist.cpp
Unescape View File

@ -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);

2
kstars/kstars/tools/modcalcangdistdlg.ui
Unescape View File

@ -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>

6
kstars/kstars/tools/modcalcapcoord.cpp
Unescape View File

@ -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;
}

2
kstars/kstars/tools/modcalcapcoord.h
Unescape View File

@ -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 );

2
kstars/kstars/tools/modcalcapcoorddlg.ui
Unescape View File

@ -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>

6
kstars/kstars/tools/modcalcazel.cpp
Unescape View File

@ -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;

2
kstars/kstars/tools/modcalcazeldlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalcdaylength.cpp
Unescape View File

@ -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();

2
kstars/kstars/tools/modcalcdaylengthdlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalceclipticcoords.cpp
Unescape View File

@ -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);

2
kstars/kstars/tools/modcalceclipticcoordsdlg.ui
Unescape View File

@ -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>

4
kstars/kstars/tools/modcalcequinox.cpp
Unescape View File

@ -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();
}

2
kstars/kstars/tools/modcalcequinoxdlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalcgalcoord.cpp
Unescape View File

@ -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);

2
kstars/kstars/tools/modcalcgalcoorddlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalcgeodcoord.cpp
Unescape View File

@ -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"};

2
kstars/kstars/tools/modcalcgeoddlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalcjd.cpp
Unescape View File

@ -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();

2
kstars/kstars/tools/modcalcjddlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalcplanets.cpp
Unescape View File

@ -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);

2
kstars/kstars/tools/modcalcplanetsdlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalcprec.cpp
Unescape View File

@ -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);

2
kstars/kstars/tools/modcalcprecdlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalcsidtime.cpp
Unescape View File

@ -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();

2
kstars/kstars/tools/modcalcsidtimedlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/modcalcvlsr.cpp
Unescape View File

@ -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();

2
kstars/kstars/tools/modcalcvlsrdlg.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/observinglist.cpp
Unescape View File

@ -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()));

2
kstars/kstars/tools/observinglistui.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/obslistwizardui.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/optionstreeview.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/planetviewerui.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/scriptbuilderui.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/scriptnamedialog.ui
Unescape View File

@ -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>

2
kstars/kstars/tools/wutdialogui.ui
Unescape View File

@ -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>

8
ktouch/ChangeLog
Unescape View File

@ -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>

2
ktouch/ktouch.lsm
Unescape View File

@ -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)

6
ktouch/src/ktouch.cpp
Unescape View File

@ -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);

2
ktouch/src/ktouchcoloreditor_dlg.ui
Unescape View File

@ -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>

2
ktouch/src/ktouchkeyboardeditor_dlg.ui
Unescape View File

@ -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>

2
ktouch/src/ktouchkeys.cpp
Unescape View File

@ -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 );

2
ktouch/src/ktouchkeys.h
Unescape View File

@ -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;
};
// ------------------------------------------------------------------------------------

2
ktouch/src/ktouchlectureeditor_dlg.ui
Unescape View File

@ -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>

2
ktouch/src/ktouchopenrequest_dlg.ui
Unescape View File

@ -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>

2
ktouch/src/ktouchprefcolorslayout.ui
Unescape View File

@ -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>

2
ktouch/src/ktouchprefgenerallayout.ui
Unescape View File

@ -334,7 +334,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontrequester.h</includehint>
</includehints>

2
ktouch/src/ktouchprefkeyboardlayout.ui
Unescape View File

@ -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>

2
ktouch/src/ktouchpreftraininglayout.ui
Unescape View File

@ -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>

2
ktouch/src/ktouchslideline.cpp
Unescape View File

@ -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

2
ktouch/src/ktouchstatistics_dlg.ui
Unescape View File

@ -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>

2
ktouch/src/ktouchstatuslayout.ui
Unescape View File

@ -356,5 +356,5 @@
<slot>startKTouch()</slot>
<slot>stopKTouch()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kverbos/kverbos/kverbosview.cpp
Unescape View File

@ -78,7 +78,7 @@ KVerbosView::~KVerbosView()
KVerbosDoc* KVerbosView::getDocument() const
{
KVerbosApp *theApp=(KVerbosApp *) tqparentWidget();
KVerbosApp *theApp=(KVerbosApp *) parentWidget();
return theApp->getDocument();
}

2
kverbos/kverbos/qerfassen.ui
Unescape View File

@ -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>

2
kverbos/kverbos/qlernen.ui
Unescape View File

@ -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>

2
kverbos/kverbos/qresult.ui
Unescape View File

@ -271,5 +271,5 @@
<Q_SLOTS>
<slot>slotDlgEnde()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kverbos/kverbos/qverbedit.ui
Unescape View File

@ -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>

2
kverbos/kverbos/qverbosoptions.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
Unescape View File

@ -138,5 +138,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
Unescape View File

@ -268,5 +268,5 @@
<tabstop>block1</tabstop>
<tabstop>expire1</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
Unescape View File

@ -143,5 +143,5 @@
<tabstop>ps_new</tabstop>
<tabstop>ps_del</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

8
kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
Unescape View File

@ -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);
}
}
}

2
kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
Unescape View File

@ -294,5 +294,5 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui
Unescape View File

@ -54,5 +54,5 @@
</widget>
</hbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
Unescape View File

@ -588,5 +588,5 @@
<tabstop>thirdM_plural</tabstop>
<tabstop>thirdN_plural</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
Unescape View File

@ -139,5 +139,5 @@
<tabstop>b_delete</tabstop>
<tabstop>b_cleanup</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
Unescape View File

@ -139,5 +139,5 @@
<tabstop>b_delete</tabstop>
<tabstop>b_cleanup</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
Unescape View File

@ -182,5 +182,5 @@
<tabstop>e_license</tabstop>
<tabstop>e_remark</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
Unescape View File

@ -139,5 +139,5 @@
<tabstop>b_delete</tabstop>
<tabstop>b_cleanup</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
Unescape View File

@ -139,5 +139,5 @@
<tabstop>b_delete</tabstop>
<tabstop>b_cleanup</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui
Unescape View File

@ -142,5 +142,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
Unescape View File

@ -225,5 +225,5 @@
<tabstop>remark_line</tabstop>
<tabstop>para_line</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
Unescape View File

@ -475,5 +475,5 @@
<tabstop>b_usageDlg</tabstop>
<tabstop>c_active</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
Unescape View File

@ -316,5 +316,5 @@
<tabstop>qcount_line</tabstop>
<tabstop>bcount_line</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui
Unescape View File

@ -213,5 +213,5 @@
<tabstop>mc4Field</tabstop>
<tabstop>mc5Field</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
Unescape View File

@ -383,5 +383,5 @@
<tabstop>thirdM_plural</tabstop>
<tabstop>thirdN_plural</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

10
kvoctrain/kvoctrain/kva_io.cpp
Unescape View File

@ -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() )
{

2
kvoctrain/kvoctrain/kvt-core/langset.h
Unescape View File

@ -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);

4
kvoctrain/kvoctrain/kvtnewstuff.cpp
Unescape View File

@ -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(),

2
kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
Unescape View File

@ -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>

4
kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
Unescape View File

@ -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>

2
kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
Unescape View File

@ -214,5 +214,5 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
Unescape View File

@ -82,5 +82,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kwordquiz/src/dlglanguagebase.ui
View File

File diff suppressed because one or more lines are too long

2
kwordquiz/src/dlgrcbase.ui
Unescape View File

@ -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>

2
kwordquiz/src/dlgsortbase.ui
Unescape View File

@ -139,5 +139,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kwordquiz/src/flashviewbase.ui
View File

File diff suppressed because one or more lines are too long

2
kwordquiz/src/kwordquiz.h
Unescape View File

@ -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();

2
kwordquiz/src/kwordquizview.cpp
Unescape View File

@ -77,7 +77,7 @@ KWordQuizView::~KWordQuizView()
KWordQuizDoc *KWordQuizView::getDocument() const
{
KWordQuizApp *theApp=(KWordQuizApp *) tqparentWidget();
KWordQuizApp *theApp=(KWordQuizApp *) parentWidget();
return theApp->getDocument();
}

4
kwordquiz/src/kwqnewstuff.cpp
Unescape View File

@ -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(),

2
kwordquiz/src/multipleviewbase.ui
Unescape View File

@ -972,5 +972,5 @@
<slot>slotOpt2Clicked()</slot>
<slot>slotOpt3Clicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kwordquiz/src/prefcardappearancebase.ui
Unescape View File

@ -542,7 +542,7 @@
<slot>slotFrameColorChanged(const QColor &amp;)</slot>
<slot>slotCardColorChanged(const QColor &amp;)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kfontrequester.h</includehint>

2
kwordquiz/src/prefcharacterbase.ui
Unescape View File

@ -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>

2
kwordquiz/src/prefeditorbase.ui
Unescape View File

@ -122,5 +122,5 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kwordquiz/src/prefquizbase.ui
Unescape View File

@ -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>

2
kwordquiz/src/qaview.cpp
Unescape View File

@ -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( )

2
kwordquiz/src/qaviewbase.ui
Unescape View File

@ -865,5 +865,5 @@
<Q_SLOTS>
<slot access="private">slotCheck()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
kwordquiz/src/wqquiz.cpp
Unescape View File

@ -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;
}

6
libkdeedu/extdate/extdatetimeedit.cpp
Unescape View File

@ -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();
}
}

14
libkdeedu/kdeeduui/kdeeduglossary.cpp
Unescape View File

@ -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;
}

2
libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui
Unescape View File

@ -106,5 +106,5 @@
</property>
</widget>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

Write Preview
Loading…
Cancel
Save