summaryrefslogtreecommitdiffstats
path: root/kig/misc
diff options
context:
space:
mode:
Diffstat (limited to 'kig/misc')
-rw-r--r--kig/misc/common.cpp6
-rw-r--r--kig/misc/common.h2
-rw-r--r--kig/misc/guiaction.cc4
-rw-r--r--kig/misc/guiaction.h2
-rw-r--r--kig/misc/kigfiledialog.cc4
-rw-r--r--kig/misc/kigfiledialog.h6
-rw-r--r--kig/misc/kiginputdialog.cc20
-rw-r--r--kig/misc/kiginputdialog.h16
-rw-r--r--kig/misc/object_hierarchy.cc54
-rw-r--r--kig/misc/object_hierarchy.h10
10 files changed, 62 insertions, 62 deletions
diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp
index 275170ef..b41b9284 100644
--- a/kig/misc/common.cpp
+++ b/kig/misc/common.cpp
@@ -347,7 +347,7 @@ Coordinate calcCircleRadicalStartPoint( const Coordinate& ca, const Coordinate&
}
double getDoubleFromUser( const TQString& caption, const TQString& label, double value,
- TQWidget* tqparent, bool* ok, double min, double max, int decimals )
+ TQWidget* parent, bool* ok, double min, double max, int decimals )
{
#ifdef KIG_USE_KDOUBLEVALIDATOR
KDoubleValidator vtor( min, max, decimals, 0, 0 );
@@ -357,12 +357,12 @@ double getDoubleFromUser( const TQString& caption, const TQString& label, double
#if KDE_IS_VERSION( 3, 1, 90 )
TQString input = KInputDialog::getText(
caption, label, KGlobal::locale()->formatNumber( value, decimals ),
- ok, tqparent, "getDoubleFromUserDialog", &vtor );
+ ok, parent, "getDoubleFromUserDialog", &vtor );
#else
TQString input =
KLineEditDlg::getText( caption, label,
KGlobal::locale()->formatNumber( value, decimals ),
- ok, tqparent, &vtor );
+ ok, parent, &vtor );
#endif
bool myok = true;
diff --git a/kig/misc/common.h b/kig/misc/common.h
index d4f388fb..d1969df3 100644
--- a/kig/misc/common.h
+++ b/kig/misc/common.h
@@ -52,7 +52,7 @@ extern const double double_inf;
*/
double getDoubleFromUser( const TQString& caption, const TQString& label, double value,
- TQWidget* tqparent, bool* ok, double min, double max, int decimals );
+ TQWidget* parent, bool* ok, double min, double max, int decimals );
/**
* Simple class representing a line. Used by various functions in Kig.
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index 4876e175..f19f2d82 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -81,13 +81,13 @@ void ConstructibleAction::act( KigPart& d )
KigGUIAction::KigGUIAction( GUIAction* act,
KigPart& doc,
- TQObject* tqparent )
+ TQObject* parent )
: KAction( act->descriptiveName(),
doc.instance()->iconLoader()->loadIcon(
act->iconFileName(), KIcon::Toolbar, 0, KIcon::DefaultState, 0L, true ),
act->shortcut(),
0, 0, // no slot connection
- tqparent, act->actionName() ),
+ parent, act->actionName() ),
mact( act ),
mdoc( doc )
{
diff --git a/kig/misc/guiaction.h b/kig/misc/guiaction.h
index e9595605..724ce6cf 100644
--- a/kig/misc/guiaction.h
+++ b/kig/misc/guiaction.h
@@ -41,7 +41,7 @@ class KigGUIAction
public:
KigGUIAction( GUIAction* act,
KigPart& doc,
- TQObject* tqparent );
+ TQObject* parent );
void slotActivated();
GUIAction* guiAction();
diff --git a/kig/misc/kigfiledialog.cc b/kig/misc/kigfiledialog.cc
index cdfe2196..2c211690 100644
--- a/kig/misc/kigfiledialog.cc
+++ b/kig/misc/kigfiledialog.cc
@@ -25,8 +25,8 @@
#include <kmessagebox.h>
KigFileDialog::KigFileDialog( const TQString& startDir, const TQString& filter,
- const TQString& caption, TQWidget* tqparent )
- : KFileDialog( startDir, filter, tqparent, "kigfiledialog", true ),
+ const TQString& caption, TQWidget* parent )
+ : KFileDialog( startDir, filter, parent, "kigfiledialog", true ),
mow( 0L )
{
setCaption( caption );
diff --git a/kig/misc/kigfiledialog.h b/kig/misc/kigfiledialog.h
index 5fb65949..8a299bf5 100644
--- a/kig/misc/kigfiledialog.h
+++ b/kig/misc/kigfiledialog.h
@@ -46,17 +46,17 @@ public:
* documentation of KFileDialog for more help about this
* \param filter the filter for the file dialog
* \param caption the caption of this file dialog
- * \param tqparent the tqparent for this file dialog
+ * \param parent the parent for this file dialog
*/
KigFileDialog( const TQString& startDir, const TQString& filter,
- const TQString& caption, TQWidget *tqparent );
+ const TQString& caption, TQWidget *parent );
/**
* Use this to set the widget containing the options of eg an export filter.
* The option widget will be popped up in a dialog right after the user
* presses OK and before the dialog is closed.
*
- * You can construct the option widget with no tqparent, as it will be
+ * You can construct the option widget with no parent, as it will be
* reparented.
*
* \param w the option widget
diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc
index de8f691d..99e635b2 100644
--- a/kig/misc/kiginputdialog.cc
+++ b/kig/misc/kiginputdialog.cc
@@ -65,8 +65,8 @@ KigInputDialogPrivate::KigInputDialogPrivate()
}
KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
- TQWidget* tqparent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 )
- : KDialogBase( tqparent, "kigdialog", true, caption, Ok|Cancel, Cancel, true ),
+ TQWidget* parent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 )
+ : KDialogBase( parent, "kigdialog", true, caption, Ok|Cancel, Cancel, true ),
d( new KigInputDialogPrivate() )
{
d->m_coord1 = c1 ? Coordinate( *c1 ) : Coordinate::invalidCoord();
@@ -121,8 +121,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
enableButtonOK( ok );
}
-KigInputDialog::KigInputDialog( TQWidget* tqparent, const Goniometry& g )
- : KDialogBase( tqparent, "kigdialog", true, i18n( "Set Angle Size" ), Ok|Cancel, Cancel, true ),
+KigInputDialog::KigInputDialog( TQWidget* parent, const Goniometry& g )
+ : KDialogBase( parent, "kigdialog", true, i18n( "Set Angle Size" ), Ok|Cancel, Cancel, true ),
d( new KigInputDialogPrivate() )
{
d->m_gonio = g;
@@ -247,16 +247,16 @@ Goniometry KigInputDialog::goniometry() const
}
void KigInputDialog::getCoordinate( const TQString& caption, const TQString& label,
- TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue )
+ TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue )
{
- getTwoCoordinates( caption, label, tqparent, ok, doc, cvalue, 0 );
+ getTwoCoordinates( caption, label, parent, ok, doc, cvalue, 0 );
}
void KigInputDialog::getTwoCoordinates( const TQString& caption, const TQString& label,
- TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue,
+ TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue,
Coordinate* cvalue2 )
{
- KigInputDialog dlg( caption, label, tqparent, doc, cvalue, cvalue2 );
+ KigInputDialog dlg( caption, label, parent, doc, cvalue, cvalue2 );
*ok = ( dlg.exec() == Accepted );
@@ -273,9 +273,9 @@ void KigInputDialog::getTwoCoordinates( const TQString& caption, const TQString&
}
-Goniometry KigInputDialog::getAngle( TQWidget* tqparent, bool* ok, const Goniometry& g )
+Goniometry KigInputDialog::getAngle( TQWidget* parent, bool* ok, const Goniometry& g )
{
- KigInputDialog dlg( tqparent, g );
+ KigInputDialog dlg( parent, g );
*ok = ( dlg.exec() == Accepted );
diff --git a/kig/misc/kiginputdialog.h b/kig/misc/kiginputdialog.h
index 60f2ba54..f11d2665 100644
--- a/kig/misc/kiginputdialog.h
+++ b/kig/misc/kiginputdialog.h
@@ -46,9 +46,9 @@ Q_OBJECT
public:
private:
- KigInputDialog( const TQString& caption, const TQString& label, TQWidget* tqparent,
+ KigInputDialog( const TQString& caption, const TQString& label, TQWidget* parent,
const KigDocument& doc, Coordinate* c1, Coordinate* c2 );
- KigInputDialog( TQWidget* tqparent, const Goniometry& g );
+ KigInputDialog( TQWidget* parent, const Goniometry& g );
virtual void keyPressEvent( TQKeyEvent* e );
@@ -70,7 +70,7 @@ public:
*
* \param caption caption of the dialog
* \param label text of the label of the dialog
- * \param tqparent tqparent of the dialog widget
+ * \param parent parent of the dialog widget
* \param ok it will be set to true if the user pressed Ok after inserting a
* well-formatted Coordinate
* \param doc the actual Kig document
@@ -80,14 +80,14 @@ public:
* displayed as initial value of the correspondenting text edit
*/
static void getCoordinate( const TQString& caption, const TQString& label,
- TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue );
+ TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue );
/**
* Static convenience function to get two Coordinates at once from the user.
*
* \param caption caption of the dialog
* \param label text of the label of the dialog
- * \param tqparent tqparent of the dialog widget
+ * \param parent parent of the dialog widget
* \param ok it will be set to true if the user pressed Ok after inserting
* well-formatted Coordinates
* \param doc the actual Kig document
@@ -103,14 +103,14 @@ public:
* the text edit representing the second Coordinate.
*/
static void getTwoCoordinates( const TQString& caption, const TQString& label,
- TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue,
+ TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue,
Coordinate* cvalue2 );
/**
* Static convenience function to get an angle incapsulated in a Goniometry
* class.
*
- * \param tqparent tqparent of the dialog widget
+ * \param parent parent of the dialog widget
* \param ok it will be set to true if the user pressed Ok after inserting a
* well-formatted angle
* \param g the Goniometry class containing the original angle we are going
@@ -118,7 +118,7 @@ public:
*
* \return a Goniometry class containing the new angle
*/
- static Goniometry getAngle( TQWidget* tqparent, bool* ok, const Goniometry& g );
+ static Goniometry getAngle( TQWidget* parent, bool* ok, const Goniometry& g );
};
#endif
diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc
index 9b5a09a8..e72a3c19 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cc
@@ -186,21 +186,21 @@ class FetchPropertyNode
: public ObjectHierarchy::Node
{
mutable int mpropid;
- int mtqparent;
+ int mparent;
const TQCString mname;
public:
- // propid is a cache of the location of name in the tqparent's
+ // propid is a cache of the location of name in the parent's
// propertiesInternalNames(), just as it is in PropertyObject. We
// don't want to ever save this value, since we cannot guarantee it
// remains consistent if we add properties some place..
- FetchPropertyNode( const int tqparent, const TQCString& name, const int propid = -1 )
- : mpropid( propid ), mtqparent( tqparent ), mname( name ) {}
+ FetchPropertyNode( const int parent, const TQCString& name, const int propid = -1 )
+ : mpropid( propid ), mparent( parent ), mname( name ) {}
~FetchPropertyNode();
Node* copy() const;
void checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const;
void checkArgumentsUsed( std::vector<bool>& usedstack ) const;
- int tqparent() const { return mtqparent; }
+ int parent() const { return mparent; }
const TQCString& propinternalname() const { return mname; }
int id() const;
@@ -215,17 +215,17 @@ FetchPropertyNode::~FetchPropertyNode()
void FetchPropertyNode::checkArgumentsUsed( std::vector<bool>& usedstack ) const
{
- usedstack[mtqparent] = true;
+ usedstack[mparent] = true;
}
void FetchPropertyNode::checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const
{
- dependsstack[loc] = dependsstack[mtqparent];
+ dependsstack[loc] = dependsstack[mparent];
}
ObjectHierarchy::Node* FetchPropertyNode::copy() const
{
- return new FetchPropertyNode( mtqparent, mname, mpropid );
+ return new FetchPropertyNode( mparent, mname, mpropid );
}
int FetchPropertyNode::id() const
@@ -236,10 +236,10 @@ int FetchPropertyNode::id() const
void FetchPropertyNode::apply( std::vector<const ObjectImp*>& stack,
int loc, const KigDocument& d ) const
{
- assert( stack[mtqparent] );
- if ( mpropid == -1 ) mpropid = stack[mtqparent]->propertiesInternalNames().findIndex( mname );
+ assert( stack[mparent] );
+ if ( mpropid == -1 ) mpropid = stack[mparent]->propertiesInternalNames().findIndex( mname );
if ( mpropid != -1 )
- stack[loc] = stack[mtqparent]->property( mpropid, d );
+ stack[loc] = stack[mparent]->property( mpropid, d );
else
stack[loc] = new InvalidImp();
}
@@ -247,9 +247,9 @@ void FetchPropertyNode::apply( std::vector<const ObjectImp*>& stack,
void FetchPropertyNode::apply( std::vector<ObjectCalcer*>& stack, int loc ) const
{
if ( mpropid == -1 )
- mpropid = stack[mtqparent]->imp()->propertiesInternalNames().findIndex( mname );
+ mpropid = stack[mparent]->imp()->propertiesInternalNames().findIndex( mname );
assert( mpropid != -1 );
- stack[loc] = new ObjectPropertyCalcer( stack[mtqparent], mpropid );
+ stack[loc] = new ObjectPropertyCalcer( stack[mparent], mpropid );
}
std::vector<ObjectImp*> ObjectHierarchy::calc( const Args& a, const KigDocument& doc ) const
@@ -408,7 +408,7 @@ ObjectHierarchy::ObjectHierarchy( const std::vector<ObjectCalcer*>& from, const
init( from, to );
}
-void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) const
+void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) const
{
int id = 1;
for ( uint i = 0; i < mnumberofargs; ++i )
@@ -424,7 +424,7 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co
// TQDomElement ss = doc.createElement( "SelectStatement" );
// ss.appendChild( doc.createTextNode( TQString::tqfromLatin1(mselectstatements[i].c_str() ) ) );
// e.appendChild( ss );
- tqparent.appendChild( e );
+ parent.appendChild( e );
}
for ( uint i = 0; i < mnodes.size(); ++i )
@@ -440,9 +440,9 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co
e.setAttribute( "type", TQString::tqfromLatin1( node->type()->fullName() ) );
for ( uint i = 0; i < node->parents().size(); ++i )
{
- int tqparent = node->parents()[i] + 1;
+ int parent = node->parents()[i] + 1;
TQDomElement arge = doc.createElement( "arg" );
- arge.appendChild( doc.createTextNode( TQString::number( tqparent ) ) );
+ arge.appendChild( doc.createTextNode( TQString::number( parent ) ) );
e.appendChild( arge );
};
}
@@ -452,7 +452,7 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co
e.setAttribute( "action", "fetch-property" );
e.setAttribute( TQString("property"), TQString(node->propinternalname()) );
TQDomElement arge = doc.createElement( "arg" );
- arge.appendChild( doc.createTextNode( TQString::number( node->tqparent() + 1 ) ) );
+ arge.appendChild( doc.createTextNode( TQString::number( node->parent() + 1 ) ) );
e.appendChild( arge );
}
else
@@ -464,7 +464,7 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co
e.setAttribute( "type", type );
};
- tqparent.appendChild( e );
+ parent.appendChild( e );
};
}
@@ -473,7 +473,7 @@ ObjectHierarchy::ObjectHierarchy()
{
}
-ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& tqparent, TQString& error )
+ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& parent, TQString& error )
{
#define KIG_GENERIC_PARSE_ERROR \
{ \
@@ -486,7 +486,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
bool ok = true;
TQString tmp;
- TQDomElement e = tqparent.firstChild().toElement();
+ TQDomElement e = parent.firstChild().toElement();
for (; !e.isNull(); e = e.nextSibling().toElement() )
{
if ( e.tagName() != "input" ) break;
@@ -565,9 +565,9 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
// FetchPropertyNode
TQCString propname = e.attribute( "property" ).latin1();
TQDomElement arge = e.firstChild().toElement();
- int tqparent = arge.text().toInt( &ok );
+ int parent = arge.text().toInt( &ok );
if ( !ok ) KIG_GENERIC_PARSE_ERROR;
- newnode = new FetchPropertyNode( tqparent - 1, propname );
+ newnode = new FetchPropertyNode( parent - 1, propname );
}
else
{
@@ -723,12 +723,12 @@ int ObjectHierarchy::storeObject( const ObjectCalcer* o, const std::vector<Objec
}
else if ( (uint) pl[i] < mnumberofargs )
{
- ObjectCalcer* tqparent = o->parents()[i];
+ ObjectCalcer* parent = o->parents()[i];
std::vector<ObjectCalcer*> opl = o->parents();
margrequirements[pl[i]] =
lowermost( margrequirements[pl[i]],
- o->impRequirement( tqparent, opl ) );
+ o->impRequirement( parent, opl ) );
musetexts[pl[i]] = margrequirements[pl[i]]->selectStatement();
};
};
@@ -737,12 +737,12 @@ int ObjectHierarchy::storeObject( const ObjectCalcer* o, const std::vector<Objec
else if ( dynamic_cast<const ObjectPropertyCalcer*>( o ) )
{
assert( pl.size() == 1 );
- int tqparent = pl.front();
+ int parent = pl.front();
ObjectCalcer* op = po.front();
assert( op );
uint propid = static_cast<const ObjectPropertyCalcer*>( o )->propId();
assert( propid < op->imp()->propertiesInternalNames().size() );
- mnodes.push_back( new FetchPropertyNode( tqparent, op->imp()->propertiesInternalNames()[propid], propid ) );
+ mnodes.push_back( new FetchPropertyNode( parent, op->imp()->propertiesInternalNames()[propid], propid ) );
}
else
assert( false );
diff --git a/kig/misc/object_hierarchy.h b/kig/misc/object_hierarchy.h
index 35e7cbef..5997015c 100644
--- a/kig/misc/object_hierarchy.h
+++ b/kig/misc/object_hierarchy.h
@@ -73,16 +73,16 @@ public:
std::vector<ObjectImp*> calc( const Args& a, const KigDocument& doc ) const;
/**
- * saves the ObjectHierarchy data in tqchildren xml tags of \p tqparent ..
+ * saves the ObjectHierarchy data in tqchildren xml tags of \p parent ..
*/
- void serialize( TQDomElement& tqparent, TQDomDocument& doc ) const;
+ void serialize( TQDomElement& parent, TQDomDocument& doc ) const;
/**
- * Deserialize the ObjectHierarchy data from the xml element \p tqparent ..
+ * Deserialize the ObjectHierarchy data from the xml element \p parent ..
* Since this operation can fail for some reasons, we provide it as a
* static to return 0 in case of error.
*/
- static ObjectHierarchy* buildSafeObjectHierarchy( const TQDomElement& tqparent, TQString& error );
-// ObjectHierarchy( const TQDomElement& tqparent );
+ static ObjectHierarchy* buildSafeObjectHierarchy( const TQDomElement& parent, TQString& error );
+// ObjectHierarchy( const TQDomElement& parent );
/**
* build a set of objects that interdepend according to this
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 18:19:44 +0000