diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | b6edfe41c9395f2e20784cbf0e630af6426950a3 (patch) | |
tree | 56ed9b871d4296e6c15949c24e16420be1b28697 /kword/KWFrameSet.cpp | |
parent | ef39e8e4178a8f98cf5f154916ba0f03e4855206 (diff) | |
download | koffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.tar.gz koffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kword/KWFrameSet.cpp')
-rw-r--r-- | kword/KWFrameSet.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index b8b9f8d0..d1129b1f 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -76,7 +76,7 @@ KWFrameSet::~KWFrameSet() void KWFrameSet::addFrame( KWFrame *frame, bool recalc ) { - if ( m_frames.tqfindRef( frame ) != -1 ) + if ( m_frames.findRef( frame ) != -1 ) return; //kdDebug(32001) << k_funcinfo << name() << " adding frame" << frame << " recalc=" << recalc << endl; @@ -96,7 +96,7 @@ void KWFrameSet::deleteFrame( unsigned int num, bool remove, bool recalc ) KWFrame *frm = m_frames.at( num ); Q_ASSERT( frm ); m_frames.take( num ); - Q_ASSERT( !m_frames.tqcontains(frm) ); + Q_ASSERT( !m_frames.contains(frm) ); unsigned int index = frm->pageNumber() - m_firstPage; if(m_framesInPage.count() >= index) { @@ -127,7 +127,7 @@ void KWFrameSet::deleteFrame( unsigned int num, bool remove, bool recalc ) void KWFrameSet::deleteFrame( KWFrame *frm, bool remove, bool recalc ) { //kdDebug(32001) << "KWFrameSet::deleteFrame " << frm << " remove=" << remove << endl; - int num = m_frames.tqfindRef( frm ); + int num = m_frames.findRef( frm ); Q_ASSERT( num != -1 ); if ( num == -1 ) return; @@ -505,7 +505,7 @@ KWFrame * KWFrameSet::frameAtPos( double x, double y ) const KoPoint docPoint( x, y ); TQPtrListIterator<KWFrame> frameIt = frameIterator(); for ( ; frameIt.current(); ++frameIt ) - if ( frameIt.current()->tqcontains( docPoint ) ) + if ( frameIt.current()->contains( docPoint ) ) return frameIt.current(); return 0L; } @@ -518,7 +518,7 @@ KWFrame *KWFrameSet::frame( unsigned int num ) const int KWFrameSet::frameFromPtr( KWFrame *frame ) { - return m_frames.tqfindRef( frame ); + return m_frames.findRef( frame ); } KWFrame * KWFrameSet::settingsFrame( const KWFrame* frame ) @@ -971,9 +971,9 @@ KWFrame* KWFrameSet::loadOasisFrame( const TQDomElement& tag, KoOasisContext& co // A frame with protected size means that the frameset is size-protected (hmm, kword did it that way) // TODO implement position protection TQString protectList = context.styleStack().attributeNS( KoXmlNS::style, "protect" ); - if ( protectList.tqcontains( "content" ) ) + if ( protectList.contains( "content" ) ) setProtectContent( true ); - if ( protectList.tqcontains( "size" ) ) + if ( protectList.contains( "size" ) ) m_protectSize = true; // TODO m_visible ? User-toggeable or internal? @@ -1164,14 +1164,14 @@ bool KWFrameSet::isFrameAtPos( const KWFrame* frame, const TQPoint& point, bool outerRect.rTop() -= margin; outerRect.rRight() += margin; outerRect.rBottom() += margin; - if ( outerRect.tqcontains( point ) ) { + if ( outerRect.contains( point ) ) { if(borderOfFrameOnly) { TQRect innerRect( m_doc->zoomRect( *frame ) ); innerRect.rLeft() += margin; innerRect.rTop() += margin; innerRect.rRight() -= margin; innerRect.rBottom() -= margin; - return (!innerRect.tqcontains(point) ); + return (!innerRect.contains(point) ); } return true; } |