summaryrefslogtreecommitdiffstats
path: root/lib/kotext/KoTextFormat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kotext/KoTextFormat.cpp')
-rw-r--r--lib/kotext/KoTextFormat.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp
index 27556ed6..24214ae4 100644
--- a/lib/kotext/KoTextFormat.cpp
+++ b/lib/kotext/KoTextFormat.cpp
@@ -82,11 +82,11 @@ KoTextFormat::KoTextFormat()
//#endif
}
-KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, bool hyphenation, KoTextFormatCollection *tqparent )
+KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, bool hyphenation, KoTextFormatCollection *parent )
: fn( f ), col( c ) /*fm( TQFontMetrics( f ) ),*/ //linkColor( TRUE )
{
#ifdef DEBUG_COLLECTION
- kdDebug(32500) << "KoTextFormat with font & color & tqparent (" << tqparent << "), addRef. " << this << endl;
+ kdDebug(32500) << "KoTextFormat with font & color & parent (" << parent << "), addRef. " << this << endl;
#endif
int pointSize;
if ( f.pointSize() == -1 ) // font was set with a pixelsize, we need a pointsize!
@@ -97,7 +97,7 @@ KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_
// WYSIWYG works much much better with scalable fonts -> force it to be scalable
fn.setStyleStrategy( TQFont::ForceOutline );
ref = 0;
- collection = tqparent;
+ collection = parent;
//leftBearing = fm.minLeftBearing();
//rightBearing = fm.minRightBearing();
//hei = fm.height();
@@ -188,8 +188,8 @@ KoTextFormat::~KoTextFormat()
// Removing a format that is in the collection is forbidden, in fact.
// It should have been removed from the collection before being deleted.
#ifndef NDEBUG
- if ( tqparent() && tqparent()->defaultFormat() ) // not when destroying the collection
- assert( ! ( tqparent()->dict().find( key() ) == this ) );
+ if ( parent() && parent()->defaultFormat() ) // not when destroying the collection
+ assert( ! ( parent()->dict().find( key() ) == this ) );
// (has to be the same pointer, not only the same key)
#endif
delete d;
@@ -1709,7 +1709,7 @@ KoTextFormatCollection::~KoTextFormatCollection()
KoTextFormat *KoTextFormatCollection::format( const KoTextFormat *f )
{
- if ( f->tqparent() == this || f == defFormat ) {
+ if ( f->parent() == this || f == defFormat ) {
#ifdef DEBUG_COLLECTION
kdDebug(32500) << " format(f) need '" << f->key() << "', best case!" << endl;
#endif