summaryrefslogtreecommitdiffstats
path: root/kpresenter
diff options
context:
space:
mode:
Diffstat (limited to 'kpresenter')
-rw-r--r--kpresenter/KPrAutoformObject.cpp6
-rw-r--r--kpresenter/KPrBackground.cpp14
-rw-r--r--kpresenter/KPrCanvas.cpp32
-rw-r--r--kpresenter/KPrCommand.cpp4
-rw-r--r--kpresenter/KPrConfig.cpp8
-rw-r--r--kpresenter/KPrCustomSlideShowDia.cpp2
-rw-r--r--kpresenter/KPrDocument.cpp60
-rw-r--r--kpresenter/KPrDocument.h2
-rw-r--r--kpresenter/KPrEffectHandler.cpp4
-rw-r--r--kpresenter/KPrFindReplace.h4
-rw-r--r--kpresenter/KPrGotoPage.cpp2
-rw-r--r--kpresenter/KPrImportStyleDia.cpp2
-rw-r--r--kpresenter/KPrNoteBar.cpp2
-rw-r--r--kpresenter/KPrObject.cpp6
-rw-r--r--kpresenter/KPrObject.h6
-rw-r--r--kpresenter/KPrPage.cpp28
-rw-r--r--kpresenter/KPrPixmapObject.cpp8
-rw-r--r--kpresenter/KPrSideBar.cpp22
-rw-r--r--kpresenter/KPrTextObject.cpp6
-rw-r--r--kpresenter/KPrView.cpp36
-rw-r--r--kpresenter/KPrWebPresentation.cpp4
-rw-r--r--kpresenter/autoformEdit/ATFInterpreter.cpp2
22 files changed, 130 insertions, 130 deletions
diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp
index 774f9f3e..88245f6d 100644
--- a/kpresenter/KPrAutoformObject.cpp
+++ b/kpresenter/KPrAutoformObject.cpp
@@ -174,15 +174,15 @@ double KPrAutoformObject::load(const TQDomElement &element)
if(filename[0]=='/') {
kdDebug(33001) << "rubbish ahead! cleaning up..." << endl;
// remove the leading absolute path (i.e. to create Arrow/Arrow1.atf)
- filename=filename.mid(filename.tqfindRev('/', filename.tqfindRev('/')-1)+1);
+ filename=filename.mid(filename.findRev('/', filename.findRev('/')-1)+1);
}
// okay... we changed the file format again and now the autoforms
// are stored in .../kpresenter/autoforms/.source/foo.atf (note: we didn't have .source
// before. Therefore we have to add this dir if it's not already there to make it
// work with old files
- if(filename.tqfind(".source")==-1) {
+ if(filename.find(".source")==-1) {
// okay, old file -- add the .source dir
- filename=filename.insert(filename.tqfind('/'), "/.source");
+ filename=filename.insert(filename.find('/'), "/.source");
}
filename = locate("autoforms", filename, KPrFactory::global());
atfInterp.load( filename );
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index e2d08fa2..66102045 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -276,7 +276,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context )
if ( !href.isEmpty() )
{
TQString strExtension;
- const int result=href.tqfindRev(".");
+ const int result=href.findRev(".");
if (result>=0)
{
strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
@@ -435,11 +435,11 @@ void KPrBackGround::load( const TQDomElement &element )
_fileName=e.attribute("filename");
if ( !_fileName.isEmpty() )
{
- if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 )
+ if ( int _envVarB = _fileName.find( '$' ) >= 0 )
{
- int _envVarE = _fileName.tqfind( '/', _envVarB );
+ int _envVarE = _fileName.find( '/', _envVarB );
TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) );
- _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path );
+ _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path );
}
}
if ( openPic )
@@ -481,11 +481,11 @@ void KPrBackGround::load( const TQDomElement &element )
_fileName=e.attribute("filename");
if ( !_fileName.isEmpty() )
{
- if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 )
+ if ( int _envVarB = _fileName.find( '$' ) >= 0 )
{
- int _envVarE = _fileName.tqfind( '/', _envVarB );
+ int _envVarE = _fileName.find( '/', _envVarB );
TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) );
- _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path );
+ _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path );
}
}
//KPClipartKey clipKey( _fileName, TQDateTime( pictureCollection()->tmpDate(),
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index 9e8d1815..2ada2d93 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -602,7 +602,7 @@ void KPrCanvas::drawEditPage( TQPainter *painter, const TQRect &_rect,
{
KoRect rect = m_view->zoomHandler()->unzoomRect(_rect);
- int pageNum = m_view->kPresenterDoc()->pageList().tqfindRef( page );
+ int pageNum = m_view->kPresenterDoc()->pageList().findRef( page );
//objects on master page
if ( page->masterPage() && page->displayObjectFromMasterPage() )
drawObjectsEdit( painter, rect, page->masterPage()->objectList(), selectionMode, pageNum );
@@ -641,7 +641,7 @@ void KPrCanvas::drawGrid(TQPainter *painter, const TQRect &rect2) const
for ( double i = offsetX; ( zoomedX = m_view->zoomHandler()->zoomItX( i )+pageRect.left() ) < pageRect.right(); i += offsetX )
for ( double j = offsetY; ( zoomedY = m_view->zoomHandler()->zoomItY( j )+pageRect.top() ) < pageRect.bottom(); j += offsetY )
- if( rect2.tqcontains( zoomedX, zoomedY ) )
+ if( rect2.contains( zoomedX, zoomedY ) )
painter->drawPoint( zoomedX, zoomedY );
painter->restore();
@@ -691,7 +691,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e )
{
KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject();
Q_ASSERT(txtObj);
- if(txtObj->tqcontains( docPoint ))
+ if(txtObj->contains( docPoint ))
{
KoPoint pos = docPoint - txtObj->innerRect().topLeft(); // in pt, but now translated into the object's coordinate system
// This is common to all mouse buttons, so that RMB and MMB place the cursor too
@@ -1406,7 +1406,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e )
KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject();
Q_ASSERT(txtObj);
- if(txtObj->tqcontains( docPoint )&&mousePressed)
+ if(txtObj->contains( docPoint )&&mousePressed)
{
KoPoint pos = docPoint - txtObj->innerRect().topLeft();
m_currentTextObjectView->mouseMoveEvent( e, m_view->zoomHandler()->ptToLayoutUnitPix( pos ) ); // in LU pixels
@@ -1824,7 +1824,7 @@ void KPrCanvas::mouseDoubleClickEvent( TQMouseEvent *e )
{
KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject();
Q_ASSERT(txtObj);
- if(txtObj->tqcontains( docPoint ))
+ if(txtObj->contains( docPoint ))
{
KoPoint pos = docPoint - txtObj->getOrig();
//pos=m_view->zoomHandler()->pixelToLayoutUnit(TQPoint(pos.x(),pos.y()));
@@ -1834,7 +1834,7 @@ void KPrCanvas::mouseDoubleClickEvent( TQMouseEvent *e )
}
//disallow activating objects outside the "page"
- if ( !m_activePage->getPageRect().tqcontains(docPoint))
+ if ( !m_activePage->getPageRect().contains(docPoint))
return;
@@ -3034,7 +3034,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
// Then try to see if there is still one step to do in the current page
if ( m_step.m_step < *( --m_pageEffectSteps.end() ) )
{
- TQValueList<int>::ConstIterator it = m_pageEffectSteps.tqfind( m_step.m_step );
+ TQValueList<int>::ConstIterator it = m_pageEffectSteps.find( m_step.m_step );
m_step.m_step = *( ++it );
m_step.m_subStep = 0;
//kdDebug(33001) << "Page::pNext setting currentEffectStep to " << m_step.m_step << endl;
@@ -3169,7 +3169,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage )
m_drawModeLines.clear();
if ( !gotoPreviousPage && m_step.m_step > *m_pageEffectSteps.begin() ) {
- TQValueList<int>::ConstIterator it = m_pageEffectSteps.tqfind( m_step.m_step );
+ TQValueList<int>::ConstIterator it = m_pageEffectSteps.find( m_step.m_step );
m_step.m_step = *( --it );
//hopefully there are never more than 1000 sub steps :-)
m_step.m_subStep = 1000;
@@ -3898,7 +3898,7 @@ void KPrCanvas::selectNext()
if ( m_activePage->numSelected() == 0 )
objectList().at( 0 )->setSelected( true );
else {
- int i = objectList().tqfindRef( m_activePage->getSelectedObj() );
+ int i = objectList().findRef( m_activePage->getSelectedObj() );
if ( i < static_cast<int>( objectList().count() ) - 1 ) {
m_view->kPresenterDoc()->deSelectAllObj();
objectList().at( ++i )->setSelected( true );
@@ -3917,7 +3917,7 @@ void KPrCanvas::selectPrev()
if ( m_activePage->numSelected() == 0 )
objectList().at( objectList().count() - 1 )->setSelected( true );
else {
- int i = objectList().tqfindRef( m_activePage->getSelectedObj() );
+ int i = objectList().findRef( m_activePage->getSelectedObj() );
if ( i > 0 ) {
m_view->kPresenterDoc()->deSelectAllObj();
objectList().at( --i )->setSelected( true );
@@ -4001,7 +4001,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
{
//disallow dropping objects outside the "page"
KoPoint docPoint = m_view->zoomHandler()->unzoomPoint( e->pos()+TQPoint(diffx(),diffy()) );
- if ( !m_activePage->getZoomPageRect().tqcontains(e->pos()))
+ if ( !m_activePage->getZoomPageRect().contains(e->pos()))
return;
if ( TQImageDrag::canDecode( e ) ) {
@@ -4030,12 +4030,12 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
if ( res && res->isValid() ) {
TQString mimetype = res->mimeType();
- if ( mimetype.tqcontains( "image" ) ) {
+ if ( mimetype.contains( "image" ) ) {
TQCursor c = cursor();
setCursor( waitCursor );
m_activePage->insertPicture( filename, docPoint );
setCursor( c );
- } else if ( mimetype.tqcontains( "text" ) ) {
+ } else if ( mimetype.contains( "text" ) ) {
TQCursor c = cursor();
setCursor( waitCursor );
TQFile f( filename );
@@ -4106,7 +4106,7 @@ void KPrCanvas::gotoPage( int pg )
m_step.m_pageNumber = page;
kdDebug(33001) << "Page::gotoPage m_step.m_pageNumber =" << m_step.m_pageNumber << endl;
- m_presentationSlidesIterator = m_presentationSlides.tqfind( m_step.m_pageNumber + 1 );
+ m_presentationSlidesIterator = m_presentationSlides.find( m_step.m_pageNumber + 1 );
editMode = false;
m_drawMode = false;
m_pageEffectSteps = m_view->kPresenterDoc()->getPageEffectSteps( m_step.m_pageNumber );
@@ -4996,7 +4996,7 @@ const TQPtrList<KPrObject> KPrCanvas::displayObjectList() const
{
// it can happen that the object is no longer there e.g. when
// the insert of the object is undone
- int pos = objectList().tqfindRef( m_objectDisplayAbove );
+ int pos = objectList().findRef( m_objectDisplayAbove );
if ( pos != -1 && m_objectDisplayAbove->isSelected() )
{
list.take( pos );
@@ -5416,7 +5416,7 @@ KPrTextObject* KPrCanvas::textUnderMouse( const TQPoint & point )
TQPtrListIterator<KPrTextObject> it2(obj );
for ( ; it2.current() ; ++it2 ) {
TQRect outerRect( m_view->kPresenterDoc()->zoomHandler()->zoomRect( it2.current()->getRect()) );
- if ( !it2.current()->isProtectContent() && outerRect.tqcontains( point) )
+ if ( !it2.current()->isProtectContent() && outerRect.contains( point) )
return it2.current();
}
return 0L;
diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp
index 491976cc..5236aaf6 100644
--- a/kpresenter/KPrCommand.cpp
+++ b/kpresenter/KPrCommand.cpp
@@ -668,7 +668,7 @@ void KPrInsertCmd::unexecute()
{
TQRect oldRect = m_doc->zoomHandler()->zoomRect( m_object->getRepaintRect() );
TQPtrList<KPrObject> list(m_page->objectList());
- if ( list.tqfindRef( m_object ) != -1 ) {
+ if ( list.findRef( m_object ) != -1 ) {
m_page->takeObject( m_object );
m_object->removeFromObjList();
if ( m_object->getType() == OT_TEXT )
@@ -688,7 +688,7 @@ void KPrInsertCmd::unexecute()
TQValueListConstIterator<KPrObject *> it( m_objects.begin() );
for ( ; it != m_objects.end(); ++it )
{
- if ( list.tqfindRef( *it ) != -1 )
+ if ( list.findRef( *it ) != -1 )
{
m_page->takeObject( *it );
( *it )->removeFromObjList();
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index a5cf24fe..da37a08e 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -992,17 +992,17 @@ void KPrConfigurePathPage::slotModifyPath()
void KPrConfigurePathPage::slotDefault()
{
- TQListViewItem * item = m_pPathView->tqfindItem(i18n("Picture Path"), 0);
+ TQListViewItem * item = m_pPathView->findItem(i18n("Picture Path"), 0);
if ( item )
item->setText(1, KGlobalSettings::documentPath());
- item = m_pPathView->tqfindItem(i18n("Backup Path"), 0);
+ item = m_pPathView->findItem(i18n("Backup Path"), 0);
if ( item )
item->setText(1, TQString() );
}
void KPrConfigurePathPage::apply()
{
- TQListViewItem *item = m_pPathView->tqfindItem(i18n("Backup Path"), 0);
+ TQListViewItem *item = m_pPathView->findItem(i18n("Backup Path"), 0);
if ( item )
{
TQString res = item->text(1 );
@@ -1017,7 +1017,7 @@ void KPrConfigurePathPage::apply()
#endif
}
}
- item = m_pPathView->tqfindItem(i18n("Picture Path"), 0);
+ item = m_pPathView->findItem(i18n("Picture Path"), 0);
if ( item )
{
TQString res = item->text(1 );
diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp
index 19072278..2cc74ef8 100644
--- a/kpresenter/KPrCustomSlideShowDia.cpp
+++ b/kpresenter/KPrCustomSlideShowDia.cpp
@@ -445,7 +445,7 @@ TQString KPrDefineCustomSlideShow::customSlideShowName() const
void KPrDefineCustomSlideShow::slotOk()
{
- if ( listNameCustomSlideShow.tqcontains( m_name->text() ) )
+ if ( listNameCustomSlideShow.contains( m_name->text() ) )
{
KMessageBox::error(this, i18n("Custom Slide Show name is already used."), i18n("Define Custom Slide Show"));
}
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 0b33a507..1a884752 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -616,7 +616,7 @@ TQDomDocument KPrDocument::saveXML()
TQValueListIterator<KPrPage*> itPage ;
for( itPage = ( *it ).begin(); itPage != ( *it ).end(); ++itPage )
{
- int posPage = m_pageList.tqfind( *itPage );
+ int posPage = m_pageList.find( *itPage );
if ( posPage != -1 )
{
if ( itPage != ( *it ).begin() )
@@ -715,9 +715,9 @@ void KPrDocument::saveEmbeddedObject(KPrPage *page, const TQPtrList<KoDocumentCh
TQPtrListIterator<KoDocumentChild> chl( childList );
double offset = 0.0;
// we need no offset for objects on the master page and when we copy a page
- if ( m_pageList.tqfindRef( page ) )
+ if ( m_pageList.findRef( page ) )
{
- offset=m_pageList.tqfindRef(page)*page->getPageRect().height();
+ offset=m_pageList.findRef(page)*page->getPageRect().height();
}
for( ; chl.current(); ++chl )
saveEmbeddedObject(page, chl.current(),doc,presenter, offset );
@@ -890,7 +890,7 @@ TQDomElement KPrDocument::saveAttribute( TQDomDocument &doc )
int activePage=0;
if ( m_initialActivePage )
- activePage=m_pageList.tqfindRef(m_initialActivePage);
+ activePage=m_pageList.findRef(m_initialActivePage);
activePage = TQMAX( activePage, 0);
attributes.setAttribute("activePage",activePage );
attributes.setAttribute("gridx", m_gridX );
@@ -907,7 +907,7 @@ TQDomElement KPrDocument::saveUsedSoundFileToXML( TQDomDocument &_doc, TQStringL
TQStringList::Iterator it = _list.begin();
for ( ; it != _list.end(); ++it ) {
TQString soundFileName = *it;
- int position = soundFileName.tqfindRev( '.' );
+ int position = soundFileName.findRev( '.' );
TQString format = soundFileName.right( soundFileName.length() - position - 1 );
TQString _name = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() );
@@ -953,7 +953,7 @@ void KPrDocument::saveUsedSoundFileToStore( KoStore *_store, TQStringList _list
TQStringList::Iterator it = _list.begin();
for ( ; it != _list.end(); ++it ) {
TQString soundFileName = *it;
- int position = soundFileName.tqfindRev( '.' );
+ int position = soundFileName.findRev( '.' );
TQString format = soundFileName.right( soundFileName.length() - position - 1 );
TQString _storeURL = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() );
@@ -1301,7 +1301,7 @@ void KPrDocument::saveOasisSettings( KoXmlWriter &settingsWriter )
//store first view parameter.
int activePage=0;
if ( m_initialActivePage )
- activePage=m_pageList.tqfindRef(m_initialActivePage);
+ activePage=m_pageList.findRef(m_initialActivePage);
activePage = TQMAX( activePage, 0);
settingsWriter.addConfigItem( "SelectedPage", activePage );
@@ -1406,7 +1406,7 @@ void KPrDocument::loadOasisPresentationCustomSlideShow( TQDomNode &settingsDoc )
TQValueList<KPrPage *> pageList;
for ( TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it )
{
- if ( m_loadingInfo->m_name2page.tqcontains( *it ) )
+ if ( m_loadingInfo->m_name2page.contains( *it ) )
{
kdDebug(33001) << "slide show " << name << " page = " << *it << endl;
pageList.push_back( m_loadingInfo->m_name2page[*it] );
@@ -1450,7 +1450,7 @@ void KPrDocument::saveOasisPresentationCustomSlideShow( KoXmlWriter &contentTmpW
TQValueListIterator<KPrPage*> itPage ;
for( itPage = ( *it ).begin(); itPage != ( *it ).end(); ++itPage )
{
- int posPage = m_pageList.tqfind(*itPage );
+ int posPage = m_pageList.find(*itPage );
if ( posPage != -1 )
{
if ( itPage != ( *it ).begin() )
@@ -2314,7 +2314,7 @@ void KPrDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCo
kppartobject = 0L;
return;
}
- int index = m_pageList.tqfindRef(page);
+ int index = m_pageList.findRef(page);
int pageIndex = (int)(offset/__pgLayout.ptHeight)+index;
int newPos=(int)((offset+index*__pgLayout.ptHeight)-pageIndex*__pgLayout.ptHeight);
kppartobject->setOrig(kppartobject->getOrig().x(),newPos);
@@ -2644,7 +2644,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc )
TQValueList<KPrPage *> pageList;
for ( TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it )
{
- if ( name2page.tqcontains( *it ) )
+ if ( name2page.contains( *it ) )
{
kdDebug(33001) << "slide show " << slide.attribute( "name" ) << " page = " << *it << endl;
pageList.push_back( name2page[*it] );
@@ -3225,7 +3225,7 @@ void KPrDocument::loadUsedSoundFileFromStore( KoStore *_store, TQStringList _lis
char *data = new char[size];
dev.readBlock( data, size );
- int position = soundFile.tqfindRev( '.' );
+ int position = soundFile.findRev( '.' );
TQString format = soundFile.right( soundFile.length() - position );
KTempFile *tmpFile = new KTempFile( TQString(), format );
tmpFile->setAutoDelete( true );
@@ -3391,13 +3391,13 @@ void KPrDocument::setEmpty()
// If we then load a document, it will override that date.
}
-void KPrDocument::setGridValue( double _x, double _y, bool _tqreplace )
+void KPrDocument::setGridValue( double _x, double _y, bool _replace )
{
oldGridX = m_gridX;
oldGridY = m_gridY;
m_gridX=_x;
m_gridY=_y;
- if ( _tqreplace )
+ if ( _replace )
replaceObjs();
}
@@ -3505,7 +3505,7 @@ void KPrDocument::deletePage( int _page )
void KPrDocument::insertPage( KPrPage *page, int currentPageNum, int insertPageNum )
{
// check if page was allready deleted
- int pos = m_deletedPageList.tqfindRef( page );
+ int pos = m_deletedPageList.findRef( page );
if ( pos != -1 )
m_deletedPageList.take( pos );
@@ -3533,7 +3533,7 @@ void KPrDocument::insertPage( KPrPage *page, int currentPageNum, int insertPageN
void KPrDocument::takePage( KPrPage *page, int pageNum )
{
- int pos = m_pageList.tqfindRef( page );
+ int pos = m_pageList.findRef( page );
m_pageList.take( pos );
m_deletedPageList.append( page );
@@ -3821,17 +3821,17 @@ void KPrDocument::makeUsedSoundFileList()
TQPtrListIterator<KPrPage> it( m_pageList );
for ( ; it.current(); ++it ) {
TQString _file = it.current()->getPageSoundFileName();
- if ( !_file.isEmpty() && usedSoundFile.tqfindIndex( _file ) == -1 )
+ if ( !_file.isEmpty() && usedSoundFile.findIndex( _file ) == -1 )
usedSoundFile.append( _file );
TQPtrListIterator<KPrObject> oIt( it.current()->objectList() );
for ( ; oIt.current(); ++oIt ) {
_file = oIt.current()->getAppearSoundEffectFileName();
- if ( !_file.isEmpty() && usedSoundFile.tqfindIndex( _file ) == -1 )
+ if ( !_file.isEmpty() && usedSoundFile.findIndex( _file ) == -1 )
usedSoundFile.append( _file );
_file = oIt.current()->getDisappearSoundEffectFileName();
- if ( !_file.isEmpty() && usedSoundFile.tqfindIndex( _file ) == -1 )
+ if ( !_file.isEmpty() && usedSoundFile.findIndex( _file ) == -1 )
usedSoundFile.append( _file );
}
}
@@ -3861,7 +3861,7 @@ void KPrDocument::paintContent( TQPainter& painter, const TQRect& rect,
if( m_initialActivePage )
page = m_initialActivePage;
- int pageNum = m_pageList.tqfindRef( page );
+ int pageNum = m_pageList.findRef( page );
if ( page->displayBackground() )
page->background()->drawBackground( &painter, zoomHandler(), rect, false );
@@ -4009,7 +4009,7 @@ void KPrDocument::selectPage( int pgNum /* 0-based */, bool select )
KPrPage * KPrDocument::findPage(KPrObject *object)
{
TQPtrList<KPrObject> masterObjects( m_masterPage->objectList() );
- if ( masterObjects.tqfindRef( object ) != -1 )
+ if ( masterObjects.findRef( object ) != -1 )
{
//kdDebug(33001) << "Object is on the master page" << endl;
return m_masterPage;
@@ -4017,8 +4017,8 @@ KPrPage * KPrDocument::findPage(KPrObject *object)
TQPtrListIterator<KPrPage> it( m_pageList );
for ( ; it.current(); ++it ) {
TQPtrList<KPrObject> list( it.current()->objectList() );
- if ( list.tqfindRef( object ) != -1 ) {
- //kdDebug(33001) << "Object is on page " << m_pageList.tqfindRef(it.current()) + 1 << endl;
+ if ( list.findRef( object ) != -1 ) {
+ //kdDebug(33001) << "Object is on page " << m_pageList.findRef(it.current()) + 1 << endl;
return it.current();
}
}
@@ -4031,7 +4031,7 @@ KPrPage * KPrDocument::findPage(TQPtrList<KPrObject> &objects)
KPrObject *object;
for ( object = objects.first(); object; object=objects.next() ) {
TQPtrList<KPrObject> list( m_masterPage->objectList() );
- if ( list.tqfindRef( object ) != -1 )
+ if ( list.findRef( object ) != -1 )
{
//kdDebug(33001) << "Object is on the master page" << endl;
return m_masterPage;
@@ -4040,8 +4040,8 @@ KPrPage * KPrDocument::findPage(TQPtrList<KPrObject> &objects)
object = objects.first();
for ( KPrPage *page=m_pageList.first(); page; page=m_pageList.next() ) {
TQPtrList<KPrObject> list( page->objectList() );
- if ( list.tqfindRef( object ) != -1 ) {
- //kdDebug(33001) << "The Objects are on page " << m_pageList.tqfindRef(page) + 1 << endl;
+ if ( list.findRef( object ) != -1 ) {
+ //kdDebug(33001) << "The Objects are on page " << m_pageList.findRef(page) + 1 << endl;
return page;
}
}
@@ -4070,7 +4070,7 @@ TQValueList<int> KPrDocument::listOfDisplaySelectedSlides( const TQValueList<KPr
TQValueListConstIterator<KPrPage*> itPageEnd = lst.end();
for( itPage = lst.begin() ; itPage != itPageEnd; ++itPage )
{
- int pageNum = m_pageList.tqfind(*itPage );
+ int pageNum = m_pageList.find(*itPage );
if ( pageNum != -1 )
{
kdDebug()<<" KPrDocument::displaySelectedSlide : add slide number :"<<pageNum<<endl;
@@ -4254,7 +4254,7 @@ void KPrDocument::insertObjectInPage(double offset, KPrObject *_obj, int pos)
void KPrDocument::insertPixmapKey( KoPictureKey key )
{
- if ( !usedPictures.tqcontains( key ) )
+ if ( !usedPictures.contains( key ) )
usedPictures.append( key );
}
@@ -4601,7 +4601,7 @@ void KPrDocument::setSpellCheckIgnoreList( const TQStringList& lst )
void KPrDocument::addSpellCheckIgnoreWord( const TQString & word )
{
// ### missing: undo/redo support
- if( m_spellCheckIgnoreList.tqfindIndex( word ) == -1 )
+ if( m_spellCheckIgnoreList.findIndex( word ) == -1 )
m_spellCheckIgnoreList.append( word );
setSpellCheckIgnoreList( m_spellCheckIgnoreList );
}
@@ -4777,7 +4777,7 @@ void KPrDocument::addWordToDictionary( const TQString & word)
{
if ( m_bgSpellCheck )
{
- if( m_spellCheckPersonalDict.tqfindIndex( word ) == -1 )
+ if( m_spellCheckPersonalDict.findIndex( word ) == -1 )
m_spellCheckPersonalDict.append( word );
m_bgSpellCheck->settings()->setCurrentIgnoreList( m_spellCheckIgnoreList + m_spellCheckPersonalDict );
if ( backgroundSpellCheckEnabled() )
diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h
index c472c3a3..f5921b65 100644
--- a/kpresenter/KPrDocument.h
+++ b/kpresenter/KPrDocument.h
@@ -189,7 +189,7 @@ class KPrDocument : public KoDocument
void insertObjectInPage(double offset, KPrObject *_obj, int pos = -1);
- void setGridValue( double rx, double ry, bool _tqreplace = true );
+ void setGridValue( double rx, double ry, bool _replace = true );
// get - set options for editmodi
TQColor txtBackCol() const { return _txtBackCol; }
diff --git a/kpresenter/KPrEffectHandler.cpp b/kpresenter/KPrEffectHandler.cpp
index a63ad1d2..acbdf7a7 100644
--- a/kpresenter/KPrEffectHandler.cpp
+++ b/kpresenter/KPrEffectHandler.cpp
@@ -1028,12 +1028,12 @@ void KPrEffectHandler::drawObject( KPrObject *object, int x, int y, TQPixmap *sc
p.translate( -x, -y );
// redraw objects which lie above the currenty drawn
- m_objects.tqfindRef( object );
+ m_objects.findRef( object );
KPrObject *obj;
while ( ( obj = m_objects.next() ) != 0 )
{
if ( ( obj->getAppearStep() < m_step.m_step
- || obj->getAppearStep() == m_step.m_step && !m_appearEffectObjects.tqcontainsRef( obj ) )
+ || obj->getAppearStep() == m_step.m_step && !m_appearEffectObjects.containsRef( obj ) )
&& ( ( obj->getDisappear() && obj->getDisappearStep() > m_step.m_step ) || ! obj->getDisappear() )
&& m_view->zoomHandler()->zoomRect( obj->getRealRect()).intersects(*m_repaintRects.getLast()) )
{
diff --git a/kpresenter/KPrFindReplace.h b/kpresenter/KPrFindReplace.h
index 7754aa39..54ee6861 100644
--- a/kpresenter/KPrFindReplace.h
+++ b/kpresenter/KPrFindReplace.h
@@ -35,8 +35,8 @@ class KPrTextView;
class KPrFindReplace;
class KCommand;
/**
- * This class implements the 'tqfind' functionality ( the "search next, prompt" loop )
- * and the 'tqreplace' functionality. Same class, to allow centralizing the code that
+ * This class implements the 'find' functionality ( the "search next, prompt" loop )
+ * and the 'replace' functionality. Same class, to allow centralizing the code that
* finds the framesets and paragraphs to look into.
*/
class KPrFindReplace : public KoFindReplace
diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp
index 6a3f8592..fb9ef42a 100644
--- a/kpresenter/KPrGotoPage.cpp
+++ b/kpresenter/KPrGotoPage.cpp
@@ -81,7 +81,7 @@ int KPrGotoPage::gotoPage( const KPrDocument *doc,
int KPrGotoPage::page() const {
if(result()==TQDialog::Accepted)
- return spinbox->currentText().left( spinbox->currentText().tqfind( "-" ) - 1 ).toInt();
+ return spinbox->currentText().left( spinbox->currentText().find( "-" ) - 1 ).toInt();
return oldPage;
}
diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp
index 72d3b9ab..f649ebc1 100644
--- a/kpresenter/KPrImportStyleDia.cpp
+++ b/kpresenter/KPrImportStyleDia.cpp
@@ -127,7 +127,7 @@ void KPrImportStyleDia::loadFile()
unsigned int i=0;
for( TQValueList<TQString>::Iterator it = followingStyles.begin(); it != followingStyles.end(); ++it ) {
TQString newName =*it;
- if ( insertStyle.tqcontains( *it ) )
+ if ( insertStyle.contains( *it ) )
newName = (insertStyle)[ *it ];
KoParagStyle * style = m_styleList.findStyle(newName);
diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp
index 9862e2c6..10048537 100644
--- a/kpresenter/KPrNoteBar.cpp
+++ b/kpresenter/KPrNoteBar.cpp
@@ -168,7 +168,7 @@ TQString KPrNoteBar::getNotesTextForPrinting(TQValueList<int> _list) const
KPrDocument *doc=view->kPresenterDoc();
for ( int i = 0; i < static_cast<int>( doc->pageList().count() ); i++, ++pageCount )
{
- if (_list.tqcontains(i+1)==0) // that slide isn't printed, don't print its note either
+ if (_list.contains(i+1)==0) // that slide isn't printed, don't print its note either
continue;
if ( !firstText )
diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp
index 8c0284a3..5a03896a 100644
--- a/kpresenter/KPrObject.cpp
+++ b/kpresenter/KPrObject.cpp
@@ -854,7 +854,7 @@ void KPrObject::loadOasis(const TQDomElement &element, KoOasisContext & context,
styleStack.attributeNS( KoXmlNS::fo, "text-shadow" ) != "none" )
{
TQString distance = styleStack.attributeNS( KoXmlNS::fo, "text-shadow" );
- distance.truncate( distance.tqfind( ' ' ) );
+ distance.truncate( distance.find( ' ' ) );
shadowDistance = (int)KoUnit::parseValue( distance );
shadowDirection = SD_RIGHT_BOTTOM;
shadowColor= TQColor("#a0a0a0" );
@@ -1244,9 +1244,9 @@ void KPrObject::rotateObject(TQPainter *paint,KoTextZoomHandler *_zoomHandler)
paint->setWorldMatrix( m, true );
}
-bool KPrObject::tqcontains( const KoPoint &point ) const
+bool KPrObject::contains( const KoPoint &point ) const
{
- return getRealRect().tqcontains( point );
+ return getRealRect().contains( point );
}
bool KPrObject::intersects( const KoRect &rect ) const
diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h
index 598373ea..7b39be50 100644
--- a/kpresenter/KPrObject.h
+++ b/kpresenter/KPrObject.h
@@ -250,7 +250,7 @@ public:
* @return true if point lies in rect of object
* @return false otherwise
*/
- virtual bool tqcontains( const KoPoint &point ) const;
+ virtual bool contains( const KoPoint &point ) const;
/**
* @brief Check if rect intersects with rect of object
@@ -289,8 +289,8 @@ public:
/**
* Collect all textobjects.
- * (KPrTextObject returns the object it tqcontains,
- * a KPrGroupObject returns all the text objects it tqcontains)
+ * (KPrTextObject returns the object it contains,
+ * a KPrGroupObject returns all the text objects it contains)
*/
virtual void addTextObjects( TQPtrList<KoTextObject> & ) const {}
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 )
diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp
index d64c5b60..0a4c8921 100644
--- a/kpresenter/KPrPixmapObject.cpp
+++ b/kpresenter/KPrPixmapObject.cpp
@@ -359,7 +359,7 @@ void KPrPixmapObject::loadOasis(const TQDomElement &element, KoOasisContext & co
if ( !href.isEmpty() /*&& href[0] == '#'*/ )
{
TQString strExtension;
- const int result=href.tqfindRev(".");
+ const int result=href.findRev(".");
if (result>=0)
{
strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
@@ -416,12 +416,12 @@ double KPrPixmapObject::load(const TQDomElement &element)
_fileName=e.attribute("filename");
if ( !_fileName.isEmpty() )
{
- if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 )
+ if ( int _envVarB = _fileName.find( '$' ) >= 0 )
{
- int _envVarE = _fileName.tqfind( '/', _envVarB );
+ int _envVarE = _fileName.find( '/', _envVarB );
// ### FIXME: it should be TQString::local8Bit instead of TQFile::encodeName, shouldn't it?
TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) );
- _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path );
+ _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path );
}
}
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index 51db3f4e..a1077a17 100644
--- a/kpresenter/KPrSideBar.cpp
+++ b/kpresenter/KPrSideBar.cpp
@@ -60,7 +60,7 @@ TQValidator::State KPrRenamePageValidator::validate( TQString & input, int& ) co
if ( str.isEmpty() ) // we want to allow empty titles. Empty == automatic.
return Acceptable;
- if ( mStringList.tqfind( str ) == mStringList.end() )
+ if ( mStringList.find( str ) == mStringList.end() )
return Acceptable;
else
return Intermediate;
@@ -208,7 +208,7 @@ void KPrSideBar::updateItem( KPrPage *page )
}
else
{
- pos = m_doc->pageList().tqfindRef( page );
+ pos = m_doc->pageList().findRef( page );
}
m_outline->updateItem( pos, sticky );
@@ -277,7 +277,7 @@ void KPrThumbBar::setCurrentPage( int pg )
TQRect KPrThumbBar::tip(const TQPoint &pos, TQString &title)
{
- TQIconViewItem *item = tqfindItem(viewportToContents(pos));
+ TQIconViewItem *item = findItem(viewportToContents(pos));
if (!item)
return TQRect(0, 0, -1, -1);
@@ -363,7 +363,7 @@ void KPrThumbBar::refreshItems(bool offset)
else
vRect.moveBy( contentsX(), contentsY() );
- TQIconViewItem *it = tqfindFirstVisibleItem( vRect );
+ TQIconViewItem *it = findFirstVisibleItem( vRect );
while ( it )
{
kdDebug(33001) << "visible page = " << it->text().toInt() << endl;
@@ -373,7 +373,7 @@ void KPrThumbBar::refreshItems(bool offset)
static_cast<ThumbItem *>(it)->setUptodate( true );
}
- if ( it == tqfindLastVisibleItem( vRect ) )
+ if ( it == findLastVisibleItem( vRect ) )
break;
it = it->nextItem();
}
@@ -397,7 +397,7 @@ void KPrThumbBar::updateItem( int pagenr /* 0-based */, bool sticky )
TQIconViewItem *it = firstItem();
do
{
- if ( it == tqfindFirstVisibleItem( vRect ) ) {
+ if ( it == findFirstVisibleItem( vRect ) ) {
do
{
if ( sticky || it->text().toInt() == pagenr + 1 ) {
@@ -407,7 +407,7 @@ void KPrThumbBar::updateItem( int pagenr /* 0-based */, bool sticky )
if ( !sticky )
return;
}
- if ( it == tqfindLastVisibleItem( vRect ) )
+ if ( it == findLastVisibleItem( vRect ) )
break;
pagecnt++;
it = it->nextItem();
@@ -911,7 +911,7 @@ void KPrOutline::itemClicked( TQListViewItem *item )
KPrPage* page = slideItem->page();
if( !page ) return;
if ( !m_viewMasterPage )
- emit showPage( m_doc->pageList().tqfindRef( page ) );
+ emit showPage( m_doc->pageList().findRef( page ) );
}
// check if we need to show chosen object
@@ -928,7 +928,7 @@ void KPrOutline::itemClicked( TQListViewItem *item )
KPrPage* page = slideItem->page();
if( !page ) return;
if ( !m_viewMasterPage )
- emit showPage( m_doc->pageList().tqfindRef( page ) );
+ emit showPage( m_doc->pageList().findRef( page ) );
}
// select the object, make sure it's visible
@@ -1010,7 +1010,7 @@ void KPrOutline::moveItem( TQListViewItem *i, TQListViewItem *, TQListViewItem *
if ( !srcItem )
return;
- int num = m_doc->pageList().tqfindRef( srcItem->page() );
+ int num = m_doc->pageList().findRef( srcItem->page() );
int numNow = 0;
if ( newAfter )
@@ -1019,7 +1019,7 @@ void KPrOutline::moveItem( TQListViewItem *i, TQListViewItem *, TQListViewItem *
if( !dstItem )
return;
- numNow = m_doc->pageList().tqfindRef( dstItem->page() );
+ numNow = m_doc->pageList().findRef( dstItem->page() );
if ( numNow < num )
numNow++;
}
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index c696a8e5..06b5d5df 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -872,7 +872,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma
{
TQFontDatabase fdb;
TQStringList families = fdb.tqfamilies();
- if ( families.tqfindIndex( n.attribute( attrFamily ) ) != -1 )
+ if ( families.findIndex( n.attribute( attrFamily ) ) != -1 )
fn.setFamily( n.attribute( attrFamily ) );
else
fn = defaultFont;
@@ -1258,7 +1258,7 @@ void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement
void KPrTextObject::recalcPageNum( KPrPage *page )
{
- int pgnum=m_doc->pageList().tqfindRef(page);
+ int pgnum=m_doc->pageList().findRef(page);
pgnum+=1;
TQPtrListIterator<KoTextCustomItem> cit( textDocument()->allCustomItems() );
@@ -1472,7 +1472,7 @@ void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length
// ** slow method **
KPrPage* page = doc->findPage( this );
if ( page ) {
- int pageNum = doc->pageList().tqfindRef( page );
+ int pageNum = doc->pageList().findRef( page );
// if the pageNum is -1 the object is located on the master slide
if ( pageNum > -1 )
{
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 9577bc7d..f3bc053d 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -2255,7 +2255,7 @@ void KPrView::createGUI()
KPrPage *initPage=m_pKPresenterDoc->initialActivePage();
if ( !initPage )
m_pKPresenterDoc->pageList().at( 0 ); // first page
- skipToPage( m_pKPresenterDoc->pageList().tqfindRef( initPage ) );
+ skipToPage( m_pKPresenterDoc->pageList().findRef( initPage ) );
}
void KPrView::initGui()
@@ -2338,10 +2338,10 @@ void KPrView::setupActions()
TQT_TQOBJECT(this), TQT_SLOT( editDelPage() ),
actionCollection(), "edit_delpage" );
- actionEditFind=KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_tqfind" );
+ actionEditFind=KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_find" );
actionEditFindNext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" );
actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" );
- actionEditReplace=KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_tqreplace" );
+ actionEditReplace=KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" );
// ---------------- View actions
@@ -3368,7 +3368,7 @@ void KPrView::recalcCurrentPageNum()
TQPtrList<KPrPage> pageList( m_pKPresenterDoc->pageList() );
- int pos = pageList.tqfindRef( activePage );
+ int pos = pageList.findRef( activePage );
if ( pos != -1 )
{
@@ -3873,7 +3873,7 @@ void KPrView::showObjectRect( const KPrObject * object )
if ( ! TQRect( getCanvas()->diffx(),
getCanvas()->diffy(),
getCanvas()->width(),
- getCanvas()->height() ).tqcontains( r ) )
+ getCanvas()->height() ).contains( r ) )
{
int x = r.left() - 20;
int y = r.top() - 20;
@@ -4396,7 +4396,7 @@ void KPrView::insertLink()
if ( edit->textObject()->hasSelection() )
{
TQString selectedText = edit->textObject()->selectedText();
- if ( edit->textObject()->selectionHasCustomItems() || selectedText.tqcontains('\n') )
+ if ( edit->textObject()->selectionHasCustomItems() || selectedText.contains('\n') )
return;
if ( selectedText.startsWith( "mailto:/" ) ||
selectedText.startsWith( "ftp:/" ) ||
@@ -4595,7 +4595,7 @@ void KPrView::startKSpell()
m_spell.dlg->activeAutoCorrect( true );
TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)),
TQT_TQOBJECT(this), TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) );
- TQObject::connect( m_spell.dlg, TQT_SIGNAL(tqreplace(const TQString&, int, const TQString&)),
+ TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) );
TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ),
TQT_TQOBJECT(this), TQT_SLOT(spellCheckerDone(const TQString&)) );
@@ -4878,7 +4878,7 @@ void KPrView::refreshCustomMenu()
if ( var->type() == VT_CUSTOM )
{
varName=( (KoCustomVariable*) var )->name();
- if ( !lst.tqcontains( varName) )
+ if ( !lst.contains( varName) )
{
lst.append( varName );
TQCString name = TQString("custom-action_%1").tqarg(i).latin1();
@@ -4993,7 +4993,7 @@ void KPrView::insertVariable()
if ( edit )
{
KAction * act = (KAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
- VariableDefMap::ConstIterator it = m_variableDefMap.tqfind( act );
+ VariableDefMap::ConstIterator it = m_variableDefMap.find( act );
if ( it == m_variableDefMap.end() )
kdWarning(33001) << "Action not found in m_variableDefMap." << endl;
else
@@ -5140,7 +5140,7 @@ void KPrView::editFind()
KPrTextView * edit = m_canvas->currentTextObjectView();
bool hasSelection = edit && (edit->kpTextObject())->textObject()->hasSelection();
bool hasCursor = edit != 0;
- KoSearchDia dialog( m_canvas, "tqfind", m_searchEntry, hasSelection, hasCursor );
+ KoSearchDia dialog( m_canvas, "find", m_searchEntry, hasSelection, hasCursor );
/// KoFindReplace needs a TQValueList<KoTextObject *>...
TQValueList<KoTextObject *> list;
@@ -5170,7 +5170,7 @@ void KPrView::editReplace()
KPrTextView * edit = m_canvas->currentTextObjectView();
bool hasSelection = edit && (edit->kpTextObject())->textObject()->hasSelection();
bool hasCursor = edit != 0;
- KoReplaceDia dialog( m_canvas, "tqreplace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor );
+ KoReplaceDia dialog( m_canvas, "replace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor );
/// KoFindReplace needs a TQValueList<KoTextObject *>...
TQValueList<KoTextObject *> list;
@@ -5233,12 +5233,12 @@ void KPrView::changeZoomMenu( int zoom )
regexp.search(*it);
const int val=regexp.cap(1).toInt(&ok);
//zoom : limit inferior=10
- if(ok && val>9 && list.tqcontains(val)==0)
+ if(ok && val>9 && list.contains(val)==0)
list.append( val );
}
//necessary at the beginning when we read config
//this value is not in combo list
- if(list.tqcontains(zoom)==0)
+ if(list.contains(zoom)==0)
list.append( zoom );
qHeapSort( list );
@@ -5268,13 +5268,13 @@ void KPrView::showZoom( int zoom )
{
TQStringList list = actionViewZoom->items();
TQString zoomStr( i18n("%1%").tqarg( zoom ) );
- int pos = list.tqfindIndex(zoomStr);
+ int pos = list.findIndex(zoomStr);
if( pos == -1)
{
changeZoomMenu( zoom );
list = actionViewZoom->items();
}
- actionViewZoom->setCurrentItem( list.tqfindIndex(zoomStr) );
+ actionViewZoom->setCurrentItem( list.findIndex(zoomStr) );
}
void KPrView::viewZoom( const TQString &s )
@@ -5455,7 +5455,7 @@ void KPrView::updateStyleList()
TQString currentStyle = actionFormatStyle->currentText();
// Generate list of styles
const TQStringList lst = m_pKPresenterDoc->styleCollection()->displayNameList();
- const int pos = lst.tqfindIndex( currentStyle );
+ const int pos = lst.findIndex( currentStyle );
// Fill the combo - using a KSelectAction
actionFormatStyle->setItems( lst );
if ( pos > -1 )
@@ -6000,7 +6000,7 @@ void KPrView::applyAutoFormat()
{
m_pKPresenterDoc->getAutoFormat()->readConfig();
KMacroCommand *macro = 0L;
- m_switchPage=m_pKPresenterDoc->pageList().tqfindRef(m_canvas->activePage());
+ m_switchPage=m_pKPresenterDoc->pageList().findRef(m_canvas->activePage());
m_initSwitchPage=m_switchPage;
TQPtrList<KoTextObject> list=m_canvas->activePage()->allTextObjects();
@@ -6369,7 +6369,7 @@ TQPtrList<KAction> KPrView::listOfResultOfCheckWord( const TQString &word )
TQPtrList<KAction> listAction;
DefaultDictionary *dict = m_broker->defaultDictionary();
TQStringList lst = dict->suggest( word );
- if ( !lst.tqcontains( word ))
+ if ( !lst.contains( word ))
{
TQStringList::ConstIterator it = lst.begin();
for ( int i = 0; it != lst.end() ; ++it, ++i )
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 78afb783..957e07f2 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -367,7 +367,7 @@ void KPrWebPresentation::writeStartOfHeader(TQTextStream& streamOut, TQTextCodec
// Eliminate the dollar signs
// (We don't want that the version number changes if the HTML file is itself put in a CVS storage.)
streamOut << "<meta name=\"Generator\" content=\"KPresenter's Web Presentation "
- << strVersion.mid(10).tqreplace("$","")
+ << strVersion.mid(10).replace("$","")
<< "\""<< ( isXML() ?" /":"") // X(HT)ML closes empty elements, HTML not!
<< ">\n";
@@ -498,7 +498,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
streamOut << " <b>" << escapeHtmlText( codec, i18n( "Note" ) ) << "</b>\n";
streamOut << " <blockquote>\n";
- streamOut << note.tqreplace( "\n", brtag );
+ streamOut << note.replace( "\n", brtag );
streamOut << " </blockquote><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n";
}
diff --git a/kpresenter/autoformEdit/ATFInterpreter.cpp b/kpresenter/autoformEdit/ATFInterpreter.cpp
index ff2b1037..5f010518 100644
--- a/kpresenter/autoformEdit/ATFInterpreter.cpp
+++ b/kpresenter/autoformEdit/ATFInterpreter.cpp
@@ -304,7 +304,7 @@ void ATFInterpreter::interpret()
} break;
case VAR_VARIA:
{
- if ((*it).tqfind('0') != -1) v = false;
+ if ((*it).find('0') != -1) v = false;
else v = true;
attrib.isVariable = (*it);
} break;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-15 22:30:15 +0000