diff options
Diffstat (limited to 'kpresenter/KPrPage.cpp')
| -rw-r--r-- | kpresenter/KPrPage.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index b357ded9..df4ca0fc 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -114,7 +114,7 @@ DCOPObject* KPrPage::dcopObject() if ( !m_dcop ) { // 0-based. 1-based would be nicer for the dcop user, but well, docs and views are 0-based, // and the page(int) DCOP call is 0-based. - int pgnum = m_doc->pageList().tqfindRef( this ); + int pgnum = m_doc->pageList().findRef( this ); m_dcop = new KPrPageIface( this, pgnum ); } @@ -152,7 +152,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC lstappear->objIndex = indexObj; lstappear->appear = true; //kdDebug()<<" indexObj :"<<indexObj<<endl; - lstMap::Iterator tmp = listObjectAnimation.tqfind( it.current()->getAppearStep() ); + lstMap::Iterator tmp = listObjectAnimation.find( it.current()->getAppearStep() ); if ( tmp!= listObjectAnimation.end() ) { //kdDebug()<<" group already exist \n"; @@ -173,7 +173,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC lstappear->objIndex = indexObj; lstappear->appear = false; //kdDebug()<<" indexObj :"<<indexObj<<endl; - lstMap::Iterator tmp = listObjectAnimation.tqfind( it.current()->getDisappearStep() ); + lstMap::Iterator tmp = listObjectAnimation.find( it.current()->getDisappearStep() ); if ( tmp!= listObjectAnimation.end() ) { //kdDebug()<<" group already exist \n"; @@ -563,7 +563,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage TQString drawName( m_manualTitle ); TQRegExp rx( "^page[0-9]+$" ); - if ( drawName.isEmpty() || pageNames.tqcontains( drawName ) || rx.search( drawName ) != -1 ) + if ( drawName.isEmpty() || pageNames.contains( drawName ) || rx.search( drawName ) != -1 ) { drawName = "page" + TQString::number( posPage ); } @@ -927,7 +927,7 @@ void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects ) objectName.remove( rx ); } - if ( usedPageNames.tqcontains( objectName ) ) + if ( usedPageNames.contains( objectName ) ) { usedPageNames[objectName]++; objectName += TQString(" (%1)").tqarg( usedPageNames[objectName] ); @@ -939,7 +939,7 @@ void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects ) int KPrPage::takeObject( KPrObject *object ) { - int pos = m_objectList.tqfindRef( object ); + int pos = m_objectList.findRef( object ); m_objectList.take( pos ); return pos; } @@ -947,7 +947,7 @@ int KPrPage::takeObject( KPrObject *object ) void KPrPage::replaceObject( KPrObject *oldObject, KPrObject *newObject ) { //XXX check if object name gets set - unsigned int pos = m_objectList.tqfindRef( oldObject ); + unsigned int pos = m_objectList.findRef( oldObject ); m_objectList.take( pos ); m_objectList.insert( pos, newObject ); } @@ -988,7 +988,7 @@ void KPrPage::copyObjs(TQDomDocument &doc, TQDomElement &presenter, TQValueList< if ( it.current()->getType() == OT_PICTURE ) { KoPictureKey key = static_cast<KPrPixmapObject *>( it.current() )->getKey(); - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } TQDomElement object=doc.createElement("OBJECT"); @@ -1779,7 +1779,7 @@ void KPrPage::completeLoading( bool _clean, int lastObj ) // get the picture from the collection, and set it in the image/clipart object if ( ( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) { - if ( _clean || m_objectList.tqfindRef( it.current() ) > lastObj ) + if ( _clean || m_objectList.findRef( it.current() ) > lastObj ) { KPrPixmapObject* obj=dynamic_cast<KPrPixmapObject*>( it.current()); if(obj) @@ -1883,7 +1883,7 @@ TQString KPrPage::pageTitle( const TQString &_title ) const { // MASTERPAGE if ( m_masterPage ) - title = i18n( "Slide %1" ).tqarg( m_doc->pageList().tqfindRef( this ) + 1 ); + title = i18n( "Slide %1" ).tqarg( m_doc->pageList().findRef( this ) + 1 ); else title = i18n( "Slide Master" ); } @@ -2314,7 +2314,7 @@ KPrObject * KPrPage::getCursor(const KoPoint &pos ) TQPtrListIterator<KPrObject> it( m_objectList ); KPrObject *kpobject = it.toLast(); while ( kpobject ) { - if ( kpobject->tqcontains( pos ) && kpobject->isSelected() ) + if ( kpobject->contains( pos ) && kpobject->isSelected() ) return kpobject; kpobject = --it; } @@ -2336,7 +2336,7 @@ KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) con ( m_bHasHeader && o == m_doc->header() ) ) { if ( ( o->isSelected() || i > 0 ) && - o->tqcontains( pos ) && !( o->isProtect() && withoutProtected ) ) + o->contains( pos ) && !( o->isProtect() && withoutProtected ) ) return o; } o = --it; @@ -2458,7 +2458,7 @@ KPrObject *KPrPage::nextTextObject(KPrTextObject *obj) return 0L; int pos = -1; if ( obj ) - pos = m_objectList.tqfindNextRef(obj); + pos = m_objectList.findNextRef(obj); if (pos != -1 ) { @@ -2485,7 +2485,7 @@ KPrObject *KPrPage::nextTextObject(KPrTextObject *obj) bool KPrPage::findTextObject( KPrObject *obj ) { - return (m_objectList.tqfindRef( obj )>=0 ); + return (m_objectList.findRef( obj )>=0 ); } void KPrPage::getAllObjectSelectedList(TQPtrList<KPrObject> &lst, bool force ) |