diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 04766b207afba7961d4d802313e426f5a2fbef63 (patch) | |
tree | c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /kformula | |
parent | b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff) | |
download | koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kformula')
-rw-r--r-- | kformula/DESIGN | 16 | ||||
-rw-r--r-- | kformula/formulastring.cc | 4 | ||||
-rw-r--r-- | kformula/formulastring.h | 2 | ||||
-rw-r--r-- | kformula/kfconfig.cc | 8 | ||||
-rw-r--r-- | kformula/kfconfig.h | 2 | ||||
-rw-r--r-- | kformula/kformula_doc.cc | 12 | ||||
-rw-r--r-- | kformula/kformula_doc.h | 8 | ||||
-rw-r--r-- | kformula/kformula_factory.cc | 8 | ||||
-rw-r--r-- | kformula/kformula_factory.h | 4 | ||||
-rw-r--r-- | kformula/kformulawidget.cc | 4 | ||||
-rw-r--r-- | kformula/kformulawidget.h | 2 |
11 files changed, 35 insertions, 35 deletions
diff --git a/kformula/DESIGN b/kformula/DESIGN index d457695f..0e828043 100644 --- a/kformula/DESIGN +++ b/kformula/DESIGN @@ -20,16 +20,16 @@ Responsebilities (This goes for every derived element and therefore for each one.) - knows its tqchildren. Actually BasicElement doesn't have any. But it - already defines that tqchildren must be known by their tqparent. + already defines that tqchildren must be known by their parent. - knows its bounding rectangle (its size.) The tqchildren are included in this rect. (Only width and height are needed. Positions are - handled by the tqparent) + handled by the parent) //- knows its middle line. (for tqalignment) - knows it's zero point for midline (vertical tqalignment) and keep open the possibility of negative positions (out of bounding rect) - draws itself (given a painter); tqchildren are drawn, too - knows all positions where the cursor is allowed to be. (see below) -- knows its tqparent; The topmost element has no tqparent; there is a +- knows its parent; The topmost element has no parent; there is a implicit garantie that the topmost element is always a SequenceElement. - can save and load itself. different formates. (see below) @@ -63,11 +63,11 @@ between parenthesis" i.e. as content child of a delimiterelement) FormulaElement from SequenceElement -------------- -The only element those tqparent is null. The root of the element object +The only element those parent is null. The root of the element object tree. This is the element that is created by the KFormulaDoc and that knows -about it. As every other element knows its tqparent and therefore the +about it. As every other element knows its parent and therefore the FormulaElement we get a chance to pass messages to the outside world. @@ -130,7 +130,7 @@ GeometryElement from BasicElement --------------- One child. -Draw it at a fixed position relative to tqparent or absolute. +Draw it at a fixed position relative to parent or absolute. This is to do dirty things. This element must not be used, kformula will provide you everything @@ -192,9 +192,9 @@ before, between and after its tqchildren, too. - Each element's tqchildren are ordered. If the cursor leaves one child the next child it. The direction depends on the key that moved the -cursor. If there is child left the cursor is passed to the tqparent. +cursor. If there is child left the cursor is passed to the parent. -- If the cursor comes from our tqparent the first or the last child gets +- If the cursor comes from our parent the first or the last child gets it. Depending on the direction in which the cursor moved. Please note that because each element knows its own cursor positions diff --git a/kformula/formulastring.cc b/kformula/formulastring.cc index 5d2c5b8f..b22c8576 100644 --- a/kformula/formulastring.cc +++ b/kformula/formulastring.cc @@ -35,8 +35,8 @@ #include "kformula_view.h" -FormulaString::FormulaString( KFormulaPartView* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ), view( tqparent ) +FormulaString::FormulaString( KFormulaPartView* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ), view( parent ) { if ( !name ) setName( "FormulaString" ); diff --git a/kformula/formulastring.h b/kformula/formulastring.h index 2ee9b5f3..027228eb 100644 --- a/kformula/formulastring.h +++ b/kformula/formulastring.h @@ -38,7 +38,7 @@ class FormulaString : public TQDialog TQ_OBJECT public: - FormulaString( KFormulaPartView* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + FormulaString( KFormulaPartView* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~FormulaString(); TQTextEdit* textWidget; diff --git a/kformula/kfconfig.cc b/kformula/kfconfig.cc index 2e99e67a..e461223c 100644 --- a/kformula/kfconfig.cc +++ b/kformula/kfconfig.cc @@ -29,20 +29,20 @@ #include "kformula_view.h" -KFConfig::KFConfig( KFormulaPartView* tqparent ) +KFConfig::KFConfig( KFormulaPartView* parent ) : KDialogBase( KDialogBase::IconList, i18n( "Configure KFormula" ), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Default, - KDialogBase::Ok, tqparent ) + KDialogBase::Ok, parent ) { //kdDebug( 40000 ) << "KFConfig::KFConfig" << endl; TQVBox* page1 = addVBoxPage( i18n( "Formula" ), i18n( "Formula Settings" ), BarIcon( "kformula", KIcon::SizeMedium ) ); - _page = new KFormula::ConfigurePage( tqparent->document()->getDocument(), this, + _page = new KFormula::ConfigurePage( parent->document()->getDocument(), this, KFormulaFactory::global()->config(), page1 ); // TQVBox* page2 = addVBoxPage( i18n( "Math Fonts" ), i18n( "Math Fonts Settings" ), // BarIcon( "kformula", KIcon::SizeMedium ) ); -// _mathFontPage = new KFormula::MathFontsConfigurePage( tqparent->document()->getDocument(), this, +// _mathFontPage = new KFormula::MathFontsConfigurePage( parent->document()->getDocument(), this, // KFormulaFactory::global()->config(), // page2 ); diff --git a/kformula/kfconfig.h b/kformula/kfconfig.h index cc23c371..6d2258b3 100644 --- a/kformula/kfconfig.h +++ b/kformula/kfconfig.h @@ -36,7 +36,7 @@ class KFConfig : public KDialogBase Q_OBJECT TQ_OBJECT public: - KFConfig( KFormulaPartView* tqparent ); + KFConfig( KFormulaPartView* parent ); public slots: void slotApply(); diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc index 98c25b46..c5d1326c 100644 --- a/kformula/kformula_doc.cc +++ b/kformula/kformula_doc.cc @@ -55,8 +55,8 @@ #include <kformuladocument.h> -KFormulaDoc::KFormulaDoc(TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode) - : KoDocument(parentWidget, widgetName, tqparent, name, singleViewMode) +KFormulaDoc::KFormulaDoc(TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode) + : KoDocument(parentWidget, widgetName, parent, name, singleViewMode) { setInstance(KFormulaFactory::global(), false); //kdDebug(39001) << "General Settings" << endl; @@ -183,7 +183,7 @@ bool KFormulaDoc::saveNativeFormat( const TQString & file ) else return false; } - // If it's not MathML, let the tqparent handle it + // If it's not MathML, let the parent handle it return KoDocument::saveNativeFormat( file ); } @@ -212,12 +212,12 @@ bool KFormulaDoc::initDoc(InitDocFlags /*flags*/, TQWidget* /*parentWidget*/) return TRUE; } -void KFormulaDoc::showStartUpWidget(KoMainWindow* tqparent, bool /*alwaysShow*/) +void KFormulaDoc::showStartUpWidget(KoMainWindow* parent, bool /*alwaysShow*/) { - tqparent->setRootDocument( this ); + parent->setRootDocument( this ); } -bool KFormulaDoc::showEmbedInitDialog(TQWidget* /*tqparent*/) +bool KFormulaDoc::showEmbedInitDialog(TQWidget* /*parent*/) { return true; } diff --git a/kformula/kformula_doc.h b/kformula/kformula_doc.h index 81ba62a7..d01ce2a3 100644 --- a/kformula/kformula_doc.h +++ b/kformula/kformula_doc.h @@ -55,7 +55,7 @@ public: KFormulaDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, - TQObject* tqparent = 0, + TQObject* parent = 0, const char* name = 0, bool singleViewMode = false); ~KFormulaDoc(); @@ -63,8 +63,8 @@ public: virtual void paintContent( TQPainter &painter, const TQRect &rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 ); virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0); - virtual void showStartUpWidget(KoMainWindow* tqparent, bool alwaysShow = false); - virtual bool showEmbedInitDialog(TQWidget* tqparent); + virtual void showStartUpWidget(KoMainWindow* parent, bool alwaysShow = false); + virtual bool showEmbedInitDialog(TQWidget* parent); virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* ); virtual bool loadXML(TQIODevice *, const TQDomDocument& doc); virtual TQDomDocument saveXML(); @@ -88,7 +88,7 @@ protected slots: protected: virtual TQString configFile() const; - virtual KoView* createViewInstance(TQWidget* tqparent, const char* name); + virtual KoView* createViewInstance(TQWidget* parent, const char* name); private: diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc index de1a17b0..e8d3a918 100644 --- a/kformula/kformula_factory.cc +++ b/kformula/kformula_factory.cc @@ -25,8 +25,8 @@ KAboutData* KFormulaFactory::aboutData() } -KFormulaFactory::KFormulaFactory( TQObject* tqparent, const char* name ) - : KoFactory( tqparent, name ) +KFormulaFactory::KFormulaFactory( TQObject* parent, const char* name ) + : KoFactory( parent, name ) { // Create our instance, so that it becomes KGlobal::instance if the // main app is KFormula. @@ -41,11 +41,11 @@ KFormulaFactory::~KFormulaFactory() s_global = 0L; } -KParts::Part* KFormulaFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* KFormulaFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - KFormulaDoc *doc = new KFormulaDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); + KFormulaDoc *doc = new KFormulaDoc( parentWidget, widgetName, parent, name, !bWantKoDocument ); if ( !bWantKoDocument ) doc->setReadWrite( false ); diff --git a/kformula/kformula_factory.h b/kformula/kformula_factory.h index 5e7979e0..6cece441 100644 --- a/kformula/kformula_factory.h +++ b/kformula/kformula_factory.h @@ -13,10 +13,10 @@ class KFormulaFactory : public KoFactory Q_OBJECT TQ_OBJECT public: - KFormulaFactory( TQObject* tqparent = 0, const char* name = 0 ); + KFormulaFactory( TQObject* parent = 0, const char* name = 0 ); ~KFormulaFactory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kformula/kformulawidget.cc b/kformula/kformulawidget.cc index b6a9145b..dc259320 100644 --- a/kformula/kformulawidget.cc +++ b/kformula/kformulawidget.cc @@ -34,8 +34,8 @@ KFormulaWidget::KFormulaWidget(KFormula::Container* doc, - TQWidget* tqparent, const char* name, WFlags f) - : TQWidget(tqparent, name, f | WRepaintNoErase | WResizeNoErase), + TQWidget* parent, const char* name, WFlags f) + : TQWidget(parent, name, f | WRepaintNoErase | WResizeNoErase), formulaView(doc) { connect(doc, TQT_SIGNAL(formulaChanged(int, int)), diff --git a/kformula/kformulawidget.h b/kformula/kformulawidget.h index f49757b7..43bb701f 100644 --- a/kformula/kformulawidget.h +++ b/kformula/kformulawidget.h @@ -46,7 +46,7 @@ class KFormulaWidget : public TQWidget { TQ_OBJECT public: - KFormulaWidget(KFormula::Container*, TQWidget* tqparent=0, const char* name=0, WFlags f=0); + KFormulaWidget(KFormula::Container*, TQWidget* parent=0, const char* name=0, WFlags f=0); ~KFormulaWidget(); |