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

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/kotext/KoTextFormat.h b/lib/kotext/KoTextFormat.h
index 25211f54..0e7c1a13 100644
--- a/lib/kotext/KoTextFormat.h
+++ b/lib/kotext/KoTextFormat.h
@@ -139,7 +139,7 @@ public:
     /// A simple text format with some default settings
     /// Only used for the default format
     KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language,
-                  bool hyphenation, KoTextFormatCollection *tqparent = 0 );
+                  bool hyphenation, KoTextFormatCollection *parent = 0 );
 
     /// A complete text format (used by KoFontDia)
     KoTextFormat( const TQFont &_font,
@@ -197,8 +197,8 @@ public:
     void setVAlign( VerticalAlignment a );
 
     bool operator==( const KoTextFormat &f ) const;
-    KoTextFormatCollection *tqparent() const;
-    void setCollection( KoTextFormatCollection *tqparent ) { collection = tqparent; }
+    KoTextFormatCollection *parent() const;
+    void setCollection( KoTextFormatCollection *parent ) { collection = parent; }
     TQString key() const;
 
     static TQString getKey( const TQFont &f, const TQColor &c, bool misspelled, VerticalAlignment vAlign );
@@ -476,7 +476,7 @@ inline bool KoTextFormat::operator==( const KoTextFormat &f ) const
     return key() == f.key();
 }
 
-inline KoTextFormatCollection *KoTextFormat::tqparent() const
+inline KoTextFormatCollection *KoTextFormat::parent() const
 {
     return collection;
 }