From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- lib/kotext/KoTextParag.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/kotext/KoTextParag.h') diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index d8e0c29b..e27a9afc 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -93,7 +93,7 @@ public: void format( int start = -1, bool doMove = TRUE ); /// Call this to ensure that format() will be called on this paragraph later on - void invalidate( int chr /*ignored*/ = 0 ); + void tqinvalidate( int chr /*ignored*/ = 0 ); /// Returns false if format() needs to be called on this paragraph bool isValid() const; @@ -130,9 +130,9 @@ public: void setFormat( int index, int len, const KoTextFormat *f, bool useCollection = TRUE, int flags = -1 ); - void setAlignment( uint a ); - void setAlignmentDirect( uint a ) { align = a; } - uint alignment() const; + void tqsetAlignment( uint a ); + void tqsetAlignmentDirect( uint a ) { align = a; } + uint tqalignment() const; virtual void paint( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections, int clipx, int clipy, int clipw, int cliph ); // kotextparag.cc @@ -214,7 +214,7 @@ public: /** Sets all or some parameters from a paragLayout struct. * @param flags selects which settings to apply, see KoParagLayout's enum. */ - virtual void setParagLayout( const KoParagLayout &layout, int flags = KoParagLayout::All, + virtual void setParagLayout( const KoParagLayout &tqlayout, int flags = KoParagLayout::All, int marginIndex = -1 ); const KoParagLayout & paragLayout() { return m_layout; } @@ -235,9 +235,9 @@ public: void setLineSpacingType( KoParagLayout::SpacingType _type ); - /** Use this to change the paragraph alignment, not KoTextParag::setAlignment ! */ + /** Use this to change the paragraph tqalignment, not KoTextParag::tqsetAlignment ! */ void setAlign( int align ); - /** Return the real alignment: Auto is resolved to either Left or Right */ + /** Return the real tqalignment: Auto is resolved to either Left or Right */ int resolveAlignment() const; /// The part of the top margin that can be broken by a page break @@ -328,7 +328,7 @@ public: /** * Load a section of text from a oasis based xml tree. - * @param parent the xml element that has content as children. + * @param parent the xml element that has content as tqchildren. * @param context the context * @param stripLeadingSpace whether to remove leading literal whitespace */ @@ -336,7 +336,7 @@ public: /** * Load a section of text from a oasis based xml tree. - * @param parent the xml element that has content as children. + * @param parent the xml element that has content as tqchildren. * @param context the context * @param stripLeadingSpace whether to remove leading literal whitespace * @param hasTrailingSpace whether there was trailing literal whitespace in the span's text @@ -520,18 +520,18 @@ inline KoTextDocument *KoTextParag::document() const return doc; } -inline void KoTextParag::setAlignment( uint a ) +inline void KoTextParag::tqsetAlignment( uint a ) { if ( a == align ) return; align = a; - invalidate( 0 ); + tqinvalidate( 0 ); } /*inline void KoTextParag::setListStyle( TQStyleSheetItem::ListStyle ls ) { lstyle = ls; - invalidate( 0 ); + tqinvalidate( 0 ); } inline TQStyleSheetItem::ListStyle KoTextParag::listStyle() const -- cgit v1.2.1