diff options
Diffstat (limited to 'lib/kofficecore')
50 files changed, 216 insertions, 216 deletions
diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp index 8394f59a..41dfee8f 100644 --- a/lib/kofficecore/KoChild.cpp +++ b/lib/kofficecore/KoChild.cpp @@ -50,8 +50,8 @@ public: int m_contentsY; }; -KoChild::KoChild( TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ) +KoChild::KoChild( TQObject *parent, const char *name ) +: TQObject( parent, name ) { d = new KoChildPrivate; diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h index 0dbc74be..b7285deb 100644 --- a/lib/kofficecore/KoChild.h +++ b/lib/kofficecore/KoChild.h @@ -26,7 +26,7 @@ /** * KoChild is an abstract base class that represents the tqgeometry * associated with an embedded document. In general it handles its position - * relative to the embedded document's tqparent. + * relative to the embedded document's parent. * * In detail it handles size, matrix operations and can give you * a clip region. It can deal with scaling, rotation etc. because it @@ -56,7 +56,7 @@ public: enum Gadget { NoGadget, TopLeft, TopMid, TopRight, MidLeft, MidRight, BottomLeft, BottomMid, BottomRight, Move }; - KoChild( TQObject *tqparent = 0, const char *name = 0 ); + KoChild( TQObject *parent = 0, const char *name = 0 ); virtual ~KoChild(); /** @@ -69,7 +69,7 @@ public: * @return the rectangle that would be used to display this * child document if the child is not rotated or * subject to some other geometric transformation. - * The rectangle is in the coordinate system of the tqparent, + * The rectangle is in the coordinate system of the parent, * using unzoomed coordinates in points. * * @see #setGeometry @@ -78,7 +78,7 @@ public: /** * @return the region of this child part relative to the - * coordinate system of the tqparent. + * coordinate system of the parent. * The region is transformed with the passed * matrix. */ @@ -86,7 +86,7 @@ public: /** * @return the polygon which surrounds the child part. The points - * are in coordinates of the tqparent. + * are in coordinates of the parent. * The points are transformed with the * passed matrix. */ @@ -94,14 +94,14 @@ public: /** * Tests whether the part contains a certain point. The point is - * in the coordinate system of the tqparent. + * in the coordinate system of the parent. */ //virtual bool contains( const TQPoint& ) const; /** * @return the effective bounding rect after all transformations. * The coordinates of the rectangle are in the coordinate system - * of the tqparent. + * of the parent. */ TQRect boundingRect() const; diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index efddc96a..23376489 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -81,9 +81,9 @@ class KoTemplatesPanePrivate }; -KoTemplatesPane::KoTemplatesPane(TQWidget* tqparent, KInstance* instance, +KoTemplatesPane::KoTemplatesPane(TQWidget* parent, KInstance* instance, KoTemplateGroup *group, KoTemplate* /*defaultTemplate*/) - : KoDetailsPaneBase(tqparent, "TemplatesPane") + : KoDetailsPaneBase(parent, "TemplatesPane") { d = new KoTemplatesPanePrivate; d->m_instance = instance; @@ -268,8 +268,8 @@ class KoRecentDocumentsPanePrivate KInstance* m_instance; }; -KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* tqparent, KInstance* instance) - : KoDetailsPaneBase(tqparent, "RecentDocsPane") +KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instance) + : KoDetailsPaneBase(parent, "RecentDocsPane") { d = new KoRecentDocumentsPanePrivate; d->m_instance = instance; diff --git a/lib/kofficecore/KoDetailsPane.h b/lib/kofficecore/KoDetailsPane.h index bee6f14a..7264cd78 100644 --- a/lib/kofficecore/KoDetailsPane.h +++ b/lib/kofficecore/KoDetailsPane.h @@ -40,7 +40,7 @@ class KoTemplatesPanePrivate; /** * This widget is the right-side part of the template opening widget. - * The tqparent widget is initial widget in the document space of each KOffice component. + * The parent widget is initial widget in the document space of each KOffice component. * This widget shows a list of templates and can show their details or open it. */ class KoTemplatesPane : public KoDetailsPaneBase @@ -50,13 +50,13 @@ class KoTemplatesPane : public KoDetailsPaneBase public: /** * Constructor. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param instance the instance object for the app * @param group the group of templates this widget will show. * @param defaultTemplate pointer to the default template. Used to select a * template when none has been selected before. */ - KoTemplatesPane(TQWidget* tqparent, KInstance* instance, + KoTemplatesPane(TQWidget* parent, KInstance* instance, KoTemplateGroup* group, KoTemplate* defaultTemplate); ~KoTemplatesPane(); @@ -91,7 +91,7 @@ class KoTemplatesPane : public KoDetailsPaneBase /** * This widget is the recent doc part of the template opening widget. - * The tqparent widget is initial widget in the document space of each KOffice component. + * The parent widget is initial widget in the document space of each KOffice component. * This widget shows a list of recent documents and can show their details or open it. */ class KoRecentDocumentsPane : public KoDetailsPaneBase @@ -101,10 +101,10 @@ class KoRecentDocumentsPane : public KoDetailsPaneBase public: /** * Constructor. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param instance the instance object for the app */ - KoRecentDocumentsPane(TQWidget* tqparent, KInstance* instance); + KoRecentDocumentsPane(TQWidget* parent, KInstance* instance); ~KoRecentDocumentsPane(); virtual bool eventFilter(TQObject* watched, TQEvent* e); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index a579e925..2bd0e3b4 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -165,8 +165,8 @@ public: class KoViewWrapperWidget : public TQWidget { public: - KoViewWrapperWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) + KoViewWrapperWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { KGlobal::locale()->insertCatalogue("koffice"); // Tell the iconloader about share/apps/koffice/icons @@ -211,7 +211,7 @@ KoBrowserExtension::KoBrowserExtension( KoDocument * doc, const char * name ) void KoBrowserExtension::print() { - KoDocument * doc = static_cast<KoDocument *>( tqparent() ); + KoDocument * doc = static_cast<KoDocument *>( parent() ); KoViewWrapperWidget * wrapper = static_cast<KoViewWrapperWidget *>( doc->widget() ); KoView * view = wrapper->koView(); // TODO remove code duplication (KoMainWindow), by moving this to KoView @@ -222,8 +222,8 @@ void KoBrowserExtension::print() view->print( printer ); } -KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) - : KParts::ReadWritePart( tqparent, name ) +KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode ) + : KParts::ReadWritePart( parent, name ) { if(s_documentList==0L) s_documentList=new TQPtrList<KoDocument>; @@ -236,12 +236,12 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec d->m_bSingleViewMode = singleViewMode; - // the tqparent setting *always* overrides! (Simon) - if ( tqparent ) + // the parent setting *always* overrides! (Simon) + if ( parent ) { - if ( tqparent->inherits( "KoDocument" ) ) - d->m_bSingleViewMode = ((KoDocument *)tqparent)->isSingleViewMode(); - else if ( tqparent->inherits( "KParts::Part" ) ) + if ( parent->inherits( "KoDocument" ) ) + d->m_bSingleViewMode = ((KoDocument *)parent)->isSingleViewMode(); + else if ( parent->inherits( "KParts::Part" ) ) d->m_bSingleViewMode = true; } @@ -309,12 +309,12 @@ bool KoDocument::isSingleViewMode() const bool KoDocument::isEmbedded() const { - return dynamic_cast<KoDocument *>( tqparent() ) != 0; + return dynamic_cast<KoDocument *>( parent() ) != 0; } -KoView *KoDocument::createView( TQWidget *tqparent, const char *name ) +KoView *KoDocument::createView( TQWidget *parent, const char *name ) { - KoView *view=createViewInstance(tqparent, name); + KoView *view=createViewInstance(parent, name); addView(view); return view; } @@ -2056,7 +2056,7 @@ int KoDocument::queryCloseExternalChildren() void KoDocument::setTitleModified( const TQString caption, bool mod ) { //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" caption: "<<caption<<" mod: "<<mod<<endl; - KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() ); + KoDocument *doc = dynamic_cast<KoDocument *>( parent() ); if ( doc ) { doc->setTitleModified( caption, mod ); @@ -2075,7 +2075,7 @@ void KoDocument::setTitleModified( const TQString caption, bool mod ) void KoDocument::setTitleModified() { //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" extern: "<<isStoredExtern()<<" current: "<<d->m_current<<endl; - KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() ); + KoDocument *doc = dynamic_cast<KoDocument *>( parent() ); TQString caption; if ( (url().isEmpty() || isStoredExtern()) && d->m_current ) { @@ -2429,7 +2429,7 @@ TQString KoDocument::backupPath()const void KoDocument::setCurrent( bool on ) { //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" set to: "<<on<<endl; - KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() ); + KoDocument *doc = dynamic_cast<KoDocument *>( parent() ); if ( doc ) { if ( !isStoredExtern() ) @@ -2442,7 +2442,7 @@ void KoDocument::setCurrent( bool on ) d->m_current = on; if ( !on ) { - doc->setCurrent( true ); // let my next external tqparent take over + doc->setCurrent( true ); // let my next external parent take over return; } doc->forceCurrent( false ); // everybody else should keep off @@ -2457,7 +2457,7 @@ void KoDocument::forceCurrent( bool on ) { //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" force to: "<<on<<endl; d->m_current = on; - KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() ); + KoDocument *doc = dynamic_cast<KoDocument *>( parent() ); if ( doc ) { doc->forceCurrent( false ); @@ -2542,7 +2542,7 @@ TQString KoDocument::unitName() const return KoUnit::unitName( unit() ); } -void KoDocument::showStartUpWidget( KoMainWindow* tqparent, bool alwaysShow ) +void KoDocument::showStartUpWidget( KoMainWindow* parent, bool alwaysShow ) { if(!alwaysShow) { KConfigGroup cfgGrp( instance()->config(), "TemplateChooserDialog" ); @@ -2558,11 +2558,11 @@ void KoDocument::showStartUpWidget( KoMainWindow* tqparent, bool alwaysShow ) if(d->m_startUpWidget){ d->m_startUpWidget->show(); } else { - d->m_startUpWidget = createOpenPane( tqparent->centralWidget(), instance(), templateType() ); + d->m_startUpWidget = createOpenPane( parent->centralWidget(), instance(), templateType() ); } - tqparent->setDocToOpen( this ); - tqparent->factory()->container("mainToolBar", tqparent)->hide(); + parent->setDocToOpen( this ); + parent->factory()->container("mainToolBar", parent)->hide(); } void KoDocument::openExistingFile( const TQString& file ) @@ -2600,10 +2600,10 @@ void KoDocument::startCustomDocument() { deleteOpenPane(); } -KoOpenPane* KoDocument::createOpenPane( TQWidget* tqparent, KInstance* instance, +KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, KInstance* instance, const TQString& templateType ) { - KoOpenPane* openPane = new KoOpenPane( tqparent, instance, templateType ); + KoOpenPane* openPane = new KoOpenPane( parent, instance, templateType ); TQWidget *customDoc = createCustomDocumentWidget(openPane); if(customDoc) { openPane->setCustomDocumentWidget( customDoc ); @@ -2648,13 +2648,13 @@ void KoDocument::deleteOpenPaneDelayed() d->m_startUpWidget = 0; } -TQWidget* KoDocument::createCustomDocumentWidget(TQWidget */*tqparent*/) { +TQWidget* KoDocument::createCustomDocumentWidget(TQWidget */*parent*/) { return 0; } -bool KoDocument::showEmbedInitDialog(TQWidget* tqparent) +bool KoDocument::showEmbedInitDialog(TQWidget* parent) { - KDialogBase dlg(tqparent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault); + KDialogBase dlg(parent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault); KoOpenPane* pane = createOpenPane(&dlg, instance(), templateType()); pane->tqlayout()->setMargin(0); dlg.setMainWidget(pane); diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index 4051cca6..ac6de7e8 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -71,16 +71,16 @@ public: * Constructor. * The first 4 arguments are the same as the ones passed to KParts::Factory::createPart. * - * @param parentWidget the tqparent widget, in case we create a wrapper widget + * @param parentWidget the parent widget, in case we create a wrapper widget * (in single view mode). * Usually the first argument passed by KParts::Factory::createPart. * @param widgetName name of the widget. - * @param tqparent may be another KoDocument, or anything else. + * @param parent may be another KoDocument, or anything else. * Usually the third argument of KParts::Factory::createPart. * @param name is used to identify this document via DCOP so you may want to * pass a meaningful name here which matches the pattern [A-Za-z_][A-Za-z_0-9]*. * @param singleViewMode determines whether the document may only have one view. In this case - * the @p tqparent must be a TQWidget derived class. KoDocument will then create a wrapper widget + * the @p parent must be a TQWidget derived class. KoDocument will then create a wrapper widget * (KoViewWrapperWidget) which is a child of @p parentWidget. * This widget can be retrieved by calling widget(). * @@ -88,7 +88,7 @@ public: */ KoDocument( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, + TQObject* parent, const char* name, bool singleViewMode = false ); @@ -328,7 +328,7 @@ public: /** * Create a new view for the document. */ - KoView *createView( TQWidget *tqparent = 0, const char *name = 0 ); + KoView *createView( TQWidget *parent = 0, const char *name = 0 ); /** * Adds a view to the document. @@ -465,11 +465,11 @@ public: /** * Creates and shows the start up widget. - * @param tqparent the KoMainWindow used as tqparent for the widget. + * @param parent the KoMainWindow used as parent for the widget. * @param alwaysShow always show the widget even if the user has configured it to not show. * @since 1.5 */ - virtual void showStartUpWidget(KoMainWindow* tqparent, bool alwaysShow = false); + virtual void showStartUpWidget(KoMainWindow* parent, bool alwaysShow = false); /** * Sets the modified flag on the document. This means that it has @@ -908,10 +908,10 @@ public: /** * Shows the init dialog when embeding - * @param tqparent the tqparent widget + * @param parent the parent widget * @since 1.5 */ - virtual bool showEmbedInitDialog(TQWidget* tqparent); + virtual bool showEmbedInitDialog(TQWidget* parent); public slots: /** @@ -988,7 +988,7 @@ protected: TQString autoSaveFile( const TQString & path ) const; - virtual KoView *createViewInstance( TQWidget *tqparent, const char *name ) = 0; + virtual KoView *createViewInstance( TQWidget *parent, const char *name ) = 0; /** * Loads a document from KReadOnlyPart::m_file (KParts takes care of downloading @@ -1016,9 +1016,9 @@ protected: * implement the logic to implement the document instance correctly. * After initializing the widget should emit a signal called 'documentSelected()' which * will remove the startupWidget and show the document. - * @param tqparent the tqparent of the to be created widget. + * @param parent the parent of the to be created widget. */ - virtual TQWidget* createCustomDocumentWidget(TQWidget *tqparent); + virtual TQWidget* createCustomDocumentWidget(TQWidget *parent); /** * OLD XML method. For OASIS just call KoDocumentChild::loadOasisDocument @@ -1122,12 +1122,12 @@ protected: /** * Creates the open widget showed at application start up. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param instance the KInstance to be used for KConfig data * @param templateType the template-type (group) that should be selected on creation. * @since 1.5 */ - KoOpenPane* createOpenPane( TQWidget* tqparent, KInstance* instance, + KoOpenPane* createOpenPane( TQWidget* parent, KInstance* instance, const TQString& templateType = TQString()); private slots: diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index 38c4439a..0767ab04 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -67,11 +67,11 @@ public: bool m_deleted; }; -KoDocumentChild::KoDocumentChild( KoDocument* tqparent, KoDocument* doc, const TQRect& tqgeometry ) - : KoChild( tqparent ) +KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry ) + : KoChild( parent ) { d = new KoDocumentChildPrivate; - d->m_parent = tqparent; + d->m_parent = parent; d->m_doc = doc; setGeometry( tqgeometry ); d->m_deleted = false; @@ -79,11 +79,11 @@ KoDocumentChild::KoDocumentChild( KoDocument* tqparent, KoDocument* doc, const T doc->setStoreInternal( !doc->hasExternURL() ); } -KoDocumentChild::KoDocumentChild( KoDocument* tqparent ) - : KoChild( tqparent ) +KoDocumentChild::KoDocumentChild( KoDocument* parent ) + : KoChild( parent ) { d = new KoDocumentChildPrivate; - d->m_parent = tqparent; + d->m_parent = parent; d->m_doc = 0L; d->m_deleted = false; } @@ -351,14 +351,14 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr // now :-) if ( parentDocument() ) { - KoDocument *tqparent = parentDocument(); + KoDocument *parent = parentDocument(); - if ( tqparent->manager() && tqparent->manager()->parts() ) + if ( parent->manager() && parent->manager()->parts() ) { - KParts::PartManager *manager = tqparent->manager(); + KParts::PartManager *manager = parent->manager(); if ( !manager->parts()->containsRef( d->m_doc ) && - !tqparent->isSingleViewMode() ) + !parent->isSingleViewMode() ) manager->addPart( d->m_doc, false ); } } @@ -395,7 +395,7 @@ bool KoDocumentChild::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) else { // The name comes from KoDocumentChild (which was set while saving the - // tqparent document). + // parent document). assert( d->m_doc->url().protocol() == INTERNAL_PROTOCOL ); const TQString name = d->m_doc->url().path(); kdDebug() << k_funcinfo << "saving " << name << endl; diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h index 491f9b2d..de3704c0 100644 --- a/lib/kofficecore/KoDocumentChild.h +++ b/lib/kofficecore/KoDocumentChild.h @@ -45,19 +45,19 @@ class KOFFICECORE_EXPORT KoDocumentChild : public KoChild Q_OBJECT TQ_OBJECT public: - KoDocumentChild( KoDocument* tqparent, KoDocument* doc, const TQRect& tqgeometry ); + KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry ); /** * When using this constructor you must call @ref #setDocument before * you can call any other function of this class. */ - KoDocumentChild( KoDocument* tqparent ); + KoDocumentChild( KoDocument* parent ); virtual ~KoDocumentChild(); /** * Call this function only directly after calling the constructor - * that takes only a tqparent as argument. + * that takes only a parent as argument. */ virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry ); @@ -69,7 +69,7 @@ public: KoDocument *document() const; /** - * @return tqparent document of this child + * @return parent document of this child * * @see KoDocument */ @@ -98,7 +98,7 @@ public: /** * Save an embedded object to OASIS. - * This method sets the attributes for the draw:object element in the tqparent XML document. + * This method sets the attributes for the draw:object element in the parent XML document. * It also prepares the embedded object for being saved into the store at * the end of saving (see saveOasisToStore). * Note that @p name is only used for "internal" documents (not extern). @@ -107,7 +107,7 @@ public: /** * Save an embedded object to an OASIS store. - * This is called automatically by the tqparent KoDocument's saveOasis + * This is called automatically by the parent KoDocument's saveOasis */ virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter ); diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index f6a3fe69..cd4ecbaf 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -42,8 +42,8 @@ * *****************************************/ -KoDocumentInfo::KoDocumentInfo( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +KoDocumentInfo::KoDocumentInfo( TQObject* parent, const char* name ) + : TQObject( parent, name ) { (void)new KoDocumentInfoUserMetadata( this ); (void)new KoDocumentInfoAuthor( this ); @@ -194,8 +194,8 @@ TQString KoDocumentInfo::creator() const * *****************************************/ -KoDocumentInfoPage::KoDocumentInfoPage( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +KoDocumentInfoPage::KoDocumentInfoPage( TQObject* parent, const char* name ) + : TQObject( parent, name ) { } @@ -634,7 +634,7 @@ KoDocumentInfoAbout::KoDocumentInfoAbout( KoDocumentInfo* info ) void KoDocumentInfoAbout::saveParameters() { - KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->tqparent() ); + KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->parent() ); if ( m_firstSave && doc && !doc->isAutosaving() ) m_editingCycles++; m_modificationDate = TQDateTime::tqcurrentDateTime(); diff --git a/lib/kofficecore/KoDocumentInfo.h b/lib/kofficecore/KoDocumentInfo.h index b94a2de0..454763ac 100644 --- a/lib/kofficecore/KoDocumentInfo.h +++ b/lib/kofficecore/KoDocumentInfo.h @@ -41,7 +41,7 @@ class KOFFICECORE_EXPORT KoDocumentInfo : public TQObject Q_OBJECT TQ_OBJECT public: - KoDocumentInfo( TQObject* tqparent = 0, const char* name = 0 ); + KoDocumentInfo( TQObject* parent = 0, const char* name = 0 ); virtual ~KoDocumentInfo(); bool load( const TQDomDocument& doc ); @@ -67,7 +67,7 @@ public: class KOFFICECORE_EXPORT KoDocumentInfoPage : public TQObject { public: - KoDocumentInfoPage( TQObject *tqparent, const char* name ); + KoDocumentInfoPage( TQObject *parent, const char* name ); virtual bool load( const TQDomElement& e ) = 0; virtual TQDomElement save( TQDomDocument& doc ) = 0; diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 786e3982..f32616dd 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -79,9 +79,9 @@ public: KDialogBase *m_dialog; }; -KoDocumentInfoDlg::KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *tqparent, const char *name, +KoDocumentInfoDlg::KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *parent, const char *name, KDialogBase *dialog ) -: TQObject( tqparent, "docinfodlg" ) +: TQObject( parent, "docinfodlg" ) { d = new KoDocumentInfoDlgPrivate; d->m_info = docInfo; @@ -94,7 +94,7 @@ KoDocumentInfoDlg::KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *tqparen d->m_dialog = new KDialogBase( KDialogBase::Tabbed, i18n( "Document Information" ), KDialogBase::Ok | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name, true, false ); + KDialogBase::Ok, parent, name, true, false ); d->m_dialog->setInitialSize( TQSize( 500, 500 ) ); d->m_bDeleteDialog = true; } @@ -257,7 +257,7 @@ void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo ) TQVBox *page = d->m_dialog->addVBoxPage( i18n( "General" ) ); d->m_aboutWidget = new KoDocumentInfoAboutWidget( page ); d->m_aboutWidget->pbReset->setIconSet( TQIconSet( KGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ) ); - KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->tqparent() ); + KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->parent() ); if ( doc ) { d->m_aboutWidget->leDocFile->setText( doc->file() ); diff --git a/lib/kofficecore/KoDocumentInfoDlg.h b/lib/kofficecore/KoDocumentInfoDlg.h index d346c4c1..8589b6a0 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.h +++ b/lib/kofficecore/KoDocumentInfoDlg.h @@ -37,7 +37,7 @@ class KOFFICECORE_EXPORT KoDocumentInfoDlg : public TQObject Q_OBJECT TQ_OBJECT public: - KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *tqparent = 0, const char *name = 0, + KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *parent = 0, const char *name = 0, KDialogBase *dialog = 0 ); virtual ~KoDocumentInfoDlg(); diff --git a/lib/kofficecore/KoDom.h b/lib/kofficecore/KoDom.h index 688110f0..a88cb22d 100644 --- a/lib/kofficecore/KoDom.h +++ b/lib/kofficecore/KoDom.h @@ -30,7 +30,7 @@ * * To find all child elements with a given name, use * TQDomElement e; - * forEachElement( e, tqparent ) + * forEachElement( e, parent ) * { * if ( e.localName() == "..." && e.namespaceURI() == KoXmlNS::... ) * { @@ -62,8 +62,8 @@ namespace KoDom { } -#define forEachElement( elem, tqparent ) \ - for ( TQDomNode _node = tqparent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \ +#define forEachElement( elem, parent ) \ + for ( TQDomNode _node = parent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \ if ( !( elem = _node.toElement() ).isNull() ) #endif /* KODOM_H */ diff --git a/lib/kofficecore/KoFactory.cpp b/lib/kofficecore/KoFactory.cpp index 9e6a4a18..cc89ac84 100644 --- a/lib/kofficecore/KoFactory.cpp +++ b/lib/kofficecore/KoFactory.cpp @@ -31,8 +31,8 @@ public: } }; -KoFactory::KoFactory( TQObject *tqparent, const char *name ) - : KParts::Factory( tqparent, name ) +KoFactory::KoFactory( TQObject *parent, const char *name ) + : KParts::Factory( parent, name ) { //d = new KoFactoryPrivate; } diff --git a/lib/kofficecore/KoFactory.h b/lib/kofficecore/KoFactory.h index e0d6b2b7..7a8a5a87 100644 --- a/lib/kofficecore/KoFactory.h +++ b/lib/kofficecore/KoFactory.h @@ -29,7 +29,7 @@ class KOFFICECORE_EXPORT KoFactory : public KParts::Factory Q_OBJECT TQ_OBJECT public: - KoFactory( TQObject *tqparent = 0, const char *name = 0 ); + KoFactory( TQObject *parent = 0, const char *name = 0 ); virtual ~KoFactory(); private: diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 9f581a4e..2a7bd315 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -26,9 +26,9 @@ #include <kdebug.h> KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal) - : KFileDialog( startDir, filter, tqparent, name, modal ) + : KFileDialog( startDir, filter, parent, name, modal ) { connect( filterWidget, TQT_SIGNAL( activated( int) ), this, TQT_SLOT( slotChangedfilter( int ) ) ); diff --git a/lib/kofficecore/KoFileDialog.h b/lib/kofficecore/KoFileDialog.h index 1482bf36..7c702cac 100644 --- a/lib/kofficecore/KoFileDialog.h +++ b/lib/kofficecore/KoFileDialog.h @@ -38,7 +38,7 @@ class KoFileDialog : public KFileDialog TQ_OBJECT public: KoFileDialog( const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal ); void setSpecialMimeFilter( TQStringList& mimeFilter, const TQString& currentFormat, const int specialOutputFlag, diff --git a/lib/kofficecore/KoFilter.h b/lib/kofficecore/KoFilter.h index 0f087252..77439648 100644 --- a/lib/kofficecore/KoFilter.h +++ b/lib/kofficecore/KoFilter.h @@ -135,7 +135,7 @@ private: * @ref #endInternalEmbedding accordingly. Try to use the previous method if possible. * * If you're using this class you can also setup a signal/slot communication - * between tqparent and child filter. To make that work you simply have to define + * between parent and child filter. To make that work you simply have to define * signals and slots along the following rules: * Signals should be named "commSignal\<name\>" where \<name\> is the name of the signal, * slots should be named "commSlot\<name\>". The connection will be done automatically diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index e10e624b..471d6098 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -90,13 +90,13 @@ void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentF if ( !parentFilter ) return; - const TQMetaObject* const tqparent = parentFilter->tqmetaObject(); + const TQMetaObject* const parent = parentFilter->tqmetaObject(); const TQMetaObject* const child = m_filter->tqmetaObject(); - if ( !tqparent || !child ) + if ( !parent || !child ) return; - setupConnections( parentFilter, tqparent->signalNames(), m_filter, child->slotNames() ); - setupConnections( m_filter, child->signalNames(), parentFilter, tqparent->slotNames() ); + setupConnections( parentFilter, parent->signalNames(), m_filter, child->slotNames() ); + setupConnections( m_filter, child->signalNames(), parentFilter, parent->slotNames() ); } void KoFilterChain::ChainLink::setupConnections( const KoFilter* sender, const TQStrList& sigs, @@ -406,7 +406,7 @@ void KoFilterChain::manageIO() if ( m_outputStorage ) { m_outputStorage->close(); // Don't delete the storage if we're just pointing to the - // storage of the tqparent filter chain + // storage of the parent filter chain if ( !filterManagerParentChain() || m_outputStorage->mode() != KoStore::Write ) delete m_outputStorage; m_outputStorage = 0; @@ -544,7 +544,7 @@ KoStoreDevice* KoFilterChain::storageInitEmbedding( const TQString& name ) m_outputStorage = filterManagerParentChain()->m_outputStorage; if ( !m_outputStorage ) { - // If the storage of the tqparent hasn't been initialized yet, + // If the storage of the parent hasn't been initialized yet, // we have to do that here. Quite nasty... storageInit( filterManagerParentChain()->outputFile(), KoStore::Write, &m_outputStorage ); @@ -600,7 +600,7 @@ KoStoreDevice* KoFilterChain::storageCreateFirstStream( const TQString& streamNa KoStoreDevice* KoFilterChain::storageCleanupHelper( KoStore** storage ) { - // Take care not to delete the storage of the tqparent chain + // Take care not to delete the storage of the parent chain if ( *storage != m_outputStorage || !filterManagerParentChain() || ( *storage )->mode() != KoStore::Write ) delete *storage; diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h index 7760a217..d926c613 100644 --- a/lib/kofficecore/KoFilterChain.h +++ b/lib/kofficecore/KoFilterChain.h @@ -123,7 +123,7 @@ public: private: // ### API for KOffice::Graph: // Construct a filter chain belonging to some KoFilterManager. - // The tqparent filter manager may be 0. + // The parent filter manager may be 0. KoFilterChain( const KoFilterManager* manager ); void appendChainLink( KoFilterEntry::Ptr filterEntry, const TQCString& from, const TQCString& to ); diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index 91522fbb..31a1e43e 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -48,8 +48,8 @@ public: }; -KoFilterChooser::KoFilterChooser (TQWidget *tqparent, const TQStringList &mimeTypes, const TQString &nativeFormat) - : KDialogBase (tqparent, "kofilterchooser", true, i18n ("Choose Filter"), +KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeTypes, const TQString &nativeFormat) + : KDialogBase (parent, "kofilterchooser", true, i18n ("Choose Filter"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true), m_mimeTypes (mimeTypes) { diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h index de75bf27..5f0641f4 100644 --- a/lib/kofficecore/KoFilterManager.h +++ b/lib/kofficecore/KoFilterManager.h @@ -66,7 +66,7 @@ public: * to specify this information only if the automatic detection will * fail because e.g. you saved an embedded stream to a *.tmp file. * Most likely you do not have to care about that. - * @param parentChain The tqparent filter chain of this filter manager. Used + * @param parentChain The parent filter chain of this filter manager. Used * to allow embedding for filters. Most likely you do not have to care. */ KoFilterManager( const TQString& url, const TQCString& mimetypeHint = "", diff --git a/lib/kofficecore/KoFilterManager_p.h b/lib/kofficecore/KoFilterManager_p.h index 358c25cd..0e8a0762 100644 --- a/lib/kofficecore/KoFilterManager_p.h +++ b/lib/kofficecore/KoFilterManager_p.h @@ -33,7 +33,7 @@ Q_OBJECT TQ_OBJECT public: - KoFilterChooser (TQWidget *tqparent, const TQStringList &mimeTypes, + KoFilterChooser (TQWidget *parent, const TQStringList &mimeTypes, const TQString &nativeFormat = TQString()); ~KoFilterChooser (); diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp index f11ba9f0..906e73f4 100644 --- a/lib/kofficecore/KoFrame.cpp +++ b/lib/kofficecore/KoFrame.cpp @@ -48,8 +48,8 @@ public: KoFrame::State m_state; }; -KoFrame::KoFrame( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KoFrame::KoFrame( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { d = new KoFramePrivate; d->m_state = Inactive; diff --git a/lib/kofficecore/KoFrame.h b/lib/kofficecore/KoFrame.h index fbb40bbb..77b3d1c3 100644 --- a/lib/kofficecore/KoFrame.h +++ b/lib/kofficecore/KoFrame.h @@ -32,7 +32,7 @@ class KoFrame : public TQWidget public: enum State { Inactive, Selected, Active }; - KoFrame( TQWidget *tqparent, const char *name = 0 ); + KoFrame( TQWidget *parent, const char *name = 0 ); virtual ~KoFrame(); virtual void setView( KoView *view ); diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp index 221288df..5c8f680f 100644 --- a/lib/kofficecore/KoGenStyles.cpp +++ b/lib/kofficecore/KoGenStyles.cpp @@ -33,24 +33,24 @@ TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int { StyleMap::iterator it = m_styleMap.find( style ); if ( it == m_styleMap.end() ) { - // Not found, try if this style is in fact equal to its tqparent (the find above + // Not found, try if this style is in fact equal to its parent (the find above // wouldn't have found it, due to m_parentName being set). if ( !style.parentName().isEmpty() ) { KoGenStyle testStyle( style ); const KoGenStyle* parentStyle = this->style( style.parentName() ); // ## linear search if( !parentStyle ) { - kdDebug(30003) << "KoGenStyles::lookup(" << name << "): tqparent style '" << style.parentName() << "' not found in collection" << endl; + kdDebug(30003) << "KoGenStyles::lookup(" << name << "): parent style '" << style.parentName() << "' not found in collection" << endl; } else { if ( testStyle.m_familyName != parentStyle->m_familyName ) { - kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl; + kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") parent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl; } testStyle.m_parentName = parentStyle->m_parentName; // Exclude the type from the comparison. It's ok for an auto style - // to have a user style as tqparent; they can still be identical + // to have a user style as parent; they can still be identical testStyle.m_type = parentStyle->m_type; - // Also it's ok to not have the display name of the tqparent style + // Also it's ok to not have the display name of the parent style // in the auto style TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.find( "style:display-name" ); if ( it != parentStyle->m_attributes.end() ) @@ -211,13 +211,13 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha if ( !m_parentName.isEmpty() ) { parentStyle = styles.style( m_parentName ); if ( parentStyle && m_familyName.isEmpty() ) { - // get family from tqparent style, just in case + // get family from parent style, just in case // Note: this is saving code, don't convert to attributeNS! const_cast<KoGenStyle *>( this )-> m_familyName = parentStyle->attribute( "style:family" ).latin1(); - //kdDebug(30003) << "Got familyname " << m_familyName << " from tqparent" << endl; + //kdDebug(30003) << "Got familyname " << m_familyName << " from parent" << endl; } - writer->addAttribute( "style:tqparent-style-name", m_parentName ); + writer->addAttribute( "style:parent-style-name", m_parentName ); } } else { // default-style Q_ASSERT( qstrcmp( elementName, "style:default-style" ) == 0 ); @@ -235,13 +235,13 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha kdDebug() << "style: " << name << endl; printDebug(); if ( parentStyle ) { - kdDebug() << " tqparent: " << m_parentName << endl; + kdDebug() << " parent: " << m_parentName << endl; parentStyle->printDebug(); } #endif - // Write attributes [which differ from the tqparent style] - // We only look at the direct tqparent style because we assume + // Write attributes [which differ from the parent style] + // We only look at the direct parent style because we assume // that styles are fully specified, i.e. the inheritance is // only in the final file, not in the caller's code. TQMap<TQString, TQString>::const_iterator it = m_attributes.begin(); diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h index 67f46da1..2a54f944 100644 --- a/lib/kofficecore/KoGenStyles.h +++ b/lib/kofficecore/KoGenStyles.h @@ -216,7 +216,7 @@ public: * @param familyName The value for style:family, e.g. text, paragraph, graphic etc. * The family is for style:style elements only; number styles and list styles don't have one. * - * @param parentName If set, name of the tqparent style from which this one inherits. + * @param parentName If set, name of the parent style from which this one inherits. */ explicit KoGenStyle( int type = 0, const char* familyName = 0, const TQString& parentName = TQString() ); @@ -249,7 +249,7 @@ public: /// Return the family name const char* familyName() const { return m_familyName.data(); } - /// Return the name of style's tqparent, if set + /// Return the name of style's parent, if set TQString parentName() const { return m_parentName; } /** @@ -379,7 +379,7 @@ public: /** * @return true if the style has no attributes, no properties, no style map etc. * This can be used by applications which do not save all attributes unconditionally, - * but only those that differ from the tqparent. But note that lookup() can't find this out... + * but only those that differ from the parent. But note that lookup() can't find this out... */ bool isEmpty() const { if ( !m_attributes.isEmpty() || ! m_maps.isEmpty() ) @@ -393,7 +393,7 @@ public: /** * Write the definition of this style to @p writer, using the OASIS format. * @param writer the KoXmlWriter in which @p elementName will be created and filled in - * @param styles the styles collection, used to look up the tqparent style + * @param styles the styles collection, used to look up the parent style * @param elementName the name of the XML element, e.g. "style:style". Don't forget to * pass style:default-style if isDefaultStyle(). * @param name must come from the collection. It will be ignored if isDefaultStyle() is true. diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 4e30d64a..5e4567de 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -63,15 +63,15 @@ class KoPartManager : public KParts::PartManager { public: - KoPartManager( TQWidget * tqparent, const char * name = 0L ) - : KParts::PartManager( tqparent, name ) + KoPartManager( TQWidget * parent, const char * name = 0L ) + : KParts::PartManager( parent, name ) { setSelectionPolicy( KParts::PartManager::TriState ); setAllowNestedParts( true ); setIgnoreScrollBars( true ); // Allow right-click on embedded objects (without activating them) - // But beware: this means right-click on tqparent, from embedded object, - // doesn't make the tqparent active first... + // But beware: this means right-click on parent, from embedded object, + // doesn't make the parent active first... setActivationButtonMask( Qt::LeftButton | Qt::MidButton ); } virtual bool eventFilter( TQObject *obj, TQEvent *ev ) diff --git a/lib/kofficecore/KoOasisLoadingContext.cpp b/lib/kofficecore/KoOasisLoadingContext.cpp index 3db850e4..3386daf8 100644 --- a/lib/kofficecore/KoOasisLoadingContext.cpp +++ b/lib/kofficecore/KoOasisLoadingContext.cpp @@ -68,9 +68,9 @@ void KoOasisLoadingContext::addStyles( const TQDomElement* style, const char* fa { Q_ASSERT( style ); if ( !style ) return; - // this recursive function is necessary as tqparent styles can have parents themselves - if ( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) ) { - const TQString parentStyleName = style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ); + // this recursive function is necessary as parent styles can have parents themselves + if ( style->hasAttributeNS( KoXmlNS::style, "parent-style-name" ) ) { + const TQString parentStyleName = style->attributeNS( KoXmlNS::style, "parent-style-name", TQString() ); const TQDomElement* parentStyle = 0; if ( usingStylesAutoStyles ) { // When loading something from styles.xml, look into the styles.xml auto styles first diff --git a/lib/kofficecore/KoOasisLoadingContext.h b/lib/kofficecore/KoOasisLoadingContext.h index 880d4117..c36a0fb1 100644 --- a/lib/kofficecore/KoOasisLoadingContext.h +++ b/lib/kofficecore/KoOasisLoadingContext.h @@ -68,7 +68,7 @@ public: * * Read attribute (nsURI,attrName) from the given dom element, * treat that attribute as a style name, and load that style - * including all its tqparent styles. + * including all its parent styles. * @param element the dom element to read the attribute from * @param nsURI the namespace URI of the attribute to read * @param attrName the name of the attribute to read @@ -77,12 +77,12 @@ public: void fillStyleStack( const TQDomElement& element, const char* nsURI, const char* attrName, const char* family ); /** - * Add @p style to the stack, as well as all its tqparent styles + * Add @p style to the stack, as well as all its parent styles * and the default style for this style family. * * @param style the dom element containing the style to add to the stack - * @param family the family to use when looking up tqparent styles - * @param usingStylesAutoStyles if true, the tqparent styles are looked up + * @param family the family to use when looking up parent styles + * @param usingStylesAutoStyles if true, the parent styles are looked up * in the automatic styles from styles.xml, instead of looking up * in the automatic styles from content.xml as we usually do. * This is useful for loading headers and footers for instance. diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index fe4ee658..fe88a11b 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -224,11 +224,11 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles ) // OO spec 2.5.4. p68. Conversion to TQt format: see qdate.html // OpenCalcImport::loadFormat has similar code, but slower, intermixed with other stuff, // lacking long-textual forms. -void KoOasisStyles::importDataStyle( const TQDomElement& tqparent ) +void KoOasisStyles::importDataStyle( const TQDomElement& parent ) { NumericStyleFormat dataStyle; - const TQString localName = tqparent.localName(); + const TQString localName = parent.localName(); if (localName == "number-style") dataStyle.type = NumericStyleFormat::Number; else if (localName == "currency-style") @@ -255,7 +255,7 @@ void KoOasisStyles::importDataStyle( const TQDomElement& tqparent ) TQDomElement e; TQString prefix; TQString suffix; - forEachElement( e, tqparent ) + forEachElement( e, parent ) { if ( e.namespaceURI() != KoXmlNS::number ) continue; @@ -446,7 +446,7 @@ void KoOasisStyles::importDataStyle( const TQDomElement& tqparent ) } - const TQString styleName = tqparent.attributeNS( KoXmlNS::style, "name", TQString() ); + const TQString styleName = parent.attributeNS( KoXmlNS::style, "name", TQString() ); kdDebug(30003) << "data style: " << styleName << " qt format=" << format << endl; if ( !prefix.isEmpty() ) { diff --git a/lib/kofficecore/KoOasisStyles.h b/lib/kofficecore/KoOasisStyles.h index 9a8e64e4..dfa9e468 100644 --- a/lib/kofficecore/KoOasisStyles.h +++ b/lib/kofficecore/KoOasisStyles.h @@ -137,7 +137,7 @@ private: private: void insertOfficeStyles( const TQDomElement& styles ); void insertStyle( const TQDomElement& style, bool styleAutoStyles ); - void importDataStyle( const TQDomElement& tqparent ); + void importDataStyle( const TQDomElement& parent ); static bool saveOasisTimeFormat( KoXmlWriter &elementWriter, TQString & format, TQString & text, bool &antislash ); static void parseOasisDateKlocale(KoXmlWriter &elementWriter, TQString & format, TQString & text ); static bool saveOasisKlocaleTimeFormat( KoXmlWriter &elementWriter, TQString & format, TQString & text ); diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 6c7cbb86..83978239 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -94,8 +94,8 @@ class KoOpenPanePrivate KInstance* m_instance; }; -KoOpenPane::KoOpenPane(TQWidget *tqparent, KInstance* instance, const TQString& templateType) - : KoOpenPaneBase(tqparent, "OpenPane") +KoOpenPane::KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType) + : KoOpenPaneBase(parent, "OpenPane") { d = new KoOpenPanePrivate; d->m_instance = instance; diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h index 818c6e81..64f799d8 100644 --- a/lib/kofficecore/KoOpenPane.h +++ b/lib/kofficecore/KoOpenPane.h @@ -39,11 +39,11 @@ class KoOpenPane : public KoOpenPaneBase public: /** * Constructor - * @param tqparent the tqparent widget + * @param parent the parent widget * @param instance the KInstance to be used for KConfig data * @param templateType the template-type (group) that should be selected on creation. */ - KoOpenPane(TQWidget *tqparent, KInstance* instance, const TQString& templateType = TQString()); + KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType = TQString()); virtual ~KoOpenPane(); TQListViewItem* addPane(const TQString& title, const TQString& icon, TQWidget* widget, int sortWeight); diff --git a/lib/kofficecore/KoPicture.h b/lib/kofficecore/KoPicture.h index 3fa355f8..63dd9c59 100644 --- a/lib/kofficecore/KoPicture.h +++ b/lib/kofficecore/KoPicture.h @@ -179,8 +179,8 @@ public: * Download and set the key for a possibly remote file. * * @param url the url to download from - * @param window the tqparent widget for the download. You can pass - * NULL (0) if you absolutely cannot find a tqparent + * @param window the parent widget for the download. You can pass + * NULL (0) if you absolutely cannot find a parent * widget to use. */ bool setKeyAndDownloadPicture(const KURL& url, TQWidget *window); @@ -204,7 +204,7 @@ public: void setAlphaBuffer(bool enable); /** - * Creates an alpha tqmask for the picture + * Creates an alpha mask for the picture * (first you have to call @ref #setAlphaBuffer). * * @see hasAlphaBuffer() setAlphaBuffer() diff --git a/lib/kofficecore/KoPictureCollection.h b/lib/kofficecore/KoPictureCollection.h index 8071d564..8d96761c 100644 --- a/lib/kofficecore/KoPictureCollection.h +++ b/lib/kofficecore/KoPictureCollection.h @@ -71,7 +71,7 @@ public: * If this file is really remote, it is always downloaded. * If the file is local, it acts as @ref #loadPicture. * @param url the URL to download from - * @param window the tqparent window for the download. You can pass NULL (0) + * @param window the parent window for the download. You can pass NULL (0) * if you absolutely cannot find anything to use. */ KoPicture downloadPicture(const KURL& url, TQWidget *window); diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp index e164aa1a..0003d00d 100644 --- a/lib/kofficecore/KoQueryTrader.cpp +++ b/lib/kofficecore/KoQueryTrader.cpp @@ -48,7 +48,7 @@ KoDocumentEntry::KoDocumentEntry( KService::Ptr service ) { } -KoDocument* KoDocumentEntry::createDoc( KoDocument* tqparent, const char* name ) const +KoDocument* KoDocumentEntry::createDoc( KoDocument* parent, const char* name ) const { KLibFactory* factory = KLibLoader::self()->factory( TQFile::encodeName(m_service->library()) ); @@ -59,10 +59,10 @@ KoDocument* KoDocumentEntry::createDoc( KoDocument* tqparent, const char* name ) TQObject* obj; if ( factory->inherits( "KParts::Factory" ) ) - obj = static_cast<KParts::Factory *>(factory)->createPart( 0L, "", tqparent, name, "KoDocument" ); + obj = static_cast<KParts::Factory *>(factory)->createPart( 0L, "", parent, name, "KoDocument" ); else { kdWarning(30003) << "factory doesn't inherit KParts::Factory ! It is a " << factory->className() << endl; // This shouldn't happen... - obj = factory->create( tqparent, name, "KoDocument" ); + obj = factory->create( parent, name, "KoDocument" ); } if ( !obj || !obj->inherits( "KoDocument" ) ) @@ -192,7 +192,7 @@ TQValueList<KoFilterEntry::Ptr> KoFilterEntry::query( const TQString & _constr ) return lst; } -KoFilter* KoFilterEntry::createFilter( KoFilterChain* chain, TQObject* tqparent, const char* name ) +KoFilter* KoFilterEntry::createFilter( KoFilterChain* chain, TQObject* parent, const char* name ) { KLibFactory* factory = KLibLoader::self()->factory( TQFile::encodeName( m_service->library() ) ); @@ -201,7 +201,7 @@ KoFilter* KoFilterEntry::createFilter( KoFilterChain* chain, TQObject* tqparent, return 0; } - TQObject* obj = factory->create( tqparent, name, "KoFilter" ); + TQObject* obj = factory->create( parent, name, "KoFilter" ); if ( !obj || !obj->inherits( "KoFilter" ) ) { delete obj; diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h index 54fa811e..c945d5a6 100644 --- a/lib/kofficecore/KoQueryTrader.h +++ b/lib/kofficecore/KoQueryTrader.h @@ -70,7 +70,7 @@ public: * Uses the factory of the component to create * a document. If that is not possible, 0 is returned. */ - KoDocument* createDoc( KoDocument* tqparent = 0, const char* name = 0 ) const; + KoDocument* createDoc( KoDocument* parent = 0, const char* name = 0 ) const; /** * This function will query ksycoca to find all available components. @@ -126,7 +126,7 @@ public: KoFilterEntry( KService::Ptr service ); ~KoFilterEntry() { } - KoFilter* createFilter( KoFilterChain* chain, TQObject* tqparent = 0, const char* name = 0 ); + KoFilter* createFilter( KoFilterChain* chain, TQObject* parent = 0, const char* name = 0 ); /** * The imported mimetype(s). diff --git a/lib/kofficecore/KoStyleStack.cpp b/lib/kofficecore/KoStyleStack.cpp index 9920c289..1f64c4d6 100644 --- a/lib/kofficecore/KoStyleStack.cpp +++ b/lib/kofficecore/KoStyleStack.cpp @@ -171,7 +171,7 @@ bool KoStyleStack::hasAttributeNS( const char* nsURI, const char* name, const ch return false; } -// Font size is a bit special. "115%" applies to "the fontsize of the tqparent style". +// Font size is a bit special. "115%" applies to "the fontsize of the parent style". // This can be generalized though (hasAttributeThatCanBePercentOfParent() ? :) // Although, if we also add support for fo:font-size-rel here then it's not general anymore. double KoStyleStack::fontSize() const @@ -258,9 +258,9 @@ bool KoStyleStack::isUserStyle( const TQDomElement& e, const TQString& family ) { if ( e.attributeNS( m_styleNSURI, "family", TQString() ) != family ) return false; - const TQDomElement tqparent = e.parentNode().toElement(); - //kdDebug(30003) << k_funcinfo << "tagName=" << e.tagName() << " tqparent-tagName=" << tqparent.tagName() << endl; - return tqparent.localName() == "styles" /*&& tqparent.namespaceURI() == KoXmlNS::office*/; + const TQDomElement parent = e.parentNode().toElement(); + //kdDebug(30003) << k_funcinfo << "tagName=" << e.tagName() << " parent-tagName=" << parent.tagName() << endl; + return parent.localName() == "styles" /*&& parent.namespaceURI() == KoXmlNS::office*/; } TQString KoStyleStack::userStyleName( const TQString& family ) const diff --git a/lib/kofficecore/KoStyleStack.h b/lib/kofficecore/KoStyleStack.h index 4fbc1793..6c188989 100644 --- a/lib/kofficecore/KoStyleStack.h +++ b/lib/kofficecore/KoStyleStack.h @@ -36,7 +36,7 @@ * There can be several styles that are valid for one object. For example * a textobject on a page has styles 'pr3' and 'P7' and a paragraph in * that textobject has styles 'P1' and 'T3'. And some styles even have - * tqparent-styles... + * parent-styles... * * If you want to know if there is, for example, the attribute 'fo:font-family' * for this paragraph, you have to look into style 'T3', 'P1', 'P7' and 'pr3'. @@ -54,7 +54,7 @@ * * In general though, you wouldn't use push/pop directly, but KoOasisLoadingContext::fillStyleStack * or KoOasisLoadingContext::addStyles to automatically push a style and all its - * tqparent styles onto the stack. + * parent styles onto the stack. */ class KOFFICECORE_EXPORT KoStyleStack { diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index e2b9775e..debb9f7c 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -106,8 +106,8 @@ public: bool m_inOperation; //in the middle of an operation (no screen refreshing)? }; -KoView::KoView( KoDocument *document, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { Q_ASSERT( document ); @@ -538,7 +538,7 @@ void KoView::slotChildActivated( bool a ) if ( n == (TQObject *)view ) return; else - n = n->tqparent(); + n = n->parent(); d->m_tempActiveWidget = activeWidget; diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h index 42d78fb6..93eb8971 100644 --- a/lib/kofficecore/KoView.h +++ b/lib/kofficecore/KoView.h @@ -68,12 +68,12 @@ public: * * @param document is the document which should be displayed in this view. This pointer * must not be zero. - * @param tqparent tqparent widget for this view. + * @param parent parent widget for this view. * @param name Name of the view. The name is used in DCOP, so the name should * match the pattern [A-Za-z_][A-Za-z_0-9]*. * */ - KoView( KoDocument *document, TQWidget *tqparent = 0, const char *name = 0 ); + KoView( KoDocument *document, TQWidget *parent = 0, const char *name = 0 ); /** * Destroys the view and unregisters at the document. */ diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp index 52e6d8ae..3b2d3efb 100644 --- a/lib/kofficecore/KoXmlReader.cpp +++ b/lib/kofficecore/KoXmlReader.cpp @@ -173,7 +173,7 @@ public: TQString nodeName() const; // for tree and linked-list - KoXmlNodeData* tqparent; + KoXmlNodeData* parent; KoXmlNodeData* prev; KoXmlNodeData* next; KoXmlNodeData* first; @@ -295,7 +295,7 @@ KoXmlNodeData::KoXmlNodeData() textData = TQString(); count = 1; - tqparent = 0; + parent = 0; prev = next = 0; first = last = 0; @@ -333,7 +333,7 @@ void KoXmlNodeData::clear() attr.clear(); attrNS.clear(); - tqparent = 0; + parent = 0; prev = next = 0; first = last = 0; @@ -389,15 +389,15 @@ KoXmlNodeData* KoXmlNodeData::ownerDocument() { KoXmlNodeData* owner = this; - while( owner->tqparent ) - owner = owner->tqparent; + while( owner->parent ) + owner = owner->parent; return (owner->nodeType==KoXmlNode::DocumentNode) ? owner : 0; } void KoXmlNodeData::appendChild( KoXmlNodeData* node ) { - node->tqparent = this; + node->parent = this; if( !last ) first = last = node; else @@ -678,7 +678,7 @@ const TQString& name, const TQXmlAttributes& atts ) // construct a new element element = new KoXmlNodeData; element->nodeType = KoXmlNode::ElementNode; - element->tqparent = currentNode; + element->parent = currentNode; element->namespaceURI = nsURI; element->prefix = nodePrefix; element->localName = nodeLocalName; @@ -744,7 +744,7 @@ const TQString& name, const TQXmlAttributes& atts ) // construct a new element element = new KoXmlNodeData; element->nodeType = KoXmlNode::ElementNode; - element->tqparent = currentNode; + element->parent = currentNode; element->namespaceURI = TQString(); element->prefix = TQString(); element->localName = TQString(); @@ -810,7 +810,7 @@ const TQString& qName ) // sanity check if( !currentNode ) return false; - if( !currentNode->tqparent ) return false; + if( !currentNode->parent ) return false; // see comments in startElement about first element and on-demand loading if( rootNode->nodeType == KoXmlNode::DocumentNode ) @@ -826,7 +826,7 @@ const TQString& qName ) // go up one level if( elementDepth <= maxDepth ) - currentNode = currentNode->tqparent; + currentNode = currentNode->parent; // we are going up one level elementDepth--; @@ -856,7 +856,7 @@ bool KoXmlHandler::characters( const TQString& str ) { KoXmlNodeData* cdata = new KoXmlNodeData; cdata->nodeType = KoXmlNode::CDATASectionNode; - cdata->tqparent = currentNode; + cdata->parent = currentNode; cdata->setData( str ); currentNode->appendChild( cdata ); } @@ -871,7 +871,7 @@ bool KoXmlHandler::characters( const TQString& str ) { KoXmlNodeData* text = new KoXmlNodeData; text->nodeType = KoXmlNode::TextNode; - text->tqparent = currentNode; + text->parent = currentNode; text->setData( str ); currentNode->appendChild( text ); } @@ -893,7 +893,7 @@ const TQString& data ) KoXmlNodeData* instruction = new KoXmlNodeData; instruction->nodeType = KoXmlNode::ProcessingInstructionNode; - instruction->tqparent = currentNode; + instruction->parent = currentNode; instruction->tagName = target; instruction->setData( data ); @@ -1101,7 +1101,7 @@ TQString KoXmlNode::localName() const KoXmlDocument KoXmlNode::ownerDocument() const { KoXmlNodeData* node = d; - while( node->tqparent ) node = node->tqparent; + while( node->parent ) node = node->parent; if( node->nodeType != DocumentNode ) return KoXmlDocument(); return KoXmlDocument( node ); @@ -1109,7 +1109,7 @@ KoXmlDocument KoXmlNode::ownerDocument() const KoXmlNode KoXmlNode::parentNode() const { - return d->tqparent ? KoXmlNode( d->tqparent ) : KoXmlNode(); + return d->parent ? KoXmlNode( d->parent ) : KoXmlNode(); } bool KoXmlNode::hasChildNodes() const diff --git a/lib/kofficecore/KoXmlReader.h b/lib/kofficecore/KoXmlReader.h index d4505398..cdce2938 100644 --- a/lib/kofficecore/KoXmlReader.h +++ b/lib/kofficecore/KoXmlReader.h @@ -54,7 +54,7 @@ class KoXmlNodeData; * KoXmlNode is a base class for KoXmlElement, KoXmlText. * Often, these subclasses are used for getting the data instead of KoXmlNode. * However, as base class, KoXmlNode is very helpful when for example iterating - * all child nodes within one tqparent node. + * all child nodes within one parent node. * * KoXmlNode implements an explicit sharing, a node shares its data with * other copies (if exist). @@ -267,7 +267,7 @@ private: * * To find all child elements with a given name, use * TQDomElement e; - * forEachElement( e, tqparent ) + * forEachElement( e, parent ) * { * if ( e.localName() == "..." && e.namespaceURI() == KoXmlNS::... ) * { @@ -312,8 +312,8 @@ namespace KoXml { } -#define forEachElement( elem, tqparent ) \ - for ( KoXmlNode _node = tqparent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \ +#define forEachElement( elem, parent ) \ + for ( KoXmlNode _node = parent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \ if ( !( elem = _node.toElement() ).isNull() ) diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index a9fc2182..188d5888 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -38,8 +38,8 @@ #include "Koversiondialog.h" -KoVersionDialog::KoVersionDialog( TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n("Version"), Ok|Cancel ) +KoVersionDialog::KoVersionDialog( TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n("Version"), Ok|Cancel ) { TQWidget* page = new TQWidget( this ); setMainWidget( page ); @@ -121,8 +121,8 @@ void KoVersionDialog::slotOk() accept(); } -KoVersionModifyDialog::KoVersionModifyDialog( TQWidget* tqparent, const TQString &/*comment*/, const char* name ) - : KDialogBase( tqparent, name, true, i18n("Comment"), Ok|Cancel ) +KoVersionModifyDialog::KoVersionModifyDialog( TQWidget* parent, const TQString &/*comment*/, const char* name ) + : KDialogBase( parent, name, true, i18n("Comment"), Ok|Cancel ) { TQWidget* page = new TQWidget( this ); setMainWidget( page ); diff --git a/lib/kofficecore/Koversiondialog.h b/lib/kofficecore/Koversiondialog.h index e357e964..547e518a 100644 --- a/lib/kofficecore/Koversiondialog.h +++ b/lib/kofficecore/Koversiondialog.h @@ -32,7 +32,7 @@ class KoVersionDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoVersionDialog( TQWidget* tqparent, const char* name = 0L ); + KoVersionDialog( TQWidget* parent, const char* name = 0L ); ~KoVersionDialog(); public slots: @@ -59,7 +59,7 @@ class KoVersionModifyDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoVersionModifyDialog( TQWidget* tqparent, const TQString &_comment = TQString() , const char* name = 0L ); + KoVersionModifyDialog( TQWidget* parent, const TQString &_comment = TQString() , const char* name = 0L ); TQString comment() const; diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index dccc913a..9535c14a 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -157,18 +157,18 @@ class KKbdAccessExtensionsPrivate KMainWindow* mainWindow; }; -KKbdAccessExtensions::KKbdAccessExtensions(KMainWindow* tqparent, const char* name) : - TQObject(tqparent, name) +KKbdAccessExtensions::KKbdAccessExtensions(KMainWindow* parent, const char* name) : + TQObject(parent, name) { // kdDebug() << "KKbdAccessExtensions::KKbdAccessExtensions: running." << endl; d = new KKbdAccessExtensionsPrivate; - d->mainWindow = tqparent; + d->mainWindow = parent; d->fwdAction = new KAction(i18n("Resize Panel Forward"), KShortcut("F8"), - 0, 0, tqparent->actionCollection(), "resize_panel_forward"); + 0, 0, parent->actionCollection(), "resize_panel_forward"); d->revAction = new KAction(i18n("Resize Panel Reverse"), KShortcut("Shift+F8"), - 0, 0, tqparent->actionCollection(), "resize_panel_reverse"); + 0, 0, parent->actionCollection(), "resize_panel_reverse"); d->accessKeysAction = new KAction(i18n("Access Keys"), KShortcut("Alt+F8"), - 0, 0, tqparent->actionCollection(), "access_keys"); + 0, 0, parent->actionCollection(), "access_keys"); // "Disable" the shortcuts so we can see them in eventFilter. d->fwdAction->setEnabled(false); d->revAction->setEnabled(false); diff --git a/lib/kofficecore/kkbdaccessextensions.h b/lib/kofficecore/kkbdaccessextensions.h index bc68cb28..e520b1ec 100644 --- a/lib/kofficecore/kkbdaccessextensions.h +++ b/lib/kofficecore/kkbdaccessextensions.h @@ -114,10 +114,10 @@ class KOFFICECORE_EXPORT KKbdAccessExtensions : public TQObject public: /** Constructor. - * @param tqparent KMainWindow of the application. Required. + * @param parent KMainWindow of the application. Required. * @param name (optional) Name of this object. */ - KKbdAccessExtensions(KMainWindow* tqparent, const char* name = 0); + KKbdAccessExtensions(KMainWindow* parent, const char* name = 0); /** Destructor. */ virtual ~KKbdAccessExtensions(); diff --git a/lib/kofficecore/priorityqueue.h b/lib/kofficecore/priorityqueue.h index a9a5c770..b657ab73 100644 --- a/lib/kofficecore/priorityqueue.h +++ b/lib/kofficecore/priorityqueue.h @@ -86,7 +86,7 @@ namespace KOffice { private: // Note: We have to use a 1-based index here, and we get/return 0-based ones - int tqparent( int i ) { return ( ( i + 1 ) >> 1 ) - 1; } + int parent( int i ) { return ( ( i + 1 ) >> 1 ) - 1; } int left( int i ) { return ( ( i + 1 ) << 1 ) - 1; } int right( int i ) { return ( i + 1 ) << 1; } @@ -190,14 +190,14 @@ namespace KOffice { template<class T> void PriorityQueue<T>::bubbleUp( T* item, int i ) { - int p = tqparent( i ); + int p = parent( i ); while ( i > 0 && m_vector[ p ]->key() > item->key() ) { // update the index first m_vector[ p ]->setIndex( i ); // then move it there m_vector[ i ] = m_vector[ p ]; i = p; - p = tqparent( i ); + p = parent( i ); } item->setIndex( i ); m_vector[ i ] = item; diff --git a/lib/kofficecore/tests/kogenstylestest.cpp b/lib/kofficecore/tests/kogenstylestest.cpp index ef9150f6..165d0ce9 100644 --- a/lib/kofficecore/tests/kogenstylestest.cpp +++ b/lib/kofficecore/tests/kogenstylestest.cpp @@ -66,8 +66,8 @@ int testLookup() KoGenStyle third( KoGenStyle::STYLE_AUTO, "paragraph", secondName ); // inherited style third.addProperty( "style:margin-left", "1.249cm" ); - third.addProperty( "style:page-number", "0" ); // same as tqparent - third.addProperty( "style:foobar", "3", KoGenStyle::TextType ); // different from tqparent + third.addProperty( "style:page-number", "0" ); // same as parent + third.addProperty( "style:foobar", "3", KoGenStyle::TextType ); // different from parent assert( third.parentName() == secondName ); TQString thirdName = coll.lookup( third, "P" ); @@ -88,7 +88,7 @@ int testLookup() sameAsParent.addStyleMap( map1 ); sameAsParent.addStyleMap( map2 ); TQString sapName = coll.lookup( sameAsParent, "foobar" ); - kdDebug() << "The 'same as tqparent' style got assigned the name " << sapName << endl; + kdDebug() << "The 'same as parent' style got assigned the name " << sapName << endl; assert( sapName == secondName ); assert( coll.styles().count() == 3 ); @@ -119,7 +119,7 @@ int testLookup() TEST_BEGIN( 0, 0 ); third.writeStyle( &writer, coll, "style:style", thirdName, "style:paragraph-properties" ); - TEST_END( "XML for third style", "<r>\n <style:style style:name=\"P1\" style:tqparent-style-name=\"A1\" style:family=\"paragraph\">\n <style:paragraph-properties style:margin-left=\"1.249cm\"/>\n <style:text-properties style:foobar=\"3\"/>\n </style:style>\n</r>\n" ); + TEST_END( "XML for third style", "<r>\n <style:style style:name=\"P1\" style:parent-style-name=\"A1\" style:family=\"paragraph\">\n <style:paragraph-properties style:margin-left=\"1.249cm\"/>\n <style:text-properties style:foobar=\"3\"/>\n </style:style>\n</r>\n" ); coll.markStyleForStylesXml( firstName ); { @@ -166,11 +166,11 @@ int testDefaultStyle() // The kspread case: not writing out all properties, only if they differ // from the default style. - // KoGenStyles doesn't fetch info from the tqparent style when testing - // for equality, so KSpread uses isEmpty() to check for equality-to-tqparent. + // KoGenStyles doesn't fetch info from the parent style when testing + // for equality, so KSpread uses isEmpty() to check for equality-to-parent. KoGenStyle dataStyle( KoGenStyle::STYLE_AUTO, "paragraph", defaultStyleName ); assert( dataStyle.isEmpty() ); - // and then it doesn't look up the auto style, but rather uses the tqparent style directly. + // and then it doesn't look up the auto style, but rather uses the parent style directly. return 0; } @@ -201,13 +201,13 @@ int testUserStyles() // And now, what if the data uses that style? // This is like sameAsParent in the other test, but this time the - // tqparent is a STYLE_USER... + // parent is a STYLE_USER... KoGenStyle dataStyle( KoGenStyle::STYLE_AUTO, "paragraph", user2StyleName ); dataStyle.addProperty( "myfont", "isBold" ); TQString dataStyleName = coll.lookup( dataStyle, "DataStyle" ); kdDebug() << "The auto style got assigned the name " << dataStyleName << endl; - assert( dataStyleName == "User2" ); // it found the tqparent as equal + assert( dataStyleName == "User2" ); // it found the parent as equal // Let's do the opposite test, just to make sure KoGenStyle dataStyle2( KoGenStyle::STYLE_AUTO, "paragraph", user2StyleName ); |