summaryrefslogtreecommitdiffstats
path: root/kig/modes
diff options
context:
space:
mode:
Diffstat (limited to 'kig/modes')
-rw-r--r--kig/modes/edittype.cc4
-rw-r--r--kig/modes/edittype.h2
-rw-r--r--kig/modes/label.cc40
-rw-r--r--kig/modes/label.h6
-rw-r--r--kig/modes/linkslabel.cpp4
-rw-r--r--kig/modes/linkslabel.h2
-rw-r--r--kig/modes/macrowizard.cc4
-rw-r--r--kig/modes/macrowizard.h2
-rw-r--r--kig/modes/popup.cc10
-rw-r--r--kig/modes/textlabelwizard.cc4
-rw-r--r--kig/modes/textlabelwizard.h2
-rw-r--r--kig/modes/typesdialog.cpp4
-rw-r--r--kig/modes/typesdialog.h2
13 files changed, 43 insertions, 43 deletions
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc
index e9776204..d2f25a47 100644
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cc
@@ -31,8 +31,8 @@
#include <kpushbutton.h>
#include <kstdguiitem.h>
-EditType::EditType( TQWidget* tqparent, TQString name, TQString desc, TQString icon )
- : EditTypeBase( tqparent, "edittype", true ), mname( name ), mdesc( desc ), micon( icon )
+EditType::EditType( TQWidget* parent, TQString name, TQString desc, TQString icon )
+ : EditTypeBase( parent, "edittype", true ), mname( name ), mdesc( desc ), micon( icon )
{
// improving GUI look'n'feel...
buttonHelp->setGuiItem( KStdGuiItem::help() );
diff --git a/kig/modes/edittype.h b/kig/modes/edittype.h
index ac578808..aeb874ad 100644
--- a/kig/modes/edittype.h
+++ b/kig/modes/edittype.h
@@ -34,7 +34,7 @@ class EditType : public EditTypeBase
TQString mdesc;
TQString micon;
public:
- EditType( TQWidget* tqparent, TQString name = TQString(), TQString desc = TQString(), TQString icon = TQString() );
+ EditType( TQWidget* parent, TQString name = TQString(), TQString desc = TQString(), TQString icon = TQString() );
~EditType();
const TQString name() const;
const TQString description() const;
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index 298e75d0..48f729bf 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -55,8 +55,8 @@ public:
TQPoint plc;
// the currently selected coordinate
Coordinate mcoord;
- // the possible tqparent object that defines the location of the label..
- ObjectCalcer* locationtqparent;
+ // the possible parent object that defines the location of the label..
+ ObjectCalcer* locationparent;
// the text is only kept in the text input widget, not here
// TQString mtext;
@@ -65,7 +65,7 @@ public:
// to them in the args object, and keep a pointer to them ( or 0 )
// in the correct order in args ( separately, because we can't use
// the order of the parents of a ReferenceObject, and certainly
- // can't give 0 as a tqparent..
+ // can't give 0 as a parent..
argvect args;
// if we're ReallySelectingArgs, then this var points to the arg
@@ -90,7 +90,7 @@ TextLabelModeBase::~TextLabelModeBase()
TextLabelModeBase::TextLabelModeBase( KigPart& doc )
: KigMode( doc ), d( new Private )
{
- d->locationtqparent = 0;
+ d->locationparent = 0;
d->lpc = 0;
d->mwawd = SelectingLocation;
d->wiz = new TextLabelWizard( doc.widget(), this );
@@ -212,7 +212,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
{
std::vector<ObjectHolder*> os = mdoc.document().whatAmIOn( w->fromScreen( e->pos() ), *w );
bool attachable = false;
- d->locationtqparent = 0;
+ d->locationparent = 0;
for ( std::vector<ObjectHolder*>::iterator i = os.begin(); i != os.end(); ++i )
{
if( (*i)->imp()->attachPoint().valid() ||
@@ -220,7 +220,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
(*i)->imp()->inherits( CurveImp::stype() ) )
{
attachable = true;
- d->locationtqparent = (*i)->calcer();
+ d->locationparent = (*i)->calcer();
break;
};
};
@@ -228,7 +228,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
if ( attachable )
{
w->setCursor( KCursor::handCursor() );
- TQString s = d->locationtqparent->imp()->type()->attachToThisStatement();
+ TQString s = d->locationparent->imp()->type()->attachToThisStatement();
mdoc.emitStatusBarText( s );
KigPainter p( w->screenInfo(), TQT_TQPAINTDEVICE(&w->curPix), mdoc.document() );
@@ -296,7 +296,7 @@ void TextLabelModeBase::finishPressed()
"value for. Please remove them or select enough arguments." ) );
else
{
- finish( d->mcoord, s, d->args, needframe, d->locationtqparent );
+ finish( d->mcoord, s, d->args, needframe, d->locationparent );
killMode();
};
}
@@ -452,7 +452,7 @@ TextLabelConstructionMode::~TextLabelConstructionMode()
void TextLabelConstructionMode::finish(
const Coordinate& coord, const TQString& s,
const argvect& props, bool needframe,
- ObjectCalcer* locationtqparent )
+ ObjectCalcer* locationparent )
{
std::vector<ObjectCalcer*> args;
for ( argvect::const_iterator i = props.begin();
@@ -460,8 +460,8 @@ void TextLabelConstructionMode::finish(
args.push_back( i->get() );
ObjectHolder* label = 0;
- if ( locationtqparent )
- label = ObjectFactory::instance()->attachedLabel( s, locationtqparent, coord, needframe, args, mdoc.document() );
+ if ( locationparent )
+ label = ObjectFactory::instance()->attachedLabel( s, locationparent, coord, needframe, args, mdoc.document() );
else
label = ObjectFactory::instance()->label( s, coord, needframe, args, mdoc.document() );
mdoc.addObject( label );
@@ -507,7 +507,7 @@ TextLabelRedefineMode::~TextLabelRedefineMode()
void TextLabelRedefineMode::finish(
const Coordinate& coord, const TQString& s,
const argvect& props, bool needframe,
- ObjectCalcer* locationtqparent )
+ ObjectCalcer* locationparent )
{
std::vector<ObjectCalcer*> parents = mlabel->parents();
assert( parents.size() >= 3 );
@@ -552,19 +552,19 @@ void TextLabelRedefineMode::finish(
* take advantage of the method "getAttachPoint" that should
* do all the work; it is also used when creating a new label
*/
- np[1] = ObjectFactory::instance()->getAttachPoint( locationtqparent, coord, mdoc.document() );
+ np[1] = ObjectFactory::instance()->getAttachPoint( locationparent, coord, mdoc.document() );
/* this is the old code, just in case... */
-// if ( locationtqparent && locationtqparent->imp()->inherits( CurveImp::stype() ) )
+// if ( locationparent && locationparent->imp()->inherits( CurveImp::stype() ) )
// {
-// double param = static_cast<const CurveImp*>( locationtqparent->imp() )->getParam( coord, mdoc.document() );
-// np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationtqparent, param );
+// double param = static_cast<const CurveImp*>( locationparent->imp() )->getParam( coord, mdoc.document() );
+// np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationparent, param );
// np[1]->calc( mdoc.document() );
// }
-// else if ( locationtqparent )
+// else if ( locationparent )
// {
-// assert( locationtqparent->imp()->inherits( PointImp::stype() ) );
-// np[1] = locationtqparent;
+// assert( locationparent->imp()->inherits( PointImp::stype() ) );
+// np[1] = locationparent;
// }
// else
// np[1] = new ObjectConstCalcer( new PointImp( coord ) );
@@ -585,5 +585,5 @@ void TextLabelModeBase::setFrame( bool f )
void TextLabelModeBase::setLocationParent( ObjectCalcer* o )
{
- d->locationtqparent = o;
+ d->locationparent = o;
}
diff --git a/kig/modes/label.h b/kig/modes/label.h
index 7d8f842a..b016d691 100644
--- a/kig/modes/label.h
+++ b/kig/modes/label.h
@@ -72,7 +72,7 @@ protected:
virtual void finish( const Coordinate& c, const TQString& s,
const argvect& props, bool needframe,
- ObjectCalcer* locationtqparent ) = 0;
+ ObjectCalcer* locationparent ) = 0;
private:
// the KigMode interface..
@@ -111,7 +111,7 @@ public:
void finish( const Coordinate& coord, const TQString& s,
const argvect& props, bool needframe,
- ObjectCalcer* locationtqparent );
+ ObjectCalcer* locationparent );
};
class TextLabelRedefineMode
@@ -120,7 +120,7 @@ class TextLabelRedefineMode
ObjectTypeCalcer* mlabel;
void finish( const Coordinate& coord, const TQString& s,
const argvect& props, bool needframe,
- ObjectCalcer* locationtqparent );
+ ObjectCalcer* locationparent );
public:
TextLabelRedefineMode( KigPart& d, ObjectTypeCalcer* label );
~TextLabelRedefineMode();
diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp
index 8d711d65..693c165a 100644
--- a/kig/modes/linkslabel.cpp
+++ b/kig/modes/linkslabel.cpp
@@ -38,8 +38,8 @@ public:
std::vector<KURLLabel*> urllabels;
};
-LinksLabel::LinksLabel( TQWidget* tqparent, const char* name )
- : TQWidget( tqparent, name )
+LinksLabel::LinksLabel( TQWidget* parent, const char* name )
+ : TQWidget( parent, name )
{
p = new Private;
p->tqlayout = new TQHBoxLayout( this );
diff --git a/kig/modes/linkslabel.h b/kig/modes/linkslabel.h
index 8ed8b04a..e2349361 100644
--- a/kig/modes/linkslabel.h
+++ b/kig/modes/linkslabel.h
@@ -33,7 +33,7 @@ class LinksLabel : public TQWidget
TQ_OBJECT
public:
- LinksLabel( TQWidget* tqparent = 0, const char* name = 0 );
+ LinksLabel( TQWidget* parent = 0, const char* name = 0 );
~LinksLabel();
class LinksLabelEditBuf
diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cc
index 4a240b74..1b25c803 100644
--- a/kig/modes/macrowizard.cc
+++ b/kig/modes/macrowizard.cc
@@ -24,8 +24,8 @@
#include <klineedit.h>
#include <kapplication.h>
-MacroWizard::MacroWizard( TQWidget* tqparent, DefineMacroMode* m )
- : MacroWizardBase( tqparent, "Define Macro Wizard", false ), mmode( m )
+MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m )
+ : MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m )
{
connect( KLineEdit2, TQT_SIGNAL( textChanged( const TQString& ) ),
this, TQT_SLOT( nameTextChanged( const TQString& ) ) );
diff --git a/kig/modes/macrowizard.h b/kig/modes/macrowizard.h
index b3b59c66..2680f5ce 100644
--- a/kig/modes/macrowizard.h
+++ b/kig/modes/macrowizard.h
@@ -27,7 +27,7 @@ class MacroWizard : public MacroWizardBase
Q_OBJECT
TQ_OBJECT
public:
- MacroWizard( TQWidget* tqparent, DefineMacroMode* m );
+ MacroWizard( TQWidget* parent, DefineMacroMode* m );
~MacroWizard();
void back();
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index 8a3d05e1..32280d62 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -871,7 +871,7 @@ void PropertiesActionsProvider::fillUpMenu( NormalModePopupObjects& popup,
add &= ! prop->inherits( BogusImp::stype() );
// we don't want to construct PointImp's coordinate property,
// since it would construct a point at the same place as its
- // tqparent..
+ // parent..
add &= ! ( o->imp()->inherits( PointImp::stype() ) &&
prop->inherits( PointImp::stype() ) );
}
@@ -909,11 +909,11 @@ bool PropertiesActionsProvider::executeAction(
}
int propid = mprops[menu-1][id];
assert( os.size() == 1 );
- ObjectHolder* tqparent = os[0];
+ ObjectHolder* parent = os[0];
if ( menu == NormalModePopupObjects::ShowMenu )
{
std::vector<ObjectCalcer*> args;
- args.push_back( new ObjectPropertyCalcer( tqparent->calcer(), propid ) );
+ args.push_back( new ObjectPropertyCalcer( parent->calcer(), propid ) );
args.back()->calc( doc.document() );
// TODO: recover the cursor position somehow... the following does not work
// in general...
@@ -924,14 +924,14 @@ bool PropertiesActionsProvider::executeAction(
// /////// Coordinate c = Coordinate::invalidCoord();
Coordinate c = w.fromScreen( popup.plc() );
ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
- TQString::tqfromLatin1( "%1" ), tqparent->calcer(), c,
+ TQString::tqfromLatin1( "%1" ), parent->calcer(), c,
false, args, doc.document() );
doc.addObject( label );
}
else
{
ObjectHolder* h = new ObjectHolder(
- new ObjectPropertyCalcer( tqparent->calcer(), propid ) );
+ new ObjectPropertyCalcer( parent->calcer(), propid ) );
h->calc( doc.document() );
doc.addObject( h );
};
diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc
index b79f4a5e..e35e707a 100644
--- a/kig/modes/textlabelwizard.cc
+++ b/kig/modes/textlabelwizard.cc
@@ -26,8 +26,8 @@
#include <tqlayout.h>
-TextLabelWizard::TextLabelWizard( TQWidget* tqparent, TextLabelModeBase* mode )
- : TextLabelWizardBase( tqparent, "TextLabelWizard", false ), mmode( mode )
+TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode )
+ : TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode )
{
connect( labelTextInput, TQT_SIGNAL( textChanged() ),
TQT_SLOT( textChanged() ) );
diff --git a/kig/modes/textlabelwizard.h b/kig/modes/textlabelwizard.h
index c6f0a7ca..5aec81a4 100644
--- a/kig/modes/textlabelwizard.h
+++ b/kig/modes/textlabelwizard.h
@@ -27,7 +27,7 @@ class TextLabelWizard : public TextLabelWizardBase
Q_OBJECT
TQ_OBJECT
public:
- TextLabelWizard( TQWidget* tqparent, TextLabelModeBase* mode );
+ TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode );
~TextLabelWizard();
void back();
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index 0371ca7f..97973857 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -58,8 +58,8 @@ MacroListElement::MacroListElement( KListView* lv, Macro* m )
{
}
-TypesDialog::TypesDialog( TQWidget* tqparent, KigPart& part )
- : TypesDialogBase( tqparent, "types_dialog", true ), mpart( part )
+TypesDialog::TypesDialog( TQWidget* parent, KigPart& part )
+ : TypesDialogBase( parent, "types_dialog", true ), mpart( part )
{
// improving GUI look'n'feel...
buttonHelp->setGuiItem( KStdGuiItem::help() );
diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h
index 8275b653..03eed111 100644
--- a/kig/modes/typesdialog.h
+++ b/kig/modes/typesdialog.h
@@ -46,7 +46,7 @@ class TypesDialog : public TypesDialogBase
const KIconLoader* il;
TQPopupMenu* popup;
public:
- TypesDialog( TQWidget* tqparent, KigPart& );
+ TypesDialog( TQWidget* parent, KigPart& );
~TypesDialog();
public slots: